WIP commit

m3m0r7 · m3m0r7 · commit a4270e0e4bb9 · 2019-03-02T16:03:19.000+09:00
diff --git a/src/Core/JavaArchive.php b/src/Core/JavaArchive.php
@@ -3,6 +3,7 @@
 
 use PHPJava\Imitation\java\io\FileNotFoundException;
 use PHPJava\Imitation\java\lang\ClassNotFoundException;
+use PHPJava\Utilities\ClassResolver;
 
 class JavaArchive
 {
@@ -63,6 +64,15 @@ function ($fileName) {
                 $code
             ));
         }
+
+        // Add resolving path
+        ClassResolver::add(
+            [
+                [ClassResolver::RESOURCE_TYPE_FILE, dirname($jarFile)],
+                [ClassResolver::RESOURCE_TYPE_FILE, getcwd()],
+                [ClassResolver::RESOURCE_TYPE_JAR, $this],
+            ]
+        );
     }
 
     public function __debugInfo()
@@ -72,6 +82,7 @@ public function __debugInfo()
             'createdBy' => $this->getCreatedBy(),
             'entryPointName' => $this->getEntryPointName(),
             'file' => $this->jarFile,
+            'classes' => $this->getClasses(),
         ];
     }
 
@@ -98,7 +109,7 @@ public function getClasses(): array
     public function getClassByName(string $name): JavaClass
     {
         if (!isset($this->classes[$name])) {
-            throw new ClassNotFoundException($name . ' does not found on ' . $this->jarFile . '.');
+            throw new ClassNotFoundException(str_replace('/', '.', $name) . ' does not found on ' . $this->jarFile . '.');
         }
         return $this->classes[$name];
     }
diff --git a/src/Utilities/ClassResolver.php b/src/Utilities/ClassResolver.php
@@ -1,8 +1,10 @@
 <?php
 namespace PHPJava\Utilities;
 
+use PHPJava\Core\JavaArchive;
 use PHPJava\Core\JavaClass;
 use PHPJava\Core\JavaClassFileReader;
+use PHPJava\Imitation\java\lang\ClassNotFoundException;
 
 class ClassResolver
 {
@@ -13,6 +15,7 @@ class ClassResolver
 
     // resource types
     const RESOURCE_TYPE_FILE = 'RESOURCE_TYPE_FILE';
+    const RESOURCE_TYPE_JAR = 'RESOLVED_TYPE_JAR';
 
     // resolved types
     const RESOLVED_TYPE_CLASS = 'RESOLVED_TYPE_CLASS';
@@ -49,13 +52,25 @@ public static function resolve(string $javaPath, JavaClass $class = null): array
                         ];
                     }
                     break;
+                case static::RESOURCE_TYPE_JAR:
+                    /**
+                     * @var JavaArchive $value
+                     */
+                    try {
+                        return $resolvedPaths[] = [
+                            static::RESOLVED_TYPE_CLASS,
+                            $value->getClassByName($relativePath),
+                        ];
+                    } catch (ClassNotFoundException $e) {
+                    }
+                    break;
             }
         }
 
         $className = '\\PHPJava\\Imitation\\' . implode('\\', $buildClassPath);
 
         if (!class_exists($className)) {
-            throw new \PHPJava\Imitation\java\lang\ClassNotFoundException(str_replace(['\\PHPJava\\Imitation\\', '\\'], ['', '.'], $className) . ' class does not exist.');
+            throw new ClassNotFoundException(str_replace(['\\PHPJava\\Imitation\\', '\\'], ['', '.'], $className) . ' class does not exist.');
         }
 
         return [
@@ -70,7 +85,6 @@ public static function add($valuesOrResourceType = self::RESOURCE_TYPE_FILE, $va
             foreach ($valuesOrResourceType as [$resourceType, $value]) {
                 static::add($resourceType, $value);
             }
-
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`use PHPJava\Imitation\java\io\FileNotFoundException;`
`5`	`5`	`use PHPJava\Imitation\java\lang\ClassNotFoundException;`
	`6`	`+use PHPJava\Utilities\ClassResolver;`
`6`	`7`
`7`	`8`	`class JavaArchive`
`8`	`9`	`{`
`@@ -63,6 +64,15 @@ function ($fileName) {`
`63`	`64`	`$code`
`64`	`65`	`));`
`65`	`66`	`}`
	`67`	`+`
	`68`	`+ // Add resolving path`
	`69`	`+ ClassResolver::add(`
	`70`	`+ [`
	`71`	`+ [ClassResolver::RESOURCE_TYPE_FILE, dirname($jarFile)],`
	`72`	`+ [ClassResolver::RESOURCE_TYPE_FILE, getcwd()],`
	`73`	`+ [ClassResolver::RESOURCE_TYPE_JAR, $this],`
	`74`	`+ ]`
	`75`	`+ );`
`66`	`76`	`}`
`67`	`77`
`68`	`78`	`public function __debugInfo()`
`@@ -72,6 +82,7 @@ public function __debugInfo()`
`72`	`82`	`'createdBy' => $this->getCreatedBy(),`
`73`	`83`	`'entryPointName' => $this->getEntryPointName(),`
`74`	`84`	`'file' => $this->jarFile,`
	`85`	`+ 'classes' => $this->getClasses(),`
`75`	`86`	`];`
`76`	`87`	`}`
`77`	`88`
`@@ -98,7 +109,7 @@ public function getClasses(): array`
`98`	`109`	`public function getClassByName(string $name): JavaClass`
`99`	`110`	`{`
`100`	`111`	`if (!isset($this->classes[$name])) {`
`101`		`- throw new ClassNotFoundException($name . ' does not found on ' . $this->jarFile . '.');`
	`112`	`+ throw new ClassNotFoundException(str_replace('/', '.', $name) . ' does not found on ' . $this->jarFile . '.');`
`102`	`113`	`}`
`103`	`114`	`return $this->classes[$name];`
`104`	`115`	`}`