Fix problems

m3m0r7 · m3m0r7 · commit 1a545f3b230b · 2019-04-22T22:09:18.000+09:00
diff --git a/src/Utilities/TypeResolver.php b/src/Utilities/TypeResolver.php
@@ -201,16 +201,13 @@ public static function compare(string $a, string $b): bool
 
         $a = static::getExtendedClasses($a);
         $b = static::getExtendedClasses($b);
-
-        if (count($a) !== count($b)) {
-            return false;
-        }
-
+        
         $resultClassesComparison = [];
         $resultInterfacesComparison = [];
         for ($i = 0, $size = count($a); $i < $size; $i++) {
             [$aClasses, $aInterfaces] = $a[$i];
             [$bClasses, $bInterfaces] = $b[$i];
+
             $resultClassesComparison[] = count(array_intersect($aClasses, $bClasses)) > 0;
             $resultInterfacesComparison[] = count(array_intersect($aInterfaces, $bInterfaces)) > 0;
         }
@@ -241,33 +238,32 @@ public static function getExtendedClasses($class): array
             }
             $classPath = Runtime::PHP_IMITATION_DIRECTORY . '\\' . implode('\\', $path);
 
-            if (isset($loadedExtendedRoots[$classPath])) {
-                $extendedClasses = $loadedExtendedRoots[$classPath];
-                continue;
-            }
-
             // Remove duplicated prefix
             $classPath = preg_replace(
                 '/^(?:' . preg_quote(Runtime::PHP_IMITATION_DIRECTORY, '/') . ')+/',
                 Runtime::PHP_IMITATION_DIRECTORY,
                 $classPath
             );
 
+            if (isset($loadedExtendedRoots[$classPath])) {
+                $result[] = $loadedExtendedRoots[$classPath];
+                continue;
+            }
+
             $extendedClasses = array_values(class_parents($classPath, true));
             $interfaces = array_values(class_implements($classPath, true));
-            $loadedExtendedRoots = $extendedClasses;
 
             if (class_exists($classPath)) {
                 $reflectionClass = new \ReflectionClass($classPath);
                 preg_match_all('/\@parent\s+([^\r\n]+)/i', $reflectionClass->getDocComment(), $parents);
                 $roots = array_merge($parents[1], [$classPath]);
-                if (count($roots) > $extendedClasses) {
+                if (count($roots) > count($extendedClasses)) {
                     $extendedClasses = $roots;
                 }
 
                 preg_match_all('/\@interface\s+([^\r\n]+)/i', $reflectionClass->getDocComment(), $interfaceRoots);
                 $roots = $interfaceRoots[1];
-                if (count($roots) > $interfaces) {
+                if (count($roots) > count($interfaces)) {
                     $interfaces = $roots;
                 }
             }
