Merge pull request php-java#227 from php-java/feature/add-logger-to-invoke-opcode

m3m0r7 · web-flow · commit b6eb6ffedd61 · 2019-08-29T23:34:27.000+09:00
Fix problems
diff --git a/src/Core/JVM/Invoker/Extended/JavaMethodAnnotationInjectable.php b/src/Core/JVM/Invoker/Extended/JavaMethodAnnotationInjectable.php
@@ -1,7 +1,7 @@
 <?php
 namespace PHPJava\Core\JVM\Invoker\Extended;
 
-trait JavaMethodAnnotationAffectable
+trait JavaMethodAnnotationInjectable
 {
     public function getAnnotations(string $name): array
     {
diff --git a/src/Core/JVM/Invoker/JavaClassMethodInvoker.php b/src/Core/JVM/Invoker/JavaClassMethodInvoker.php
@@ -13,7 +13,7 @@ class JavaClassMethodInvoker implements InvokerInterface
     use Extended\MethodListable;
     use Extended\ArgumentsStringifyable;
     use Extended\StaticConstructorInitializable;
-    use Extended\JavaMethodAnnotationAffectable;
+    use Extended\JavaMethodAnnotationInjectable;
     use Extended\JavaMethodSpecifiable;
 
     /**
diff --git a/src/Kernel/Types/_Char.php b/src/Kernel/Types/_Char.php
@@ -31,8 +31,13 @@ public static function isValid($value): bool
     protected static function filter($value)
     {
         if (ctype_alpha($value) && strlen($value) === 1) {
-            return $value;
+            return ord($value);
         }
-        return json_decode(sprintf('"\\u%04X"', $value));
+        return $value;
+    }
+
+    public function __toString(): string
+    {
+        return json_decode(sprintf('"\\u%04X"', $this->value));
     }
 }
diff --git a/src/Packages/java/io/PrintStream.php b/src/Packages/java/io/PrintStream.php
@@ -140,6 +140,7 @@ public function print($methodSignature, $a = null)
             Output::write($arg->getString());
             return;
         }
+
         if (is_scalar($arg) ||
             $arg instanceof Collection ||
             $arg instanceof PrimitiveValueInterface
diff --git a/src/Utilities/Formatter.php b/src/Utilities/Formatter.php
@@ -213,6 +213,18 @@ public static function beatifyOperandStackItems(array $operandStacks = []): stri
                 $formattedItems[] = '< primitive value: ' . ((string) $operandStack) . ' >';
                 continue;
             }
+            if ($operandStack instanceof \ArrayIterator) {
+                $formattedItems[] = '< array: ' . implode(
+                    ', ',
+                    array_map(
+                        function ($value) {
+                            return static::beatifyOperandStackItems([$value]);
+                        },
+                        $operandStack->getArrayCopy()
+                    )
+                ) . ' >';
+                continue;
+            }
             $formattedItems[] = '< unknown: ' . ((string) $operandStack) . ' >';
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace PHPJava\Core\JVM\Invoker\Extended;`
`3`	`3`
`4`		`-trait JavaMethodAnnotationAffectable`
	`4`	`+trait JavaMethodAnnotationInjectable`
`5`	`5`	`{`
`6`	`6`	`public function getAnnotations(string $name): array`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,13 @@ public static function isValid($value): bool`
`31`	`31`	`protected static function filter($value)`
`32`	`32`	`{`
`33`	`33`	`if (ctype_alpha($value) && strlen($value) === 1) {`
`34`		`- return $value;`
	`34`	`+ return ord($value);`
`35`	`35`	`}`
`36`		`- return json_decode(sprintf('"\\u%04X"', $value));`
	`36`	`+ return $value;`
	`37`	`+ }`
	`38`	`+`
	`39`	`+ public function __toString(): string`
	`40`	`+ {`
	`41`	`+ return json_decode(sprintf('"\\u%04X"', $this->value));`
`37`	`42`	`}`
`38`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ public function print($methodSignature, $a = null)`
`140`	`140`	`Output::write($arg->getString());`
`141`	`141`	`return;`
`142`	`142`	`}`
	`143`	`+`
`143`	`144`	`if (is_scalar($arg) \|\|`
`144`	`145`	`$arg instanceof Collection \|\|`
`145`	`146`	`$arg instanceof PrimitiveValueInterface`