Fix call parameters

facile-it · Jun 28, 2017 · 3dbefd0 · 3dbefd0
1 parent 6d289ae
commit 3dbefd0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 8 deletions.
diff --git a/src/Moka/Generator/ProxyClassGenerator.php b/src/Moka/Generator/ProxyClassGenerator.php
@@ -8,12 +8,18 @@
 class ProxyClassGenerator
 {
     const UNSAFE_METHODS = ['__call', '__construct', '__destruct', '__clone'];
+//    const CALL_PARAMETERS = ['name', 'arguments'];
 
     private static $template = '
     return new class extends %s implements %s
     {
         use %s;
         %s
+        
+        public function __call(%s $name, %s $arguments)
+        {
+            return $this->doCall($name, $arguments);
+        }
     };
     ';
 
@@ -22,18 +28,32 @@ public static function generateCode(string $classWillBeEtended): string
         $reflection = new \ReflectionClass($classWillBeEtended);
         $methods = $reflection->getMethods();
         $methodsArray = [];
+
         foreach ($methods as $method) {
             if (!in_array($method->getName(), self::UNSAFE_METHODS, true)) {
                 $methodsArray[] = ProxyMethodGenerator::generateMethodString($method);
             }
+
+            if ($method->getName() === '__call') {
+                $p = [];
+                $callParameters = $method->getParameters();
+                foreach ($callParameters as $callParameter) {
+                    $p[$callParameter->getPosition()] = (string)$callParameter->getType();
+                }
+            }
         }
 
+        $callName = $p[0] ?? '';
+        $callArguments = $p[1] ?? '';
+
         return sprintf(
             self::$template,
             $classWillBeEtended,
             ProxyInterface::class,
             ProxyTrait::class,
-            implode(PHP_EOL, $methodsArray)
+            implode(PHP_EOL, $methodsArray),
+            $callName,
+            $callArguments
         );
     }
 }
diff --git a/src/Moka/Generator/ProxyTrait.php b/src/Moka/Generator/ProxyTrait.php
@@ -25,13 +25,6 @@ public function __construct()
     {
     }
 
-    public function __call($name, array $arguments)
-    {
-        if ($this->mockingStrategy instanceof MockingStrategyInterface) {
-            return $this->mockingStrategy->call($this->mock, $name, $arguments);
-        }
-    }
-
     /**
      * @param mixed $object
      */
@@ -70,4 +63,11 @@ public function serve()
     {
         return $this->mock;
     }
+
+    protected function doCall(string $name, array $arguments)
+    {
+        if ($this->mockingStrategy instanceof MockingStrategyInterface) {
+            return $this->mockingStrategy->call($this->mock, $name, $arguments);
+        }
+    }
 }