more consistent namespace handling

Author: pwillcode

src/AspectMock/Core/Mocker.php

@@ -128,7 +128,7 @@ protected function getClassMethodStubParams($class_name, $method_name)
         if (!array_key_exists($method_name,$params)) return false;
         return $params;
     }
-    
+
     protected function stub(MethodInvocation $invocation, $params)
     {
         $name = $invocation->getMethod();
@@ -192,6 +192,7 @@ public function registerObject($object, $params = array())
 
     public function registerFunc($namespace, $func, $body)
     {
+        $namespace = ltrim($namespace,'\\');
         if (!function_exists("$namespace\\$func")) {
             $injector = new FunctionInjector($namespace, $func);
             $injector->save();

src/AspectMock/Core/Registry.php

@@ -37,6 +37,7 @@ static function registerFunc($namespace, $function, $resultOrClosure)
 
     static function getClassCallsFor($class)
     {
+        $class = ltrim($class,'\\');
         return isset(self::$classCalls[$class])
             ? self::$classCalls[$class]
             : [];
@@ -52,6 +53,7 @@ static function getInstanceCallsFor($instance)
 
     static function getFuncCallsFor($func)
     {
+        $func = ltrim($func,'\\');
         return isset(self::$funcCalls[$func]) ? self::$funcCalls[$func] : [];
     }
 
@@ -123,4 +125,4 @@ public static function setMocker(Mocker $mocker)
         self::$mocker = $mocker;
     }
 
-}
+}

tests/unit/FunctionInjectorTest.php

@@ -59,6 +59,18 @@ public function testVerifier()
         $func->verifyNeverInvoked(['hee']);
     }
 
+    public function testVerifierFullyQualifiedNamespace()
+    {
+        $func = test::func('\demo', 'strlen', 10);
+        expect(strlen('hello'))->equals(10);
+        $func->verifyInvoked();
+        $func->verifyInvoked(['hello']);
+        $func->verifyInvokedOnce();
+        $func->verifyInvokedOnce(['hello']);
+        $func->verifyInvokedMultipleTimes(1, ['hello']);
+        $func->verifyNeverInvoked(['hee']);
+    }
+
     public function testFailedVerification()
     {
         $this->setExpectedException('PHPUnit_Framework_ExpectationFailedException');
@@ -68,4 +80,3 @@ public function testFailedVerification()
     }
 
 }
-

tests/unit/testDoubleTest.php

@@ -26,6 +26,21 @@ public function testDoubleClass()
         });
     }
 
+    public function testDoubleFullyQualifiedClass()
+    {
+        $user = test::double('\demo\UserModel', ['save' => null]);
+        (new demo\UserModel())->save();
+        $user->verifyInvoked('save');
+        \demo\UserModel::tableName();
+        \demo\UserModel::tableName();
+        $user->verifyInvokedMultipleTimes('tableName',2);
+
+        $this->specify('disabling all methods', function() use ($user) {
+            test::methods($user, []);
+            verify(\demo\UserModel::tableName())->null();
+        });
+    }
+
     public function testDoubleObject()
     {
         $user = new demo\UserModel();
@@ -68,7 +83,7 @@ public function testSpecUndefinedClass()
             $this->any->that = 'xxx';
            $this->assertInstanceOf('AspectMock\Proxy\Anything', $this->any->this->that->another);
         });
-        
+
         $this->specify('can be used as array', function() {
             $this->any['has keys'];
             unset($this->any['this']);