diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-05-10 23:54:49 +0200 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-05-14 23:04:23 +0200 |
| commit | 02af9385a13543f3f6bd9cb1500fd8508bcd35ac (patch) | |
| tree | f975127f8aabaf1777589240a248ffefee1429f7 /phpBB/common.php | |
| parent | 549fe66d90eed1d6a4fee6f5f706c73455d73596 (diff) | |
| download | forums-02af9385a13543f3f6bd9cb1500fd8508bcd35ac.tar forums-02af9385a13543f3f6bd9cb1500fd8508bcd35ac.tar.gz forums-02af9385a13543f3f6bd9cb1500fd8508bcd35ac.tar.bz2 forums-02af9385a13543f3f6bd9cb1500fd8508bcd35ac.tar.xz forums-02af9385a13543f3f6bd9cb1500fd8508bcd35ac.zip | |
[ticket/13770] Fix tests
PHPBB3-13770
Diffstat (limited to 'phpBB/common.php')
| -rw-r--r-- | phpBB/common.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index 70fb34331c..0b898d9553 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -96,21 +96,19 @@ 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(); -\Symfony\Component\Debug\Debug::enable(E_ALL); - // Set up container -/*try -{*/ +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')); |