Fix

m3m0r7 · m3m0r7 · commit 61635e356410 · 2019-04-07T04:59:22.000+09:00
diff --git a/src/Core/JVM/Invoker/Invokable.php b/src/Core/JVM/Invoker/Invokable.php
@@ -266,4 +266,9 @@ public function getList(): array
     {
         return $this->methods;
     }
+
+    public function has(string $name): bool
+    {
+        return count($this->methods[$name] ?? []) > 0;
+    }
 }
diff --git a/src/Core/JVM/Invoker/InvokerInterface.php b/src/Core/JVM/Invoker/InvokerInterface.php
@@ -9,4 +9,5 @@ public function __construct(JavaClassInvoker $javaClassInvoker, array $methods);
     public function call(string $name, ...$arguments);
     public function isDynamic(): bool;
     public function getList(): array;
+    public function has(string $name): bool;
 }
diff --git a/src/Core/JavaArchive.php b/src/Core/JavaArchive.php
@@ -209,8 +209,9 @@ public function getClasses(): array
 
     public function getClassByName(string $name): JavaClassInterface
     {
+        $name = str_replace('/', '.', $name);
         if (!isset($this->classes[$name])) {
-            throw new ClassNotFoundException(str_replace('/', '.', $name) . ' does not found on ' . $this->jarFile . '.');
+            throw new ClassNotFoundException($name . ' does not found on ' . $this->jarFile . '.');
         }
         return $this->classes[$name];
     }
diff --git a/src/Core/JavaClass.php b/src/Core/JavaClass.php
@@ -202,19 +202,16 @@ public function __construct(JavaClassReaderInterface $reader, array $options = [
             $this,
             $options
         );
-    }
 
-//    public function __debugInfo()
-//    {
-//        return [
-//            'className' => $this->getClassName(),
-//            'superClass' => get_class($this->getSuperClass()),
-//            'methods' => [
-//                'static' => array_keys($this->invoker->getStatic()->getMethods()->getList()),
-//                'dynamic' => array_keys($this->invoker->getDynamic()->getMethods()->getList()),
-//            ],
-//        ];
-//    }
+        if ($this->invoker->getStatic()->getMethods()->has('<clinit>')) {
+            $this->invoker
+                ->getStatic()
+                ->getMethods()
+                ->call(
+                    '<clinit>'
+                );
+        }
+    }
 
     public function getClassName(bool $shortName = false): string
     {
diff --git a/src/Utilities/DebugTool.php b/src/Utilities/DebugTool.php
@@ -35,4 +35,4 @@ public function getLogger(): Logger
     {
         return $this->logger;
     }
-}
+}
diff --git a/tests/KotlinTest.php b/tests/KotlinTest.php
@@ -0,0 +1,37 @@
+<?php
+namespace PHPJava\Tests;
+
+use PHPJava\Core\JavaArchive;
+use PHPUnit\Framework\TestCase;
+
+class KotlinTest extends Base
+{
+    public function setUp(): void
+    {
+        if (!$this->hasKotlin()) {
+            return;
+        }
+        exec('kotlinc ' . __DIR__ . '/kotlin/HelloWorldKotlin.kt -include-runtime -d ' . __DIR__ . '/caches/HelloWorldKotlin.jar');
+    }
+
+    public function testHelloWorldOnKotlin()
+    {
+        if (!$this->hasKotlin()) {
+            $this->markTestSkipped('Not installed kotlin in your environment.');
+            return;
+        }
+
+        ob_start();
+        $jar = new JavaArchive(__DIR__ . '/caches/HelloWorldKotlin.jar');
+        $jar->execute([]);
+        $result = rtrim(ob_get_clean());
+
+        $this->assertEquals('Hello World!', $result);
+    }
+
+    private function hasKotlin()
+    {
+        exec('which kotlinc', $output);
+        return count($output) > 0;
+    }
+}
diff --git a/tests/kotlin/HelloWorldKotlin.kt b/tests/kotlin/HelloWorldKotlin.kt
@@ -0,0 +1,3 @@
+fun main(args: Array<String>) {
+    println("Hello World!")
+}

Original file line number	Diff line number	Diff line change
`@@ -266,4 +266,9 @@ public function getList(): array`
`266`	`266`	`{`
`267`	`267`	`return $this->methods;`
`268`	`268`	`}`
	`269`	`+`
	`270`	`+ public function has(string $name): bool`
	`271`	`+ {`
	`272`	`+ return count($this->methods[$name] ?? []) > 0;`
	`273`	`+ }`
`269`	`274`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,5 @@ public function __construct(JavaClassInvoker $javaClassInvoker, array $methods);`
`9`	`9`	`public function call(string $name, ...$arguments);`
`10`	`10`	`public function isDynamic(): bool;`
`11`	`11`	`public function getList(): array;`
	`12`	`+ public function has(string $name): bool;`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,8 +209,9 @@ public function getClasses(): array`
`209`	`209`
`210`	`210`	`public function getClassByName(string $name): JavaClassInterface`
`211`	`211`	`{`
	`212`	`+ $name = str_replace('/', '.', $name);`
`212`	`213`	`if (!isset($this->classes[$name])) {`
`213`		`- throw new ClassNotFoundException(str_replace('/', '.', $name) . ' does not found on ' . $this->jarFile . '.');`
	`214`	`+ throw new ClassNotFoundException($name . ' does not found on ' . $this->jarFile . '.');`
`214`	`215`	`}`
`215`	`216`	`return $this->classes[$name];`
`216`	`217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,4 @@ public function getLogger(): Logger`
`35`	`35`	`{`
`36`	`36`	`return $this->logger;`
`37`	`37`	`}`
`38`		`-}`
	`38`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+fun main(args: Array<String>) {`
	`2`	`+ println("Hello World!")`
	`3`	`+}`