Fix tests and reviews

m3m0r7 · m3m0r7 · commit 67d20f4f9bea · 2019-05-03T21:15:02.000+09:00
diff --git a/src/Core/JVM/Intern/StringIntern.php b/src/Core/JVM/Intern/StringIntern.php
@@ -1,8 +1,6 @@
 <?php
 namespace PHPJava\Core\JVM\Intern;
 
-use PHPJava\Exceptions\NotAllowedNumberOfTypesException;
-
 class StringIntern implements InternInterface, \ArrayAccess, \Countable
 {
     private $entries = [];
diff --git a/src/Core/JavaClass.php b/src/Core/JavaClass.php
@@ -18,7 +18,6 @@
 use PHPJava\Kernel\Attributes\SourceFileAttribute;
 use PHPJava\Kernel\Maps\FieldAccessFlag;
 use PHPJava\Kernel\Provider\DependencyInjectionProvider;
-use PHPJava\Kernel\Provider\InternProvider;
 use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Utilities\ClassResolver;
 use PHPJava\Utilities\DebugTool;
diff --git a/src/Kernel/Core/DependencyInjector.php b/src/Kernel/Core/DependencyInjector.php
@@ -23,7 +23,7 @@ private function getNativeAnnotateInjections(string $phpDocument): array
         $documentBlock = \phpDocumentor\Reflection\DocBlockFactory::createInstance()
             ->create($phpDocument);
 
-        // Native annotation will dependency inject.
+        // Native annotation will inject a dependency.
         if (!empty($documentBlock->getTagsByName('native'))) {
             $injections = [];
             foreach ($documentBlock->getTagsByName('native') as $native) {
diff --git a/src/Kernel/Mnemonics/_astore_1.php b/src/Kernel/Mnemonics/_astore_1.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
-use PHPJava\Core\JVM\Intern\StringIntern;
 use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Utilities\BinaryTool;
 
diff --git a/src/Kernel/Mnemonics/_astore_3.php b/src/Kernel/Mnemonics/_astore_3.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPJava\Kernel\Mnemonics;
 
-use PHPJava\Core\JVM\Intern\StringIntern;
 use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Utilities\BinaryTool;
 
diff --git a/src/Kernel/Mnemonics/_if_acmpeq.php b/src/Kernel/Mnemonics/_if_acmpeq.php
@@ -6,7 +6,6 @@
 use PHPJava\Kernel\Structures\_String;
 use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Utilities\BinaryTool;
-use PHPJava\Utilities\Extractor;
 
 final class _if_acmpeq implements OperationInterface
 {
diff --git a/src/Kernel/Mnemonics/_if_acmpne.php b/src/Kernel/Mnemonics/_if_acmpne.php
@@ -5,8 +5,6 @@
 use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Packages\java\lang\_String;
-use PHPJava\Utilities\BinaryTool;
-use PHPJava\Utilities\Extractor;
 
 final class _if_acmpne implements OperationInterface
 {
diff --git a/src/Kernel/Types/_Array/Collection.php b/src/Kernel/Types/_Array/Collection.php
@@ -3,6 +3,7 @@
 
 use PHPJava\Exceptions\TypeException;
 use PHPJava\Kernel\Types\Type;
+use PHPJava\Packages\java\lang\ArrayIndexOutOfBoundsException;
 use PHPJava\Utilities\Extractor;
 use PHPJava\Utilities\TypeResolver;
 
@@ -43,6 +44,9 @@ public function offsetExists($offset)
 
     public function offsetGet($offset)
     {
+        if (!$this->offsetExists($offset)) {
+            throw new ArrayIndexOutOfBoundsException($offset);
+        }
         return $this->data[$offset];
     }
 
diff --git a/src/Packages/java/lang/StringBuilder.php b/src/Packages/java/lang/StringBuilder.php
@@ -410,9 +410,9 @@ public function trimToSize($a = null)
     }
 
 
-    public function toString(): string
+    public function toString()
     {
-        return (string) $this;
+        return new _String((string) $this);
     }
 
     public function __toString(): string
diff --git a/src/Utilities/Extractor.php b/src/Utilities/Extractor.php
@@ -1,7 +1,6 @@
 <?php
 namespace PHPJava\Utilities;
 
-use PHPJava\Kernel\Structures\_Utf8;
 use PHPJava\Kernel\Types\Type;
 use PHPJava\Packages\java\lang\_String;
 

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace PHPJava\Core\JVM\Intern;`
`3`	`3`
`4`		`-use PHPJava\Exceptions\NotAllowedNumberOfTypesException;`
`5`		`-`
`6`	`4`	`class StringIntern implements InternInterface, \ArrayAccess, \Countable`
`7`	`5`	`{`
`8`	`6`	`private $entries = [];`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`use PHPJava\Kernel\Structures\_String;`
`7`	`7`	`use PHPJava\Kernel\Structures\_Utf8;`
`8`	`8`	`use PHPJava\Utilities\BinaryTool;`
`9`		`-use PHPJava\Utilities\Extractor;`
`10`	`9`
`11`	`10`	`final class _if_acmpeq implements OperationInterface`
`12`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`use PHPJava\Exceptions\NotImplementedException;`
`6`	`6`	`use PHPJava\Kernel\Structures\_Utf8;`
`7`	`7`	`use PHPJava\Packages\java\lang\_String;`
`8`		`-use PHPJava\Utilities\BinaryTool;`
`9`		`-use PHPJava\Utilities\Extractor;`
`10`	`8`
`11`	`9`	`final class _if_acmpne implements OperationInterface`
`12`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`use PHPJava\Exceptions\TypeException;`
`5`	`5`	`use PHPJava\Kernel\Types\Type;`
	`6`	`+use PHPJava\Packages\java\lang\ArrayIndexOutOfBoundsException;`
`6`	`7`	`use PHPJava\Utilities\Extractor;`
`7`	`8`	`use PHPJava\Utilities\TypeResolver;`
`8`	`9`
`@@ -43,6 +44,9 @@ public function offsetExists($offset)`
`43`	`44`
`44`	`45`	`public function offsetGet($offset)`
`45`	`46`	`{`
	`47`	`+ if (!$this->offsetExists($offset)) {`
	`48`	`+ throw new ArrayIndexOutOfBoundsException($offset);`
	`49`	`+ }`
`46`	`50`	`return $this->data[$offset];`
`47`	`51`	`}`
`48`	`52`
Original file line number	Diff line number	Diff line change
`@@ -410,9 +410,9 @@ public function trimToSize($a = null)`
`410`	`410`	`}`
`411`	`411`
`412`	`412`
`413`		`- public function toString(): string`
	`413`	`+ public function toString()`
`414`	`414`	`{`
`415`		`- return (string) $this;`
	`415`	`+ return new _String((string) $this);`
`416`	`416`	`}`
`417`	`417`
`418`	`418`	`public function __toString(): string`