Merge pull request #82 from 501st-alpha1/fix-dynamic-class-methods

Fix counting of dynamic class methods

Author: sergeyklay

src/AspectMock/Core/Mocker.php

@@ -10,6 +10,7 @@ class Mocker implements Aspect {
     protected $objectMap = [];
     protected $funcMap = [];
     protected $methodMap = ['__call', '__callStatic'];
+    protected $dynamicMethods = ['__call', '__callStatic'];
 
     public function fakeMethodsAndRegisterCalls($class, $declaredClass, $method, $params, $static)
     {
@@ -27,6 +28,12 @@ public function fakeMethodsAndRegisterCalls($class, $declaredClass, $method, $pa
             $result = $this->invokeFakedMethods($invocation);
         }
 
+        // Record actual method called, not faked method.
+        if (in_array($method, $this->dynamicMethods)) {
+            $method = array_shift($params);
+            $params = array_shift($params);
+        }
+
         if (!$static) {
             if (isset($this->objectMap[spl_object_hash($class)])) Registry::registerInstanceCall($class, $method, $params);
             $class = get_class($class);

tests/_data/demo/UserService.php

@@ -15,11 +15,17 @@ public function updateName(UserModel $user)
         $user->save();
     }
 
+    public function renameUser(UserModel $user, $name)
+    {
+        $user->renameUser($name);
+        $user->save();
+    }
+
     public function __call($name, $args)
     {
         if ($name == 'rename') {
             return 'David Blane';
         }
     }
 
-}
+}

tests/unit/VerifierTest.php

@@ -42,4 +42,33 @@ public function testVerifyInvocationClosures()
         });
     }
 
+    public function testVerifyMagicMethods()
+    {
+        $this->specify('works for class proxy', function() {
+            // Set up user object.
+            double::registerClass("demo\UserModel",
+                                  ['renameUser'=>"Bob Jones", 'save'=>null]);
+            $userProxy = new ClassProxy("demo\UserModel");
+            $user = new UserModel(['name'=>"John Smith"]);
+
+            // Rename the user via magic method.
+            UserService::renameUser($user, "Bob Jones");
+
+            // Assert rename was counted.
+            $userProxy->verifyInvoked('renameUser');
+        });
+
+        $this->specify('works for instance proxy', function() {
+            // Set up user object.
+            $user = new UserModel(['name'=>"John Smith"]);
+            double::registerObject($user);
+            $user = new InstanceProxy($user);
+
+            // Rename the user via magic method.
+            $user->renameUser("Bob Jones");
+
+            // Assert rename was counted.
+            $user->verifyInvoked('renameUser');
+        });
+    }
 }