Merge pull request #138 from php-java/fix-cannot-call-same-place-class-in-jar

m3m0r7 · web-flow · commit 77668dbc81dc · 2019-05-09T21:40:27.000+09:00
Fix: cannot call same package class in JAR.
diff --git a/src/Core/JavaArchive.php b/src/Core/JavaArchive.php
@@ -227,7 +227,7 @@ public function getClassByName(string $name): JavaClassInterface
     {
         $name = str_replace('/', '.', $name);
         if (!isset($this->classes[$name])) {
-            throw new ClassNotFoundException($name . ' does not found on ' . $this->jarFile . '.');
+            throw new ClassNotFoundException($name . ' does not exist on ' . $this->jarFile . '.');
         }
         return $this->classes[$name];
     }
diff --git a/src/Kernel/Internal/JavaClassDeferredLoader.php b/src/Kernel/Internal/JavaClassDeferredLoader.php
@@ -11,6 +11,12 @@ final class JavaClassDeferredLoader implements JavaClassInterface
     private $options = [];
     private $javaClass;
 
+    /**
+     * JavaClassDeferredLoader constructor.
+     * @param string $deferLoadingReaderClass
+     * @param array $arguments
+     * @param array $options
+     */
     public function __construct(
         string $deferLoadingReaderClass,
         array $arguments = [],
@@ -21,18 +27,43 @@ public function __construct(
         $this->options = $options;
     }
 
+    /**
+     * @param $name
+     * @param $arguments
+     * @return mixed
+     * @throws \PHPJava\Exceptions\ReadEntryException
+     * @throws \PHPJava\Exceptions\UnknownVersionException
+     * @throws \PHPJava\Exceptions\ValidatorException
+     */
     public function __call($name, $arguments)
     {
-        $this->initializeIfNotInitiated();
-        return $this->javaClass->{$name}(...$arguments);
+        return ($this->initializeIfNotInitiated())->{$name}(...$arguments);
     }
 
-    private function initializeIfNotInitiated()
+    /**
+     * @param mixed ...$arguments
+     * @return JavaClassInterface
+     * @throws \PHPJava\Exceptions\ReadEntryException
+     * @throws \PHPJava\Exceptions\UnknownVersionException
+     * @throws \PHPJava\Exceptions\ValidatorException
+     */
+    public function __invoke(...$arguments): JavaClassInterface
+    {
+        return ($this->initializeIfNotInitiated())(...$arguments);
+    }
+
+    /**
+     * @return JavaClass
+     * @throws \PHPJava\Exceptions\ReadEntryException
+     * @throws \PHPJava\Exceptions\UnknownVersionException
+     * @throws \PHPJava\Exceptions\ValidatorException
+     */
+    private function initializeIfNotInitiated(): JavaClass
     {
         if (isset($this->javaClass)) {
             return $this->javaClass;
         }
-        $this->javaClass = new JavaClass(
+        return $this->javaClass = new JavaClass(
             new $this->deferLoadingReaderClass(...$this->arguments),
             $this->options
         );
diff --git a/tests/JarTest.php b/tests/JarTest.php
@@ -8,12 +8,15 @@ class JarTest extends Base
 {
     protected $fixtures = [
         'OuterClassTest',
+        'JarCalleeTest',
+        'JarCallerTest',
     ];
 
     public function setUp(): void
     {
         parent::setUp();
         exec('cd ' . __DIR__ . '/caches && jar -cvfe JarTest.jar OuterClassTest OuterClassTest.class');
+        exec('cd ' . __DIR__ . '/caches && jar -cvfe JarCallTest.jar JarCallerTest JarCalleeTest.class JarCallerTest.class');
     }
 
     public function testCallWithEntryPoint()
@@ -47,4 +50,20 @@ public function testCallWithTargetedMethod()
             $result
         );
     }
+
+    public function testSamePlaceClass()
+    {
+        ob_start();
+        (new JavaArchive(__DIR__ . '/caches/JarCallTest.jar'))
+            ->getClassByName('JarCallerTest')
+            ->getInvoker()
+            ->getStatic()
+            ->getMethods()
+            ->call(
+                'main',
+                []
+            );
+        $result = ob_get_clean();
+        $this->assertEquals("TEST\n", $result);
+    }
 }
diff --git a/tests/fixtures/java/JarCalleeTest.java b/tests/fixtures/java/JarCalleeTest.java
@@ -0,0 +1,7 @@
+class JarCalleeTest
+{
+    public JarCalleeTest(String a)
+    {
+        System.out.println(a);
+    }
+}
diff --git a/tests/fixtures/java/JarCallerTest.java b/tests/fixtures/java/JarCallerTest.java
@@ -0,0 +1,8 @@
+class JarCallerTest
+{
+    public static void main(String[] args)
+    {
+        new JarCalleeTest("TEST");
+    }
+}
+

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public function getClassByName(string $name): JavaClassInterface`
`227`	`227`	`{`
`228`	`228`	`$name = str_replace('/', '.', $name);`
`229`	`229`	`if (!isset($this->classes[$name])) {`
`230`		`- throw new ClassNotFoundException($name . ' does not found on ' . $this->jarFile . '.');`
	`230`	`+ throw new ClassNotFoundException($name . ' does not exist on ' . $this->jarFile . '.');`
`231`	`231`	`}`
`232`	`232`	`return $this->classes[$name];`
`233`	`233`	`}`