From 7aa8f6461f1e85cf91931f56b95384e54fec07c2 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 30 Oct 2013 13:05:28 +0100 Subject: [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files. PHPBB3-11980 --- phpBB/phpbb/di/extension/config.php | 8 -------- 1 file changed, 8 deletions(-) (limited to 'phpBB/phpbb/di/extension/config.php') diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php index 85b374a3ca..5fcb2d6f10 100644 --- a/phpBB/phpbb/di/extension/config.php +++ b/phpBB/phpbb/di/extension/config.php @@ -9,14 +9,6 @@ namespace phpbb\di\extension; -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\DependencyInjection\Extension; use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; -- cgit v1.2.1 From 31e60f0c8d5e248bbf318cec410b27cff6dbee74 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 9 Nov 2013 17:06:38 +0100 Subject: [ticket/11949] Do not prepend leading backslash to cache class name The container seems to prepend the leading \ itself, so we get an InvalidArgumentException with message '"'\\phpbb\\cache\\driver\\file'" is not a valid class name for the "cache.driver" service.' PHPBB3-11949 --- phpBB/phpbb/di/extension/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/phpbb/di/extension/config.php') diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php index 5fcb2d6f10..2603e7b358 100644 --- a/phpBB/phpbb/di/extension/config.php +++ b/phpBB/phpbb/di/extension/config.php @@ -70,7 +70,7 @@ class config extends Extension { if (preg_match('#^[a-z]+$#', $acm_type)) { - return '\\phpbb\cache\driver\\'.$acm_type; + return 'phpbb\\cache\\driver\\' . $acm_type; } return $acm_type; -- cgit v1.2.1