WIP commit

m3m0r7 · m3m0r7 · commit 5580efafa244 · 2019-03-02T08:46:44.000+09:00
diff --git a/src/Core/JVM/FlexibleMethod.php b/src/Core/JVM/FlexibleMethod.php
@@ -3,10 +3,21 @@
 
 class FlexibleMethod
 {
+    /**
+     * @var \ReflectionMethod $method
+     */
     private $method;
 
-    public function __construct(\ReflectionMethod $method)
+    private $object;
+
+    public function __construct($object, \ReflectionMethod $method)
     {
+        $this->object = $object;
         $this->method = $method;
     }
+
+    public function __invoke(...$arguments)
+    {
+        return $this->method->invokeArgs($this->object, $arguments);
+    }
 }
diff --git a/src/Core/JVM/Invoker/Invokable.php b/src/Core/JVM/Invoker/Invokable.php
@@ -124,8 +124,7 @@ function ($argument) {
             /**
              * @var FlexibleMethod $method
              */
-            // TODO: will implement invocation for flexible method
-            return $method->invoke();
+            return $method(...$arguments);
         }
 
         $codeAttribute = $getCodeAttribute($method->getAttributes());
diff --git a/src/Utilities/SuperClassResolver.php b/src/Utilities/SuperClassResolver.php
@@ -35,7 +35,7 @@ public function resolveMethod($methodName, JavaClass $class)
             }
             $prependItems[$resolvedMethodName] = array_merge(
                 $prependItems[$resolvedMethodName],
-                [new FlexibleMethod($callee)]
+                [new FlexibleMethod($class->getSuperClass(), $callee)]
             );
         }
         return array_merge($prependItems, $this->classes);

Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,21 @@`
`3`	`3`
`4`	`4`	`class FlexibleMethod`
`5`	`5`	`{`
	`6`	`+ /**`
	`7`	`+ * @var \ReflectionMethod $method`
	`8`	`+ */`
`6`	`9`	`private $method;`
`7`	`10`
`8`		`- public function __construct(\ReflectionMethod $method)`
	`11`	`+ private $object;`
	`12`	`+`
	`13`	`+ public function __construct($object, \ReflectionMethod $method)`
`9`	`14`	`{`
	`15`	`+ $this->object = $object;`
`10`	`16`	`$this->method = $method;`
`11`	`17`	`}`
	`18`	`+`
	`19`	`+ public function __invoke(...$arguments)`
	`20`	`+ {`
	`21`	`+ return $this->method->invokeArgs($this->object, $arguments);`
	`22`	`+ }`
`12`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,7 @@ function ($argument) {`
`124`	`124`	`/**`
`125`	`125`	`* @var FlexibleMethod $method`
`126`	`126`	`*/`
`127`		`- // TODO: will implement invocation for flexible method`
`128`		`- return $method->invoke();`
	`127`	`+ return $method(...$arguments);`
`129`	`128`	`}`
`130`	`129`
`131`	`130`	`$codeAttribute = $getCodeAttribute($method->getAttributes());`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function resolveMethod($methodName, JavaClass $class)`
`35`	`35`	`}`
`36`	`36`	`$prependItems[$resolvedMethodName] = array_merge(`
`37`	`37`	`$prependItems[$resolvedMethodName],`
`38`		`- [new FlexibleMethod($callee)]`
	`38`	`+ [new FlexibleMethod($class->getSuperClass(), $callee)]`
`39`	`39`	`);`
`40`	`40`	`}`
`41`	`41`	`return array_merge($prependItems, $this->classes);`