Merge branch '4.2'

* 4.2: [TwigBridge] remove deprecation triggered when using Twig 2.7
symfony · Mar 10, 2019 · c45bbd4 · c45bbd4
2 parents 6fd6b94 + 33b881b
commit c45bbd4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -276,7 +276,7 @@ public function checkAnnotations(\ReflectionClass $refl, $class)
             if (!isset(self::$checkedClasses[$use])) {
                 $this->checkClass($use);
             }
-            if (isset(self::$deprecated[$use]) && \strncmp($ns, \str_replace('_', '\\', $use), $len)) {
+            if (isset(self::$deprecated[$use]) && \strncmp($ns, \str_replace('_', '\\', $use), $len) && !isset(self::$deprecated[$class])) {
                 $type = class_exists($class, false) ? 'class' : (interface_exists($class, false) ? 'interface' : 'trait');
                 $verb = class_exists($use, false) || interface_exists($class, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');