mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3554 from Nicofuma/ticket/13770

Browse Source 
[ticket/13770] Wither interface for container_builder
This commit is contained in:
Nils Adermann
2015-05-29 10:56:54 +02:00
parent bfba82cd28 2b25c5bd35
commit da68f62d4f
13 changed files with 342 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/install/database_update.php
View File

@@ -80,11 +80,13 @@ require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
// Set up container (must be done here because extensions table may not exist)
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container_builder->set_use_extensions(false);
$phpbb_container_builder->set_use_kernel_pass(false);
$phpbb_container_builder->set_dump_container(false);
$phpbb_container = $phpbb_container_builder->get_container();
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder
->with_config($phpbb_config_php_file)
->without_extensions()
->without_cache()
->get_container()
;
// set up caching
/* @var $cache \phpbb\cache\service */

16
phpBB/install/index.php
View File

@@ -116,18 +116,18 @@ $phpbb_class_loader_ext->register();
// Set up container
$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx);
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container_builder->set_use_extensions(false);
$phpbb_container_builder->set_dump_container(false);
$phpbb_container_builder->set_use_custom_pass(false);
$phpbb_container_builder->set_inject_config(false);
$phpbb_container_builder->set_compile_container(false);
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
$phpbb_container_builder
->without_extensions()
->without_cache()
->without_compiled_container()
;
$other_config_path = $phpbb_root_path . 'install/update/new/config/';
$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config/';
$phpbb_container_builder->set_config_path($config_path);
$phpbb_container_builder->with_config_path($config_path);
$phpbb_container_builder->set_custom_parameters(array(
$phpbb_container_builder->with_custom_parameters(array(
'core.root_path' => $phpbb_root_path,
'core.adm_relative_path' => $phpbb_adm_relative_path,
'core.php_ext' => $phpEx,

4
phpBB/install/install_convert.php
View File

@@ -131,8 +131,8 @@ class install_convert extends module
// Enable super globals to prevent issues with the new \phpbb\request\request object
$request->enable_super_globals();
// Create a normal container now
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->get_container();
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->with_config($phpbb_config_php_file)->get_container();
// Create cache
/* @var $cache \phpbb\cache\service */

4
phpBB/install/install_install.php
View File

@@ -110,8 +110,8 @@ class install_install extends module
$request->enable_super_globals();
// Create a normal container now
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->get_container();
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->with_config($phpbb_config_php_file)->get_container();
// Sets the global variables
/* @var $cache \phpbb\cache\service */

12
phpBB/install/install_update.php
View File

@@ -76,12 +76,16 @@ class install_update extends module
$request->enable_super_globals();
// Create a normal container now
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container_builder->set_dump_container(false);
$phpbb_container_builder->set_use_extensions(false);
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder
->with_config($phpbb_config_php_file)
->without_cache()
->without_extensions()
;
if (file_exists($phpbb_root_path . 'install/update/new/config'))
{
$phpbb_container_builder->set_config_path($phpbb_root_path . 'install/update/new/config');
$phpbb_container_builder->with_config_path($phpbb_root_path . 'install/update/new/config');
}
$phpbb_container = $phpbb_container_builder->get_container();