Update dependecies

m3m0r7 · m3m0r7 · commit 5a5500a4fb86 · 2019-04-05T18:42:27.000+09:00
diff --git a/src/Imitation/java/io/PrintStream.php b/src/Imitation/java/io/PrintStream.php
@@ -1,6 +1,7 @@
 <?php
 namespace PHPJava\Imitation\java\io;
 
+use PHPJava\Imitation\java\util\IllegalFormatException;
 use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Kernel\Types\Type;
 
@@ -22,7 +23,7 @@ public function println($arg)
             return;
         }
 
-        echo "\n";
+        throw new IllegalFormatException('Cannot pass "' . gettype($arg) . '" in ' . __METHOD__);
     }
 
     public function print($arg)
@@ -39,6 +40,8 @@ public function print($arg)
             echo $arg;
             return;
         }
+
+        throw new IllegalFormatException('Cannot pass "' . gettype($arg) . '" in ' . __METHOD__);
     }
 
     public function append($string)
diff --git a/src/Imitation/java/lang/IllegalArgumentException.php b/src/Imitation/java/lang/IllegalArgumentException.php
@@ -0,0 +1,6 @@
+<?php
+namespace PHPJava\Imitation\java\lang;
+
+class IllegalArgumentException extends RuntimeException
+{
+}
diff --git a/src/Imitation/java/util/IllegalFormatException.php b/src/Imitation/java/util/IllegalFormatException.php
@@ -0,0 +1,8 @@
+<?php
+namespace PHPJava\Imitation\java\util;
+
+use PHPJava\Imitation\java\lang\RuntimeException;
+
+class IllegalFormatException extends RuntimeException
+{
+}
diff --git a/src/Kernel/Mnemonics/_dload.php b/src/Kernel/Mnemonics/_dload.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Double;
 use PHPJava\Utilities\BinaryTool;
 
 final class _dload implements OperationInterface
@@ -15,6 +16,10 @@ final class _dload implements OperationInterface
     public function execute(): void
     {
         $index = $this->readUnsignedByte();
-        $this->pushStack($this->getLocalStorage($index));
+        $this->pushStack(
+            new _Double(
+                $this->getLocalStorage($index)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_dload_0.php b/src/Kernel/Mnemonics/_dload_0.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Double;
 use PHPJava\Utilities\BinaryTool;
 
 final class _dload_0 implements OperationInterface
@@ -11,6 +12,10 @@ final class _dload_0 implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $this->pushStack(
+            new _Double(
+                $this->getLocalStorage(0)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_dload_1.php b/src/Kernel/Mnemonics/_dload_1.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Double;
 use PHPJava\Utilities\BinaryTool;
 
 final class _dload_1 implements OperationInterface
@@ -11,6 +12,10 @@ final class _dload_1 implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $this->pushStack(
+            new _Double(
+                $this->getLocalStorage(1)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_dload_2.php b/src/Kernel/Mnemonics/_dload_2.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Double;
 use PHPJava\Utilities\BinaryTool;
 
 final class _dload_2 implements OperationInterface
@@ -11,6 +12,10 @@ final class _dload_2 implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $this->pushStack(
+            new _Double(
+                $this->getLocalStorage(2)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_dload_3.php b/src/Kernel/Mnemonics/_dload_3.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Double;
 use PHPJava\Utilities\BinaryTool;
 
 final class _dload_3 implements OperationInterface
@@ -11,6 +12,10 @@ final class _dload_3 implements OperationInterface
 
     public function execute(): void
     {
-        throw new NotImplementedException(__CLASS__);
+        $this->pushStack(
+            new _Double(
+                $this->getLocalStorage(3)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_iload.php b/src/Kernel/Mnemonics/_iload.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Int;
 use PHPJava\Utilities\BinaryTool;
 
 final class _iload implements OperationInterface
@@ -13,6 +14,10 @@ public function execute(): void
     {
         $index = $this->readUnsignedByte();
 
-        $this->pushStack($this->getLocalStorage($index));
+        $this->pushStack(
+            new _Int(
+                $this->getLocalStorage($index)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_iload_0.php b/src/Kernel/Mnemonics/_iload_0.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Int;
 use PHPJava\Utilities\BinaryTool;
 
 final class _iload_0 implements OperationInterface
@@ -11,6 +12,10 @@ final class _iload_0 implements OperationInterface
 
     public function execute(): void
     {
-        $this->pushStack($this->getLocalStorage(0));
+        $this->pushStack(
+            new _Int(
+                $this->getLocalStorage(0)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_iload_1.php b/src/Kernel/Mnemonics/_iload_1.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Int;
 use PHPJava\Utilities\BinaryTool;
 
 final class _iload_1 implements OperationInterface
@@ -11,6 +12,10 @@ final class _iload_1 implements OperationInterface
 
     public function execute(): void
     {
-        $this->pushStack($this->getLocalStorage(1));
+        $this->pushStack(
+            new _Int(
+                $this->getLocalStorage(1)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_iload_2.php b/src/Kernel/Mnemonics/_iload_2.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Int;
 use PHPJava\Utilities\BinaryTool;
 
 final class _iload_2 implements OperationInterface
@@ -11,6 +12,10 @@ final class _iload_2 implements OperationInterface
 
     public function execute(): void
     {
-        $this->pushStack($this->getLocalStorage(2));
+        $this->pushStack(
+            new _Int(
+                $this->getLocalStorage(2)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_iload_3.php b/src/Kernel/Mnemonics/_iload_3.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Int;
 use PHPJava\Utilities\BinaryTool;
 
 final class _iload_3 implements OperationInterface
@@ -11,6 +12,10 @@ final class _iload_3 implements OperationInterface
 
     public function execute(): void
     {
-        $this->pushStack($this->getLocalStorage(3));
+        $this->pushStack(
+            new _Int(
+                $this->getLocalStorage(3)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_invokevirtual.php b/src/Kernel/Mnemonics/_invokevirtual.php
@@ -33,7 +33,14 @@ public function execute(): void
         $methodName = $cpInfo[$cpInfo[$cp->getNameAndTypeIndex()]->getNameIndex()]->getString();
 
         if ($invokerClass instanceof JavaClass) {
-            $result = $invokerClass->getInvoker()->getDynamic()->getMethods()->call($methodName, ...$arguments);
+            $result = $invokerClass
+                ->getInvoker()
+                ->getDynamic()
+                ->getMethods()
+                ->call(
+                    $methodName,
+                    ...$arguments
+                );
         } else {
             $result = call_user_func_array(
                 [
diff --git a/src/Kernel/Mnemonics/_lload.php b/src/Kernel/Mnemonics/_lload.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Long;
 use PHPJava\Utilities\BinaryTool;
 
 final class _lload implements OperationInterface
@@ -13,6 +14,10 @@ public function execute(): void
     {
         $index = $this->readUnsignedByte();
 
-        $this->pushStack($this->getLocalStorage($index));
+        $this->pushStack(
+            new _Long(
+                $this->getLocalStorage($index)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_lload_0.php b/src/Kernel/Mnemonics/_lload_0.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Long;
 use PHPJava\Utilities\BinaryTool;
 
 final class _lload_0 implements OperationInterface
@@ -11,6 +12,10 @@ final class _lload_0 implements OperationInterface
 
     public function execute(): void
     {
-        $this->pushStack($this->getLocalStorage(0));
+        $this->pushStack(
+            new _Long(
+                $this->getLocalStorage(0)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_lload_1.php b/src/Kernel/Mnemonics/_lload_1.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Long;
 use PHPJava\Utilities\BinaryTool;
 
 final class _lload_1 implements OperationInterface
@@ -11,6 +12,10 @@ final class _lload_1 implements OperationInterface
 
     public function execute(): void
     {
-        $this->pushStack($this->getLocalStorage(1));
+        $this->pushStack(
+            new _Long(
+                $this->getLocalStorage(1)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_lload_2.php b/src/Kernel/Mnemonics/_lload_2.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Long;
 use PHPJava\Utilities\BinaryTool;
 
 final class _lload_2 implements OperationInterface
@@ -11,6 +12,10 @@ final class _lload_2 implements OperationInterface
 
     public function execute(): void
     {
-        $this->pushStack($this->getLocalStorage(2));
+        $this->pushStack(
+            new _Long(
+                $this->getLocalStorage(2)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Mnemonics/_lload_3.php b/src/Kernel/Mnemonics/_lload_3.php
@@ -2,6 +2,7 @@
 namespace PHPJava\Kernel\Mnemonics;
 
 use PHPJava\Exceptions\NotImplementedException;
+use PHPJava\Kernel\Types\_Long;
 use PHPJava\Utilities\BinaryTool;
 
 final class _lload_3 implements OperationInterface
@@ -11,6 +12,10 @@ final class _lload_3 implements OperationInterface
 
     public function execute(): void
     {
-        $this->pushStack($this->getLocalStorage(3));
+        $this->pushStack(
+            new _Long(
+                $this->getLocalStorage(3)
+            )
+        );
     }
 }
diff --git a/src/Kernel/Types/Type.php b/src/Kernel/Types/Type.php
@@ -5,7 +5,7 @@
 
 class Type
 {
-    private $value = null;
+    protected $value = null;
     protected $nameInJava = null;
     protected $nameInPHP = null;
 
@@ -15,13 +15,16 @@ public function __construct($value)
         if (!is_int($value) &&
             !is_float($value) &&
             !is_string($value) &&
-            !is_bool($value)
+            !is_bool($value) &&
+            !($value instanceof self)
         ) {
             throw new TypeException(
                 'Passed value is not scalar. The value is "' . gettype($value) . '"'
             );
         }
-        $this->value = $value;
+        $this->value = ($value instanceof self)
+            ? $value->getValue()
+            : $value;
     }
 
     public function getValue()
diff --git a/src/Kernel/Types/_Byte.php b/src/Kernel/Types/_Byte.php
@@ -2,8 +2,8 @@
 
 namespace PHPJava\Kernel\Types;
 
-class Byte extends Type
+class _Byte extends Type
 {
     protected $nameInJava = 'byte';
-    protected $nameInPHP  = 'string';
+    protected $nameInPHP  = 'int';
 }
diff --git a/src/Utilities/TypeResolver.php b/src/Utilities/TypeResolver.php
diff --git a/tests/CallToAmbiguousMethodsTest.php b/tests/CallToAmbiguousMethodsTest.php
diff --git a/tests/fixtures/java/CallToAmbiguousMethodsTest.java b/tests/fixtures/java/CallToAmbiguousMethodsTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace PHPJava\Imitation\java\io;`
`3`	`3`
	`4`	`+use PHPJava\Imitation\java\util\IllegalFormatException;`
`4`	`5`	`use PHPJava\Kernel\Structures\_Utf8;`
`5`	`6`	`use PHPJava\Kernel\Types\Type;`
`6`	`7`
`@@ -22,7 +23,7 @@ public function println($arg)`
`22`	`23`	`return;`
`23`	`24`	`}`
`24`	`25`
`25`		`- echo "\n";`
	`26`	`+ throw new IllegalFormatException('Cannot pass "' . gettype($arg) . '" in ' . __METHOD__);`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`public function print($arg)`
`@@ -39,6 +40,8 @@ public function print($arg)`
`39`	`40`	`echo $arg;`
`40`	`41`	`return;`
`41`	`42`	`}`
	`43`	`+`
	`44`	`+ throw new IllegalFormatException('Cannot pass "' . gettype($arg) . '" in ' . __METHOD__);`
`42`	`45`	`}`
`43`	`46`
`44`	`47`	`public function append($string)`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +<?php
 +namespace PHPJava\Imitation\java\lang;
++
 +class IllegalArgumentException extends RuntimeException
 +{
 +}
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`namespace PHPJava\Kernel\Mnemonics;`
`3`	`3`
`4`	`4`	`use PHPJava\Exceptions\NotImplementedException;`
	`5`	`+use PHPJava\Kernel\Types\_Double;`
`5`	`6`	`use PHPJava\Utilities\BinaryTool;`
`6`	`7`
`7`	`8`	`final class _dload implements OperationInterface`
`@@ -15,6 +16,10 @@ final class _dload implements OperationInterface`
`15`	`16`	`public function execute(): void`
`16`	`17`	`{`
`17`	`18`	`$index = $this->readUnsignedByte();`
`18`		`- $this->pushStack($this->getLocalStorage($index));`
	`19`	`+ $this->pushStack(`
	`20`	`+ new _Double(`
	`21`	`+ $this->getLocalStorage($index)`
	`22`	`+ )`
	`23`	`+ );`
`19`	`24`	`}`
`20`	`25`	`}`