Merge branch '4.2'

nicolas-grekas · nicolas-grekas · commit c45bbd44427a · 2019-03-10T18:10:06.000+01:00
* 4.2:
  [TwigBridge] remove deprecation triggered when using Twig 2.7
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');
 

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ public function checkAnnotations(\ReflectionClass $refl, $class)`
`276`	`276`	`if (!isset(self::$checkedClasses[$use])) {`
`277`	`277`	`$this->checkClass($use);`
`278`	`278`	`}`
`279`		`- if (isset(self::$deprecated[$use]) && \strncmp($ns, \str_replace('_', '\\', $use), $len)) {`
	`279`	`+ if (isset(self::$deprecated[$use]) && \strncmp($ns, \str_replace('_', '\\', $use), $len) && !isset(self::$deprecated[$class])) {`
`280`	`280`	`$type = class_exists($class, false) ? 'class' : (interface_exists($class, false) ? 'interface' : 'trait');`
`281`	`281`	`$verb = class_exists($use, false) \|\| interface_exists($class, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');`
`282`	`282`