Fix codes

m3m0r7 · m3m0r7 · commit 4440690f8e8e · 2019-12-29T18:38:17.000+09:00
diff --git a/src/Compiler/Lang/Assembler/ClassAssembler.php b/src/Compiler/Lang/Assembler/ClassAssembler.php
@@ -16,7 +16,6 @@
 use PHPJava\Compiler\Lang\Assembler\Store\Store;
 use PHPJava\Compiler\Lang\Assembler\Traits\Bindable;
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\ConstantPoolEnhanceable;
-use PHPJava\Compiler\Lang\Assembler\Traits\ImportManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\OperationManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\ParameterParseable;
 use PHPJava\Compiler\Lang\Assembler\Traits\StaticInitializerAssignable;
diff --git a/src/Compiler/Lang/Assembler/MethodAssembler.php b/src/Compiler/Lang/Assembler/MethodAssembler.php
@@ -14,7 +14,6 @@
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\ConstantPoolEnhanceable;
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\Operation\LocalVariableAssignable;
 use PHPJava\Compiler\Lang\Assembler\Traits\Enhancer\Operation\LocalVariableLoadable;
-use PHPJava\Compiler\Lang\Assembler\Traits\ImportManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\OperationManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\ParameterParseable;
 use PHPJava\Kernel\Maps\OpCode;
diff --git a/src/Compiler/Lang/Assembler/Processors/StatementProcessor.php b/src/Compiler/Lang/Assembler/Processors/StatementProcessor.php
@@ -14,7 +14,6 @@
 use PHPJava\Compiler\Lang\Assembler\Statements\IfStatementAssembler;
 use PHPJava\Compiler\Lang\Assembler\Structure\Accessor\Imports;
 use PHPJava\Compiler\Lang\Assembler\Traits\Bindable;
-use PHPJava\Compiler\Lang\Assembler\Traits\ImportManageable;
 use PHPJava\Compiler\Lang\Assembler\Traits\NodeExtractable;
 use PHPJava\Compiler\Lang\Assembler\Traits\OperationManageable;
 use PHPJava\Exceptions\AssembleStructureException;
diff --git a/src/Compiler/Lang/Assembler/Structure/Accessor/Imports.php b/src/Compiler/Lang/Assembler/Structure/Accessor/Imports.php
@@ -40,11 +40,11 @@ public function resolvePath(string $path): string
 
     protected function compareAtFirst(string $path, string $target): bool
     {
-        return !!preg_match('/\A' . preg_quote($path, '/') . '/', $target);
+        return (bool) preg_match('/\A' . preg_quote($path, '/') . '/', $target);
     }
 
     protected function compareAtLast(string $path, string $target): bool
     {
-        return !!preg_match('/' . preg_quote($path, '/') . '\z/', $target);
+        return (bool) preg_match('/' . preg_quote($path, '/') . '\z/', $target);
     }
 }
diff --git a/src/Compiler/Lang/Assembler/Traits/ImportManageable.php b/src/Compiler/Lang/Assembler/Traits/ImportManageable.php
@@ -5,7 +5,6 @@
 use PHPJava\Compiler\Builder\Attributes\Architects\Operation;
 use PHPJava\Compiler\Builder\Finder\ConstantPoolFinder;
 use PHPJava\Compiler\Lang\Assembler\Enhancer\ConstantPoolEnhancer;
-use PHPJava\Compiler\Lang\Assembler\EntryPointClassAssembler;
 use PHPJava\Compiler\Lang\Assembler\Structure\Accessor\Imports;
 use PHPJava\Exceptions\NotFoundImportException;
 
diff --git a/src/Compiler/Lang/Assembler/Traits/ParameterParseable.php b/src/Compiler/Lang/Assembler/Traits/ParameterParseable.php
@@ -52,7 +52,7 @@ public function parseParameterFromNode(Node $node): array
             foreach ($documentBlock->getTagsByName('param') as $documentParameter) {
                 /**
                  * @var \phpDocumentor\Reflection\DocBlock\Tags\Param $documentParameter
-                 * @var \phpDocumentor\Reflection\Types\Object_|null $typeObject
+                 * @var null|\phpDocumentor\Reflection\Types\Object_ $typeObject
                  */
                 $typeObject = $documentParameter
                     ->getType();
diff --git a/src/Kernel/Mnemonics/_if_acmpne.php b/src/Kernel/Mnemonics/_if_acmpne.php
@@ -4,7 +4,6 @@
 
 use PHPJava\Core\JavaClass;
 use PHPJava\Kernel\Structures\Utf8Info;
-use PHPJava\Packages\java\lang\String_;
 
 final class _if_acmpne extends AbstractOperationCode implements OperationCodeInterface
 {
diff --git a/src/Kernel/Mnemonics/_ireturn.php b/src/Kernel/Mnemonics/_ireturn.php
@@ -2,7 +2,6 @@
 declare(strict_types=1);
 namespace PHPJava\Kernel\Mnemonics;
 
-use PHPJava\Kernel\Types\Boolean_;
 use PHPJava\Kernel\Types\Byte_;
 use PHPJava\Kernel\Types\Char_;
 use PHPJava\Kernel\Types\Int_;
diff --git a/src/Kernel/Resolvers/TypeResolver.php b/src/Kernel/Resolvers/TypeResolver.php
@@ -16,10 +16,10 @@
 use PHPJava\Kernel\Types\Float_;
 use PHPJava\Kernel\Types\Int_;
 use PHPJava\Kernel\Types\Long_;
-use PHPJava\Kernel\Types\Short_;
-use PHPJava\Kernel\Types\Void_;
 use PHPJava\Kernel\Types\PrimitiveValueInterface;
+use PHPJava\Kernel\Types\Short_;
 use PHPJava\Kernel\Types\Type;
+use PHPJava\Kernel\Types\Void_;
 use PHPJava\Packages\java\lang\String_;
 use PHPJava\Utilities\Formatter;
 
@@ -324,7 +324,7 @@ public static function getExtendedClasses(JavaClassInterface $javaClass, string
 
     /**
      * @throws TypeException
-     * @return Type|Collection
+     * @return Collection|Type
      */
     public static function convertPHPTypeToJavaType($value)
     {
diff --git a/src/Packages/java/io/PrintStream.php b/src/Packages/java/io/PrintStream.php
@@ -9,8 +9,8 @@
 use PHPJava\Kernel\Structures\Utf8Info;
 use PHPJava\Kernel\Types\Array_\Collection;
 use PHPJava\Kernel\Types\PrimitiveValueInterface;
-use PHPJava\Packages\java\lang\String_;
 use PHPJava\Packages\java\lang\NullPointerException;
+use PHPJava\Packages\java\lang\String_;
 
 // use PHPJava\Packages\java\io\Closeable;
 // use PHPJava\Packages\java\lang\Appendable;
diff --git a/src/Packages/java/lang/invoke/LambdaMetafactory.php b/src/Packages/java/lang/invoke/LambdaMetafactory.php
@@ -8,8 +8,8 @@
 use PHPJava\Exceptions\NotImplementedException;
 use PHPJava\Kernel\Internal\Lambda;
 use PHPJava\Kernel\Structures\MethodHandleInfo;
-use PHPJava\Packages\java\lang\Object_;
 use PHPJava\Packages\java\lang\invoke\MethodHandles\Lookup;
+use PHPJava\Packages\java\lang\Object_;
 
 /**
  * The `LambdaMetafactory` class was auto generated.
diff --git a/src/Packages/java/lang/invoke/MethodHandles.php b/src/Packages/java/lang/invoke/MethodHandles.php
@@ -4,8 +4,8 @@
 
 use PHPJava\Core\JavaClass;
 use PHPJava\Exceptions\NotImplementedException;
-use PHPJava\Packages\java\lang\Object_;
 use PHPJava\Packages\java\lang\invoke\MethodHandles\Lookup;
+use PHPJava\Packages\java\lang\Object_;
 
 // use PHPJava\Packages\java\util\_List;
 // use PHPJava\Packages\java\lang\reflect\Member;
diff --git a/src/Packages/java/lang/invoke/MethodHandles/Lookup.php b/src/Packages/java/lang/invoke/MethodHandles/Lookup.php
@@ -5,8 +5,8 @@
 use PHPJava\Core\JavaClass;
 use PHPJava\Core\JavaClassInterface;
 use PHPJava\Exceptions\NotImplementedException;
-use PHPJava\Packages\java\lang\Object_;
 use PHPJava\Packages\java\lang\invoke\MethodType;
+use PHPJava\Packages\java\lang\Object_;
 
 // use PHPJava\Packages\java\lang\invoke\MethodHandleInfo;
 
diff --git a/src/Packages/java/lang/invoke/StringConcatFactory.php b/src/Packages/java/lang/invoke/StringConcatFactory.php
@@ -5,9 +5,8 @@
 use PHPJava\Core\JavaClass;
 use PHPJava\Core\JVM\ConstantPool;
 use PHPJava\Exceptions\NotImplementedException;
-use PHPJava\Packages\java\lang\Object_;
-use PHPJava\Packages\java\lang\String_;
 use PHPJava\Packages\java\lang\invoke\MethodHandles\Lookup;
+use PHPJava\Packages\java\lang\Object_;
 use PHPJava\Utilities\Formatter;
 
 /**
diff --git a/tests/Cases/CastTest.php b/tests/Cases/CastTest.php
@@ -6,7 +6,7 @@
 use PHPJava\Kernel\Types\Char_;
 use PHPJava\Kernel\Types\Double_;
 use PHPJava\Kernel\Types\Float_;
-use PHPJava\Kernel\Types\Int_ ;
+use PHPJava\Kernel\Types\Int_;
 use PHPJava\Kernel\Types\Long_;
 use PHPJava\Kernel\Types\Short_;
 
diff --git a/tests/Cases/Compiler/Codes/TestUseStatement.php b/tests/Cases/Compiler/Codes/TestUseStatement.php
@@ -1,5 +1,5 @@
 <?php
-use \PHPJava\Packages\java\lang\String_;
+use PHPJava\Packages\java\lang\String_;
 
 class TestUseStatement
 {
diff --git a/tests/Cases/Compiler/Codes/TestUseStatementWithNamespace.php b/tests/Cases/Compiler/Codes/TestUseStatementWithNamespace.php
@@ -1,6 +1,7 @@
 <?php
 namespace PHPJava\UseStatement;
-use \PHPJava\Packages\java\lang\String_;
+
+use PHPJava\Packages\java\lang\String_;
 
 class TestUseStatementWithNamespace
 {
diff --git a/tests/Cases/NegationTest.php b/tests/Cases/NegationTest.php
@@ -4,7 +4,7 @@
 
 use PHPJava\Kernel\Types\Double_;
 use PHPJava\Kernel\Types\Float_;
-use PHPJava\Kernel\Types\Int_ ;
+use PHPJava\Kernel\Types\Int_;
 use PHPJava\Kernel\Types\Long_;
 
 class NegationTest extends Base

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,11 @@ public function resolvePath(string $path): string`
`40`	`40`
`41`	`41`	`protected function compareAtFirst(string $path, string $target): bool`
`42`	`42`	`{`
`43`		`- return !!preg_match('/\A' . preg_quote($path, '/') . '/', $target);`
	`43`	`+ return (bool) preg_match('/\A' . preg_quote($path, '/') . '/', $target);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`protected function compareAtLast(string $path, string $target): bool`
`47`	`47`	`{`
`48`		`- return !!preg_match('/' . preg_quote($path, '/') . '\z/', $target);`
	`48`	`+ return (bool) preg_match('/' . preg_quote($path, '/') . '\z/', $target);`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@`
`4`	`4`
`5`	`5`	`use PHPJava\Core\JavaClass;`
`6`	`6`	`use PHPJava\Kernel\Structures\Utf8Info;`
`7`		`-use PHPJava\Packages\java\lang\String_;`
`8`	`7`
`9`	`8`	`final class _if_acmpne extends AbstractOperationCode implements OperationCodeInterface`
`10`	`9`	`{`