Merge pull request #104 from Codeception/revert-91-feature/stacked-stub

Revert "Add stacked stub support"

Author: DavertMik

src/AspectMock/Core/Mocker.php

@@ -142,43 +142,32 @@ protected function stub(MethodInvocation $invocation, $params)
     {
         $name = $invocation->getMethod();
 
-        return $this->stubIteratively($name, $params, $invocation);
+        $replacedMethod = $params[$name];
+
+        $replacedMethod = $this->turnToClosure($replacedMethod);
+
+        if ($invocation->isStatic()) {
+            $replacedMethod = \Closure::bind($replacedMethod, null, $invocation->getThis());
+        } else {
+            $replacedMethod = $replacedMethod->bindTo($invocation->getThis(), get_class($invocation->getThis()));
+        }
+        return call_user_func_array($replacedMethod, $invocation->getArguments());
     }
 
     protected function stubMagicMethod(MethodInvocation $invocation, $params)
     {
         $args = $invocation->getArguments();
         $name = array_shift($args);
 
-        return $this->stubIteratively($name, $params, $invocation);
-    }
-
-    protected function stubIteratively($name, $params, MethodInvocation $invocation)
-    {
-        $replacedMethods = $params[$name];
-
-        if (!is_array($replacedMethods)) $replacedMethods = [$replacedMethods];
-
-        $result = __AM_CONTINUE__;
-
-        while ($result === __AM_CONTINUE__ && count($replacedMethods) > 0) {
-            $replacedMethod = array_pop($replacedMethods);
-            $result = $this->doStub($invocation, $replacedMethod);
-        }
-
-        return $result;
-    }
-
-    protected function doStub(MethodInvocation $invocation, $replacedMethod)
-    {
+        $replacedMethod = $params[$name];
         $replacedMethod = $this->turnToClosure($replacedMethod);
 
         if ($invocation->isStatic()) {
-            $replacedMethod = \Closure::bind($replacedMethod, null, $invocation->getThis());
+            \Closure::bind($replacedMethod, null, $invocation->getThis());
         } else {
             $replacedMethod = $replacedMethod->bindTo($invocation->getThis(), get_class($invocation->getThis()));
         }
-        return call_user_func_array($replacedMethod, $invocation->getArguments());
+        return call_user_func_array($replacedMethod, $args);
     }
 
 
@@ -194,7 +183,7 @@ public function registerClass($class, $params = array())
     {
         $class = ltrim($class,'\\');
         if (isset($this->classMap[$class])) {
-            $params = array_merge_recursive($this->classMap[$class], $params);
+            $params = array_merge($this->classMap[$class], $params);
         }
         $this->methodMap = array_merge($this->methodMap, array_keys($params));
         $this->classMap[$class] = $params;
@@ -204,7 +193,7 @@ public function registerObject($object, $params = array())
     {
         $hash = spl_object_hash($object);
         if (isset($this->objectMap[$hash])) {
-            $params = array_merge_recursive($this->objectMap[$hash], $params);
+            $params = array_merge($this->objectMap[$hash], $params);
         }
         $this->objectMap[$hash] = $params;
         $this->methodMap = array_merge($this->methodMap, array_keys($params));

src/AspectMock/Test.php

@@ -81,16 +81,6 @@ class Test {
      * $user = new User(['name' => 'davert']);
      * $user->save(); // false
      *
-     * # on conflicted stubs
-     * test::double('User', ['getGroup' => function () { return $this->group; }]);
-     * $user = new User;
-     * $user->group = 'guest';
-     * $user->getGroup(); // => guest
-     * test::double('User', ['getGroup' => function ($supersede = false) { return $supersede ? 'root' : __AM_CONTINUE__; }]);
-     * $user->group = 'user';
-     * $user->getGroup(true); // => root
-     * $user->getGroup(); // => user
-     *
      * ?>
      * ```
      *

tests/unit/StubTest.php

@@ -42,45 +42,13 @@ public function testBindSelfCallback()
         $this->assertEquals('awesome', $topSecret);
     }
 
-    public function testStackedStub()
-    {
-        double::registerClass(\demo\UserModel::class, ['getName' => function () {
-            return 'tsui';
-        }]);
-        double::registerClass(\demo\UserModel::class, ['getName' => function () {
-            return 'tt';
-        }]);
-        double::registerClass(\demo\UserModel::class, ['getName' => function () {
-            return __AM_CONTINUE__;
-        }]);
-        $user = new AdminUserModel(['name' => 'torreytsui']);
-        $name = $user->getName();
-        $this->assertEquals('tt', $name);
-    }
-
     public function testObjectInstance()
     {
         $user = new UserModel(['name' => 'davert']);
         double::registerObject($user,['save' => null]);
         $user->save();
     }
 
-    public function testObjectInstanceStackedStub()
-    {
-        $user = new AdminUserModel(['name' => 'torreytsui']);
-        double::registerObject($user, ['getName' => function () {
-            return 'tsui';
-        }]);
-        double::registerObject($user, ['getName' => function () {
-            return 'tt';
-        }]);
-        double::registerObject($user, ['getName' => function () {
-            return __AM_CONTINUE__;
-        }]);
-        $name = $user->getName();
-        $this->assertEquals('tt', $name);
-    }
-
     public function testStaticAccess()
     {
         $this->assertEquals('users', UserModel::tableName());