Fix: cannot call same place another class in JAR

m3m0r7 · m3m0r7 · commit 9cbbbe6fff81 · 2019-05-09T21:27:19.000+09:00
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
@@ -23,16 +23,21 @@ public function __construct(
 
     public function __call($name, $arguments)
     {
-        $this->initializeIfNotInitiated();
-        return $this->javaClass->{$name}(...$arguments);
+        return ($this->initializeIfNotInitiated())->{$name}(...$arguments);
+    }
+
+    public function __invoke(...$arguments): JavaClassInterface
+    {
+        ;
+        return ($this->initializeIfNotInitiated())(...$arguments);
     }
 
     private function initializeIfNotInitiated()
     {
         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`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,21 @@ public function __construct(`
`23`	`23`
`24`	`24`	`public function __call($name, $arguments)`
`25`	`25`	`{`
`26`		`- $this->initializeIfNotInitiated();`
`27`		`- return $this->javaClass->{$name}(...$arguments);`
	`26`	`+ return ($this->initializeIfNotInitiated())->{$name}(...$arguments);`
	`27`	`+ }`
	`28`	`+`
	`29`	`+ public function __invoke(...$arguments): JavaClassInterface`
	`30`	`+ {`
	`31`	`+ ;`
	`32`	`+ return ($this->initializeIfNotInitiated())(...$arguments);`
`28`	`33`	`}`
`29`	`34`
`30`	`35`	`private function initializeIfNotInitiated()`
`31`	`36`	`{`
`32`	`37`	`if (isset($this->javaClass)) {`
`33`	`38`	`return $this->javaClass;`
`34`	`39`	`}`
`35`		`- $this->javaClass = new JavaClass(`
	`40`	`+ return $this->javaClass = new JavaClass(`
`36`	`41`	`new $this->deferLoadingReaderClass(...$this->arguments),`
`37`	`42`	`$this->options`
`38`	`43`	`);`