WIP commit

m3m0r7 · m3m0r7 · commit ccb132683607 · 2019-02-26T23:24:22.000+09:00
diff --git a/src/core/JavaClassInvoker.php b/src/core/JavaClassInvoker.php
@@ -105,6 +105,26 @@ public function __construct(JavaClass $javaClass)
         }
     }
 
+    public function construct(): self
+    {
+        if (isset($this->staticMethods['<init>'])) {
+            $this->getStaticMethods()->call('<init>');
+        }
+
+        // reset dynamic fields
+        $this->dynamicFieldAccessor = new JVM\Field\DynamicField(
+            $this,
+            []
+        );
+
+        $this->dynamicMethodAccessor = new JVM\Invoker\DynamicMethodInvoker(
+            $this,
+            $this->dynamicMethods
+        );
+
+        return $this;
+    }
+
     public function getJavaClass(): JavaClass
     {
         return $this->javaClass;
diff --git a/src/core/jvm/field/FieldGettable.php b/src/core/jvm/field/FieldGettable.php
@@ -2,11 +2,24 @@
 namespace PHPJava\Core\JVM\Field;
 
 use PHPJava\Core\JavaClassInvoker;
+use PHPJava\Imitation\java\lang\_String;
+use PHPJava\Imitation\java\lang\NoSuchFieldException;
 
 trait FieldGettable
 {
+    /**
+     * @param $name
+     * @return mixed
+     * @throws NoSuchFieldException
+     */
     public function get(string $name)
     {
+        if (!isset($this->fields[$name])) {
+            throw new NoSuchFieldException('Get to undefined field ' . $name);
+        }
+        if ($this->fields[$name] instanceof _String) {
+            return (string) $this->fields[$name];
+        }
         return $this->fields[$name];
     }
 }
diff --git a/src/core/jvm/field/FieldSettable.php b/src/core/jvm/field/FieldSettable.php
@@ -8,5 +8,6 @@ trait FieldSettable
     public function set(string $name, $value)
     {
         $this->fields[$name] = $value;
+        return $this;
     }
 }
diff --git a/src/core/jvm/field/StaticField.php b/src/core/jvm/field/StaticField.php
@@ -3,38 +3,17 @@
 
 use PHPJava\Core\JavaClassInvoker;
 use PHPJava\Imitation\java\lang\_String;
-use PHPJava\Imitation\java\lang\NoSuchFieldException;
 
 class StaticField
 {
-    public $fields = [];
+    use FieldGettable;
+    use FieldSettable;
 
     private $javaClassInvoker;
+    public $fields = [];
 
     public function __construct(JavaClassInvoker $javaClassInvoker)
     {
         $this->javaClassInvoker = $javaClassInvoker;
     }
-
-    /**
-     * @param $name
-     * @return mixed
-     * @throws NoSuchFieldException
-     */
-    public function get(string $name)
-    {
-        if (!isset($this->fields[$name])) {
-            throw new NoSuchFieldException('Get to undefined static field ' . $name);
-        }
-        if ($this->fields[$name] instanceof _String) {
-            return (string) $this->fields[$name];
-        }
-        return $this->fields[$name];
-    }
-
-    public function set(string $name, $value)
-    {
-        $this->fields[$name] = $value;
-        return $this;
-    }
 }
diff --git a/src/imitation/java/lang/Throwable.php b/src/imitation/java/lang/Throwable.php
@@ -5,6 +5,11 @@ class Throwable extends \Exception
 {
     use \PHPJava\Imitation\PHPJava\Extended\_Object;
 
+    public function __construct($message = "", $code = 0, Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+
     public function __toString(): string
     {
         return $this->getMessage();
diff --git a/tools/test.php b/tools/test.php
@@ -9,6 +9,14 @@
     new \PHPJava\Core\JavaClassReader(__DIR__ . '/Test.class')
 );
 
+
+var_dump(
+    $javaClass->getInvoker()
+    ->construct()
+    ->getDynamicFields()
+    ->get('z')
+);
+
 $javaClass->getInvoker()->getStaticFields()
     ->set('c', 100)
     ->set('b', 'New String');

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,24 @@`
`2`	`2`	`namespace PHPJava\Core\JVM\Field;`
`3`	`3`
`4`	`4`	`use PHPJava\Core\JavaClassInvoker;`
	`5`	`+use PHPJava\Imitation\java\lang\_String;`
	`6`	`+use PHPJava\Imitation\java\lang\NoSuchFieldException;`
`5`	`7`
`6`	`8`	`trait FieldGettable`
`7`	`9`	`{`
	`10`	`+ /**`
	`11`	`+ * @param $name`
	`12`	`+ * @return mixed`
	`13`	`+ * @throws NoSuchFieldException`
	`14`	`+ */`
`8`	`15`	`public function get(string $name)`
`9`	`16`	`{`
	`17`	`+ if (!isset($this->fields[$name])) {`
	`18`	`+ throw new NoSuchFieldException('Get to undefined field ' . $name);`
	`19`	`+ }`
	`20`	`+ if ($this->fields[$name] instanceof _String) {`
	`21`	`+ return (string) $this->fields[$name];`
	`22`	`+ }`
`10`	`23`	`return $this->fields[$name];`
`11`	`24`	`}`
`12`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,6 @@ trait FieldSettable`
`8`	`8`	`public function set(string $name, $value)`
`9`	`9`	`{`
`10`	`10`	`$this->fields[$name] = $value;`
	`11`	`+ return $this;`
`11`	`12`	`}`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,11 @@ class Throwable extends \Exception`
`5`	`5`	`{`
`6`	`6`	`use \PHPJava\Imitation\PHPJava\Extended\_Object;`
`7`	`7`
	`8`	`+ public function __construct($message = "", $code = 0, Throwable $previous = null)`
	`9`	`+ {`
	`10`	`+ parent::__construct($message, $code, $previous);`
	`11`	`+ }`
	`12`	`+`
`8`	`13`	`public function __toString(): string`
`9`	`14`	`{`
`10`	`15`	`return $this->getMessage();`