Fix resolvers which including implements resolving features

m3m0r7 · m3m0r7 · commit 9a796439ad62 · 2019-04-22T21:33:32.000+09:00
diff --git a/src/Utilities/Formatter.php b/src/Utilities/Formatter.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Utilities;
 
 use PHPJava\Core\JVM\ConstantPool;
+use PHPJava\Core\JVM\Parameters\Runtime;
 use PHPJava\Exceptions\FormatterException;
 use PHPJava\Kernel\Maps\FieldAccessFlag;
 use PHPJava\Kernel\Maps\MethodAccessFlag;
@@ -114,6 +115,23 @@ public static function signatureConvertToAmbiguousForPHP($signatures)
         return $result;
     }
 
+    public static function convertPHPNamespacesToJava($className)
+    {
+        $newClassName = explode(
+            '.',
+            str_replace(
+                [ltrim(Runtime::PHP_IMITATION_DIRECTORY, '\\') . '\\', '\\'],
+                ['', '.'],
+                ltrim($className, '\\')
+            )
+        );
+        foreach ($newClassName as $key => $value) {
+            $newClassName[$key] = array_flip(Runtime::PHP_IMITATION_MAPS)[$value] ?? $value;
+        }
+
+        return implode('.', $newClassName);
+    }
+
     /**
      * @param _MethodInfo $method
      * @param ConstantPool $constantPool
diff --git a/src/Utilities/TypeResolver.php b/src/Utilities/TypeResolver.php
@@ -191,6 +191,7 @@ public static function convertPHPtoJava($arguments, $defaultJavaArgumentType = '
      * @param string $b
      * @return bool
      * @throws TypeException
+     * @throws \ReflectionException
      */
     public static function compare(string $a, string $b): bool
     {
@@ -205,30 +206,31 @@ public static function compare(string $a, string $b): bool
             return false;
         }
 
-        $resultComparison = [];
+        $resultClassesComparison = [];
+        $resultInterfacesComparison = [];
         for ($i = 0, $size = count($a); $i < $size; $i++) {
-            $resultComparison[] = count(array_intersect($a[$i], $b[$i])) > 0;
+            $resultClassesComparison[] = count(array_intersect($a[$i][0], $b[$i][0])) > 0;
+            $resultInterfacesComparison[] = count(array_intersect($a[$i][1], $b[$i][1])) > 0;
         }
 
-        return !in_array(
-            false,
-            $resultComparison,
-            true
-        );
+        return !in_array(false, $resultClassesComparison, true) ||
+            !in_array(false, $resultInterfacesComparison, true);
     }
 
     /**
      * @param $class
      * @return array
      * @throws TypeException
+     * @throws \ReflectionException
      */
     public static function getExtendedClasses($class): array
     {
         static $loadedExtendedRoots = [];
         $result = [];
+
         foreach (Formatter::parseSignature($class) as $signature) {
             if ($signature['type'] !== 'class') {
-                $result[] = [$signature['type']];
+                $result[] = [[$signature['type']], []];
                 continue;
             }
             $path = [];
@@ -249,15 +251,10 @@ public static function getExtendedClasses($class): array
                 $classPath
             );
 
-            $extendedClasses = [];
-            $extendedClasses[] = $rootClass = $classPath;
-            while (($getRootClass = get_parent_class($rootClass)) !== false) {
-                $extendedClasses[] = $rootClass = '\\' . $getRootClass;
-            }
-
-            $result[] = $extendedClasses;
-
+            $extendedClasses = array_values(class_parents(ltrim($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);
@@ -266,22 +263,12 @@ public static function getExtendedClasses($class): array
                     $loadedExtendedRoots = $roots;
                 }
             }
+
+            $result[] = [$extendedClasses, $interfaces];
         }
 
         array_walk_recursive($result, function (&$className) {
-            $newClassName = explode(
-                '.',
-                str_replace(
-                    [Runtime::PHP_IMITATION_DIRECTORY . '\\', '\\'],
-                    ['', '.'],
-                    $className
-                )
-            );
-            foreach ($newClassName as $key => $value) {
-                $newClassName[$key] = array_flip(Runtime::PHP_IMITATION_MAPS)[$value] ?? $value;
-            }
-
-            $className = $newClassName = implode('.', $newClassName);
+            $className = Formatter::convertPHPNamespacesToJava($className);
         });
 
         return $result;
