mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

[ticket/12775] Add a conter_factory class and remove functions_container

Browse Source 
PHPBB3-12775
This commit is contained in:
Tristan Darricau
2014-06-26 16:39:01 +02:00
parent f8eca98b3f
commit cdf87e0078
3 changed files with 373 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/common.php
View File

@@ -21,11 +21,11 @@ if (!defined('IN_PHPBB'))
}
require($phpbb_root_path . 'includes/startup.' . $phpEx);
require($phpbb_root_path . 'phpbb/di/container_factory.' . $phpEx);
if (file_exists($phpbb_root_path . 'config.' . $phpEx))
{
require($phpbb_root_path . 'config.' . $phpEx);
}
$factory = new \phpbb\di\container_factory($phpbb_root_path, $phpEx);
$config_file_data = $factory->load_config_file();
extract($config_file_data);
if (!defined('PHPBB_INSTALLED'))
{
@@ -80,7 +80,6 @@ require($phpbb_root_path . 'phpbb/class_loader.' . $phpEx);
require($phpbb_root_path . 'includes/functions.' . $phpEx);
require($phpbb_root_path . 'includes/functions_content.' . $phpEx);
require($phpbb_root_path . 'includes/functions_container.' . $phpEx);
include($phpbb_root_path . 'includes/functions_compatibility.' . $phpEx);
require($phpbb_root_path . 'includes/constants.' . $phpEx);
@@ -98,7 +97,8 @@ $phpbb_class_loader_ext->register();
phpbb_load_extensions_autoloaders($phpbb_root_path);
// Set up container
$phpbb_container = phpbb_create_default_container($phpbb_root_path, $phpEx);
$phpbb_container = $factory->get_container();
$phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
$phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));