Implement countable interface into Operands class

m3m0r7 · m3m0r7 · commit 85b8f8fd9a3e · 2019-08-11T15:59:02.000+09:00
diff --git a/src/Core/JVM/Invoker/Extended/JavaMethodCallable.php b/src/Core/JVM/Invoker/Extended/JavaMethodCallable.php
@@ -235,8 +235,23 @@ function ($argument) {
              */
             $executor = new $fullName();
 
+            $executor
+                ->setConstantPool($currentConstantPool)
+                ->setParameters(
+                    $method,
+                    $this->javaClassInvoker,
+                    $reader,
+                    $localStorage,
+                    $stacks,
+                    $pointer,
+                    $dependencyInjectionProvider
+                );
+
             $beforeTrigger = $this->options['operations']['injections']['before'] ?? GlobalOptions::get('operations.injections.before');
             if (is_callable($beforeTrigger)) {
+                // Bind class
+                \Closure::bind($beforeTrigger, $this);
+
                 $beforeTrigger(
                     $executor,
                     $method,
@@ -252,21 +267,13 @@ function ($argument) {
             }
 
             // Run executor
-            $executor
-                ->setConstantPool($currentConstantPool)
-                ->setParameters(
-                    $method,
-                    $this->javaClassInvoker,
-                    $reader,
-                    $localStorage,
-                    $stacks,
-                    $pointer,
-                    $dependencyInjectionProvider
-                )
-                ->execute();
+            $executor->execute();
 
             $afterTrigger = $this->options['operations']['injections']['after'] ?? GlobalOptions::get('operations.injections.after');
             if (is_callable($afterTrigger)) {
+                // Bind class
+                \Closure::bind($beforeTrigger, $this);
+
                 $afterTrigger(
                     $executor,
                     $method,
diff --git a/src/Kernel/Mnemonics/Operands.php b/src/Kernel/Mnemonics/Operands.php
@@ -3,7 +3,7 @@
 
 use PHPJava\Exceptions\OperationException;
 
-final class Operands implements \ArrayAccess
+final class Operands implements \ArrayAccess, \Countable
 {
     private $operands = [];
 
diff --git a/src/Kernel/Mnemonics/_getstatic.php b/src/Kernel/Mnemonics/_getstatic.php
@@ -16,6 +16,7 @@ public function getOperands(): ?Operands
         if ($this->operands !== null) {
             return $this->operands;
         }
+
         $indexbyte = $this->readUnsignedShort();
 
         return $this->operands = new Operands(

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`use PHPJava\Exceptions\OperationException;`
`5`	`5`
`6`		`-final class Operands implements \ArrayAccess`
	`6`	`+final class Operands implements \ArrayAccess, \Countable`
`7`	`7`	`{`
`8`	`8`	`private $operands = [];`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public function getOperands(): ?Operands`
`16`	`16`	`if ($this->operands !== null) {`
`17`	`17`	`return $this->operands;`
`18`	`18`	`}`
	`19`	`+`
`19`	`20`	`$indexbyte = $this->readUnsignedShort();`
`20`	`21`
`21`	`22`	`return $this->operands = new Operands(`