diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-04-26 19:41:07 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-05-14 23:04:03 +0200 |
| commit | c96e7ef1711932c2236620903bc256b346514dfc (patch) | |
| tree | de827ea68dc8328767003b50ca7ef43cde17ce58 /phpBB/common.php | |
| parent | 0b8632e7504a2ea46cdcc7493f15043b056f4af2 (diff) | |
| download | forums-c96e7ef1711932c2236620903bc256b346514dfc.tar forums-c96e7ef1711932c2236620903bc256b346514dfc.tar.gz forums-c96e7ef1711932c2236620903bc256b346514dfc.tar.bz2 forums-c96e7ef1711932c2236620903bc256b346514dfc.tar.xz forums-c96e7ef1711932c2236620903bc256b346514dfc.zip | |
[ticket/13770] Wither interface for container_builder
PHPBB3-13770
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 633a37f25b..70fb34331c 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -96,21 +96,21 @@ set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handle $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/", $phpEx); $phpbb_class_loader_ext->register(); -phpbb_load_extensions_autoloaders($phpbb_root_path); +\Symfony\Component\Debug\Debug::enable(E_ALL); // Set up container -try -{ - $phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx); - $phpbb_container = $phpbb_container_builder->get_container(); -} +/*try +{*/ + $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(); +/*} catch (InvalidArgumentException $e) { trigger_error( 'The requested environment ' . PHPBB_ENVIRONMENT . ' is not available.', E_USER_ERROR ); -} +}*/ $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver')); $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver')); |