Merge branch '3.4' into 4.2

* 3.4:
  [TwigBridge] remove deprecation triggered when using Twig 2.7
This commit is contained in:
Nicolas Grekas 2019-03-10 18:09:50 +01:00
commit 33b881b9b7
1 changed files with 1 additions and 1 deletions

View File

@ -257,7 +257,7 @@ class DebugClassLoader
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');