mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-21 07:51:33 +02:00
Code Issues Releases Wiki Activity

[ticket/12775] Renamed to \phpbb\di\container_builder

Browse Source 
PHPBB3-12775
This commit is contained in:
Tristan Darricau
2014-06-29 00:29:08 +02:00
parent 11ff91c87d
commit 40937e21c5
11 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/install/database_update.php
View File

@@ -86,11 +86,11 @@ 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_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_factory->set_use_extensions(false);
$phpbb_container_factory->set_use_kernel_pass(false);
$phpbb_container_factory->set_dump_container(false);
$phpbb_container = $phpbb_container_factory->get_container();
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $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();
// set up caching
$cache = $phpbb_container->get('cache');

18
phpBB/install/index.php
View File

@@ -120,18 +120,18 @@ $phpbb_class_loader_ext->register();
// Set up container
$phpbb_config_php_handler = new \phpbb\config_php($phpbb_root_path, $phpEx);
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_factory->set_use_extensions(false);
$phpbb_container_factory->set_dump_container(false);
$phpbb_container_factory->set_use_custom_pass(false);
$phpbb_container_factory->set_inject_config(false);
$phpbb_container_factory->set_compile_container(false);
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $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);
$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_factory->set_config_path($config_path);
$phpbb_container_builder->set_config_path($config_path);
$phpbb_container_factory->set_custom_parameters(array(
$phpbb_container_builder->set_custom_parameters(array(
'core.root_path' => $phpbb_root_path,
'core.adm_relative_path' => $phpbb_adm_relative_path,
'core.php_ext' => $phpEx,
@@ -139,7 +139,7 @@ $phpbb_container_factory->set_custom_parameters(array(
'cache.driver.class' => 'phpbb\cache\driver\file',
));
$phpbb_container = $phpbb_container_factory->get_container();
$phpbb_container = $phpbb_container_builder->get_container();
$phpbb_container->register('dbal.conn')->setSynthetic(true);
$phpbb_container->compile();

4
phpBB/install/install_convert.php
View File

@@ -127,8 +127,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_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_factory->get_container();
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->get_container();
// Create cache
$cache = $phpbb_container->get('cache');

4
phpBB/install/install_install.php
View File

@@ -104,8 +104,8 @@ class install_install extends module
$request->enable_super_globals();
// Create a normal container now
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_factory->get_container();
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container = $phpbb_container_builder->get_container();
// Sets the global variables
$cache = $phpbb_container->get('cache');

10
phpBB/install/install_update.php
View File

@@ -76,14 +76,14 @@ class install_update extends module
$request->enable_super_globals();
// Create a normal container now
$phpbb_container_factory = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_factory->set_dump_container(false);
$phpbb_container_factory->set_use_extensions(false);
$phpbb_container_builder = new \phpbb\di\container_factory($phpbb_config_php_handler, $phpbb_root_path, $phpEx);
$phpbb_container_builder->set_dump_container(false);
$phpbb_container_builder->set_use_extensions(false);
if (file_exists($phpbb_root_path . 'install/update/new/config'))
{
$phpbb_container_factory->set_config_path($phpbb_root_path . 'install/update/new/config');
$phpbb_container_builder->set_config_path($phpbb_root_path . 'install/update/new/config');
}
$phpbb_container = $phpbb_container_factory->get_container();
$phpbb_container = $phpbb_container_builder->get_container();
// Writes into global $cache
$cache = $phpbb_container->get('cache');