Support classpath

m3m0r7 · m3m0r7 · commit fc7332dadc02 · 2019-03-04T21:45:01.000+09:00
diff --git a/src/Core/JavaArchive.php b/src/Core/JavaArchive.php
@@ -5,6 +5,7 @@
 use PHPJava\Imitation\java\io\FileNotFoundException;
 use PHPJava\Imitation\java\lang\ClassNotFoundException;
 use PHPJava\Utilities\ClassResolver;
+use PHPJava\Utilities\FileTypeResolver;
 
 class JavaArchive
 {
@@ -76,6 +77,29 @@ function ($fileName) {
                 $code
             ));
         }
+
+        $currentDirectory = getcwd();
+        foreach ($this->getClassPaths() as $classPath) {
+            $resolvePath = $classPath[0] === '/' ? $classPath : ($currentDirectory . '/' . $classPath);
+            $realpath = realpath($resolvePath);
+            if ($realpath === false) {
+                throw new FileNotFoundException($classPath . ' does not exist.');
+            }
+
+            $value = $realpath;
+
+            switch ($fileType = FileTypeResolver::resolve($resolvePath)) {
+                case ClassResolver::RESOLVED_TYPE_CLASS:
+                    $value = new JavaClassFileReader($value);
+                    break;
+                case ClassResolver::RESOURCE_TYPE_JAR:
+                    $value = new JavaArchive($value);
+                    break;
+                case ClassResolver::RESOURCE_TYPE_FILE:
+                    break;
+            }
+            ClassResolver::add($fileType, $value);
+        }
     }
 
     /**
@@ -129,7 +153,7 @@ public function getEntryPointName(): ?string
     public function getClassPaths(): array
     {
         $classPaths = [];
-        foreach (explode(' ', $this->manifestData['class-path'] ?? []) as $path) {
+        foreach (explode(' ', $this->manifestData['class-path'] ?? '') as $path) {
             if (empty($path)) {
                 continue;
             }
diff --git a/src/Utilities/ClassResolver.php b/src/Utilities/ClassResolver.php
@@ -4,6 +4,7 @@
 use PHPJava\Core\JavaArchive;
 use PHPJava\Core\JavaClass;
 use PHPJava\Core\JavaClassFileReader;
+use PHPJava\Core\JavaClassReaderInterface;
 use PHPJava\Imitation\java\lang\ClassNotFoundException;
 
 class ClassResolver
@@ -15,7 +16,8 @@ class ClassResolver
 
     // resource types
     const RESOURCE_TYPE_FILE = 'RESOURCE_TYPE_FILE';
-    const RESOURCE_TYPE_JAR = 'RESOLVED_TYPE_JAR';
+    const RESOURCE_TYPE_JAR = 'RESOURCE_TYPE_JAR';
+    const RESOURCE_TYPE_CLASS = 'RESOURCE_TYPE_CLASS';
 
     // resolved types
     const RESOLVED_TYPE_CLASS = 'RESOLVED_TYPE_CLASS';
@@ -64,6 +66,18 @@ public static function resolve(string $javaPath, JavaClass $class = null): array
                     } catch (ClassNotFoundException $e) {
                     }
                     break;
+                case static::RESOLVED_TYPE_CLASS:
+                    /**
+                     * @var JavaClassReaderInterface $value
+                     */
+                    try {
+                        return $resolvedPaths[] = [
+                            static::RESOLVED_TYPE_CLASS,
+                            new JavaClass($value),
+                        ];
+                    } catch (ClassNotFoundException $e) {
+                    }
+                    break;
             }
         }
 
diff --git a/src/Utilities/FileTypeResolver.php b/src/Utilities/FileTypeResolver.php
@@ -0,0 +1,22 @@
+<?php
+namespace PHPJava\Utilities;
+
+use PHPJava\Core\JavaClass;
+use PHPJava\Exceptions\TypeException;
+
+class FileTypeResolver
+{
+    public static function resolve($path): string
+    {
+        if (preg_match('/\.class$/', $path)) {
+            return ClassResolver::RESOLVED_TYPE_CLASS;
+        }
+        if (preg_match('/\.jar$/', $path)) {
+            return ClassResolver::RESOURCE_TYPE_JAR;
+        }
+        if (is_dir($path)) {
+            return ClassResolver::RESOURCE_TYPE_FILE;
+        }
+    }
+
+}
