Upgrade ClassResolver for Outerclass

m3m0r7 · m3m0r7 · commit 81f7b7f9bfd7 · 2019-02-28T00:57:28.000+09:00
diff --git a/src/Core/JavaClassReader.php b/src/Core/JavaClassReader.php
@@ -1,6 +1,8 @@
 <?php
 namespace PHPJava\Core;
 
+use PHPJava\Utilities\ClassResolver;
+
 class JavaClassReader
 {
     private $handle;
@@ -10,6 +12,12 @@ public function __construct(string $file)
     {
         $this->handle = fopen($file, 'r');
         $this->binaryReader = new JVM\Stream\BinaryReader($this->handle);
+
+        // Add resolving path
+        ClassResolver::add(
+            ClassResolver::RESOURCE_TYPE_FILE,
+            dirname($file)
+        );
     }
 
     public function getBinaryReader(): JVM\Stream\BinaryReader
diff --git a/src/Utilities/ClassResolver.php b/src/Utilities/ClassResolver.php
@@ -1,20 +1,72 @@
 <?php
 namespace PHPJava\Utilities;
 
+use PHPJava\Core\JavaClass;
+use PHPJava\Core\JavaClassReader;
+
 class ClassResolver
 {
     const MAPS = [
         'String' => '_String',
         'Object' => '_Object',
     ];
 
-    public static function resolve($javaPath): string
+    // resource types
+    const RESOURCE_TYPE_FILE = 'RESOURCE_TYPE_FILE';
+
+    // resolved types
+    const RESOLVED_TYPE_CLASS = 'RESOLVED_TYPE_CLASS';
+    const RESOLVED_TYPE_IMITATION = 'RESOLVED_TYPE_IMITATION';
+
+    private static $resolves = [];
+    private static $resolvedPaths = [];
+
+    public static function resolve($javaPath): array
     {
         $namespaces = explode('.', str_replace('/', '.', $javaPath));
         $buildClassPath = [];
         foreach ($namespaces as $namespace) {
             $buildClassPath[] = static::MAPS[$namespace] ?? $namespace;
         }
-        return '\\PHPJava\\Imitation\\' . implode('\\', $buildClassPath);
+
+        // resolve something approaching
+        $relativePath = implode('/', $namespaces);
+        foreach (static::$resolves as [$resourceType, $value]) {
+            switch ($resourceType) {
+                case static::RESOURCE_TYPE_FILE:
+                    $path = realpath($value . '/' . $relativePath . '.class');
+                    if (($key = array_search($path, static::$resolvedPaths, true)) !== false) {
+                        return static::$resolvedPaths[$key];
+                    }
+                    if (is_file($path)) {
+                        return $resolvedPaths[] = [
+                            static::RESOLVED_TYPE_CLASS,
+                            new JavaClass(new JavaClassReader($path)),
+                        ];
+                    }
+                    break;
+            }
+        }
+
+        return [
+            static::RESOLVED_TYPE_IMITATION,
+            '\\PHPJava\\Imitation\\' . implode('\\', $buildClassPath),
+        ];
+    }
+
+    public static function add($valuesOrResourceType = self::RESOURCE_TYPE_FILE, $value = null): void
+    {
+        if (is_array($valuesOrResourceType)) {
+            foreach ($valuesOrResourceType as [$resourceType, $value]) {
+                static::add($resourceType, $value);
+            }
+
+            return;
+        }
+
+        if (in_array([$valuesOrResourceType, $value], static::$resolves, true)) {
+            return;
+        }
+        static::$resolves[] = [$valuesOrResourceType, $value];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace PHPJava\Core;`
`3`	`3`
	`4`	`+use PHPJava\Utilities\ClassResolver;`
	`5`	`+`
`4`	`6`	`class JavaClassReader`
`5`	`7`	`{`
`6`	`8`	`private $handle;`
`@@ -10,6 +12,12 @@ public function __construct(string $file)`
`10`	`12`	`{`
`11`	`13`	`$this->handle = fopen($file, 'r');`
`12`	`14`	`$this->binaryReader = new JVM\Stream\BinaryReader($this->handle);`
	`15`	`+`
	`16`	`+ // Add resolving path`
	`17`	`+ ClassResolver::add(`
	`18`	`+ ClassResolver::RESOURCE_TYPE_FILE,`
	`19`	`+ dirname($file)`
	`20`	`+ );`
`13`	`21`	`}`
`14`	`22`
`15`	`23`	`public function getBinaryReader(): JVM\Stream\BinaryReader`