fixes

GuilhemN · GuilhemN · commit a69c60d635be · 2017-08-08T10:25:29.000+02:00
diff --git a/src/Symfony/Component/Debug/DebugClassLoader.php b/src/Symfony/Component/Debug/DebugClassLoader.php
@@ -192,16 +192,17 @@ public function loadClass($class)
                 }
             }
 
+            $parentAndTraits = class_uses($name, false);
             if ($parent = get_parent_class($class)) {
+                $parentAndTraits[] = $parent;
+
                 if (isset(self::$final[$parent])) {
                     @trigger_error(sprintf('The "%s" class is considered final%s. It may change without further notice as of its next major version. You should not extend it from "%s".', $parent, self::$final[$parent], $name), E_USER_DEPRECATED);
                 }
             }
 
-            $parentAndTraits = ($parent ? array($parent => $parent) : array()) + class_uses($name, false);
-
             // Detect if the parent is annotated
-            foreach ($parentAndTraits + $this->getOwnInterfaces($name) as $use) {
+            foreach ($parentAndTraits + $this->getOwnInterfaces($name, $parent) as $use) {
                 if (isset(self::$deprecated[$use]) && strncmp($ns, $use, $len)) {
                     $type = class_exists($name, false) ? 'class' : (interface_exists($name, false) ? 'interface' : 'trait');
                     $verb = class_exists($use, false) || interface_exists($name, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');
@@ -366,15 +367,16 @@ public function loadClass($class)
     /**
      * `class_implements` includes interfaces from the parents so we have to manually exclude them.
      *
-     * @param string $class
+     * @param string       $class
+     * @param string|false $parent
      *
      * @return string[]
      */
-    private function getOwnInterfaces($class)
+    private function getOwnInterfaces($class, $parent)
     {
         $ownInterfaces = class_implements($class, false);
 
-        if ($parent = get_parent_class($class)) {
+        if ($parent) {
             foreach (class_implements($parent, false) as $interface) {
                 unset($ownInterfaces[$interface]);
             }
diff --git a/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php b/src/Symfony/Component/Debug/Tests/DebugClassLoaderTest.php
@@ -347,8 +347,8 @@ class_exists('Test\\'.__NAMESPACE__.'\\ExtendsInternals', true);
         restore_error_handler();
 
         $this->assertSame($deprecations, array(
-            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass" class is considered internal since version 3.4. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
             'The "Symfony\Component\Debug\Tests\Fixtures\InternalTrait" trait is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
+            'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass" class is considered internal since version 3.4. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
             'The "Symfony\Component\Debug\Tests\Fixtures\InternalInterface" interface is considered internal. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
             'The "Symfony\Component\Debug\Tests\Fixtures\InternalClass::internalMethod()" method is considered internal since version 3.4. It may change without further notice. You should not use it from "Test\Symfony\Component\Debug\Tests\ExtendsInternals".',
         ));

Original file line number	Diff line number	Diff line change
`@@ -192,16 +192,17 @@ public function loadClass($class)`
`192`	`192`	`}`
`193`	`193`	`}`
`194`	`194`
	`195`	`+ $parentAndTraits = class_uses($name, false);`
`195`	`196`	`if ($parent = get_parent_class($class)) {`
	`197`	`+ $parentAndTraits[] = $parent;`
	`198`	`+`
`196`	`199`	`if (isset(self::$final[$parent])) {`
`197`	`200`	`@trigger_error(sprintf('The "%s" class is considered final%s. It may change without further notice as of its next major version. You should not extend it from "%s".', $parent, self::$final[$parent], $name), E_USER_DEPRECATED);`
`198`	`201`	`}`
`199`	`202`	`}`
`200`	`203`
`201`		`- $parentAndTraits = ($parent ? array($parent => $parent) : array()) + class_uses($name, false);`
`202`		`-`
`203`	`204`	`// Detect if the parent is annotated`
`204`		`- foreach ($parentAndTraits + $this->getOwnInterfaces($name) as $use) {`
	`205`	`+ foreach ($parentAndTraits + $this->getOwnInterfaces($name, $parent) as $use) {`
`205`	`206`	`if (isset(self::$deprecated[$use]) && strncmp($ns, $use, $len)) {`
`206`	`207`	`$type = class_exists($name, false) ? 'class' : (interface_exists($name, false) ? 'interface' : 'trait');`
`207`	`208`	`$verb = class_exists($use, false) \|\| interface_exists($name, false) ? 'extends' : (interface_exists($use, false) ? 'implements' : 'uses');`
`@@ -366,15 +367,16 @@ public function loadClass($class)`
`366`	`367`	`/**`
`367`	`368`	* `class_implements` includes interfaces from the parents so we have to manually exclude them.
`368`	`369`	`*`
`369`		`- * @param string $class`
	`370`	`+ * @param string $class`
	`371`	`+ * @param string\|false $parent`
`370`	`372`	`*`
`371`	`373`	`* @return string[]`
`372`	`374`	`*/`
`373`		`- private function getOwnInterfaces($class)`
	`375`	`+ private function getOwnInterfaces($class, $parent)`
`374`	`376`	`{`
`375`	`377`	`$ownInterfaces = class_implements($class, false);`
`376`	`378`
`377`		`- if ($parent = get_parent_class($class)) {`
	`379`	`+ if ($parent) {`
`378`	`380`	`foreach (class_implements($parent, false) as $interface) {`
`379`	`381`	`unset($ownInterfaces[$interface]);`
`380`	`382`	`}`