From c7141c82d1e62ef1320a4652283ddff4fdd5bd83 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Thu, 11 Jul 2019 20:09:53 +0200 Subject: [PATCH 1/2] [Debug][DebugClassLoader] Include found files instead of requiring them --- src/Symfony/Component/Debug/DebugClassLoader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php index 9ceac9af16..b63c6adee9 100644 --- a/src/Symfony/Component/Debug/DebugClassLoader.php +++ b/src/Symfony/Component/Debug/DebugClassLoader.php @@ -149,11 +149,11 @@ class DebugClassLoader if (!$file = $this->classLoader[0]->findFile($class) ?: false) { // no-op } elseif (\function_exists('opcache_is_script_cached') && @opcache_is_script_cached($file)) { - require $file; + include $file; return; } else { - require $file; + include $file; } } else { \call_user_func($this->classLoader, $class); From ee5e5de9e031fa037bf099ef12e485d583e36fcd Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 12 Jul 2019 08:50:39 +0300 Subject: [PATCH 2/2] fixed CS --- .../Tests/DependencyInjection/FrameworkExtensionTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index b0356b3c14..c114f38177 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -23,7 +23,6 @@ use Symfony\Component\Cache\Adapter\DoctrineAdapter; use Symfony\Component\Cache\Adapter\FilesystemAdapter; use Symfony\Component\Cache\Adapter\ProxyAdapter; use Symfony\Component\Cache\Adapter\RedisAdapter; -use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException; use Symfony\Component\DependencyInjection\ChildDefinition; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder;