[ClassLoader] fixed order of interfaces in generated class collection…

… caches (closes #4841)
symfony · Jul 10, 2012 · 9a2c617 · 9a2c617
1 parent e83c1a5
commit 9a2c617
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -283,12 +283,21 @@ private static function getClassHierarchy(\ReflectionClass $class)
             }
         }
 
+        return array_merge(self::getInterfaces($class), $classes);
+    }
+
+    private static function getInterfaces(\ReflectionClass $class)
+    {
+        $classes = array();
+
         foreach ($class->getInterfaces() as $interface) {
-            if ($interface->isUserDefined() && !isset(self::$seen[$interface->getName()])) {
-                self::$seen[$interface->getName()] = true;
+            $classes = array_merge($classes, self::getInterfaces($interface));
+        }
 
-                array_unshift($classes, $interface);
-            }
+        if ($class->isUserDefined() && $class->isInterface() && !isset(self::$seen[$class->getName()])) {
+            self::$seen[$class->getName()] = true;
+
+            $classes[] = $class;
         }
 
         return $classes;

diff --git a/src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
@@ -13,6 +13,7 @@
 
 use Symfony\Component\ClassLoader\ClassCollectionLoader;
 
+require_once __DIR__.'/Fixtures/ClassesWithParents/GInterface.php';
 require_once __DIR__.'/Fixtures/ClassesWithParents/CInterface.php';
 require_once __DIR__.'/Fixtures/ClassesWithParents/B.php';
 require_once __DIR__.'/Fixtures/ClassesWithParents/A.php';
@@ -25,6 +26,7 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
     public function testClassReordering(array $classes)
     {
         $expected = array(
+            'ClassesWithParents\\GInterface',
             'ClassesWithParents\\CInterface',
             'ClassesWithParents\\B',
             'ClassesWithParents\\A',
@@ -45,6 +47,7 @@ public function getDifferentOrders()
             array(array(
                 'ClassesWithParents\\A',
                 'ClassesWithParents\\CInterface',
+                'ClassesWithParents\\GInterface',
                 'ClassesWithParents\\B',
             )),
             array(array(
@@ -81,6 +84,7 @@ public function testClassWithTraitsReordering(array $classes)
         require_once __DIR__.'/Fixtures/ClassesWithParents/E.php';
 
         $expected = array(
+            'ClassesWithParents\\GInterface',
             'ClassesWithParents\\CInterface',
             'ClassesWithParents\\CTrait',
             'ClassesWithParents\\ATrait',

diff --git a/src/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/CInterface.php b/src/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/CInterface.php
@@ -2,4 +2,6 @@
 
 namespace ClassesWithParents;
 
-interface CInterface {}
+interface CInterface extends GInterface
+{
+}
diff --git a/src/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/GInterface.php b/src/Symfony/Component/ClassLoader/Tests/Fixtures/ClassesWithParents/GInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ClassesWithParents;
+
+interface GInterface
+{
+}