Ability to call ::method() on a stub without calling ::expects()

When using a Test Double as a Stub, we don't typically care whether it is called. Currently the mocking library forces the test author to specify an expectation of how many times the method will be called. This makes it harder to visually scan source code to see which Doubles have expectations set, and which don't care.

This change allows calls like $this->getMock()->method('foo')->will($this->returnValue('bar')); which are clearer to identify as Stubbing behaviour.

Author: Ciaran McNulty

PHPUnit/Framework/MockObject/Generator/mocked_class.tpl.dist

@@ -10,6 +10,13 @@
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
     public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
     {
         PHPUnit_Util_DeprecatedFeature_Logger::log('The stubbing and mocking of static methods is deprecated and will be removed in PHPUnit 3.9.');

Tests/MockObject/class.phpt

@@ -88,6 +88,13 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
     public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
     {
         PHPUnit_Util_DeprecatedFeature_Logger::log('The stubbing and mocking of static methods is deprecated and will be removed in PHPUnit 3.9.');

Tests/MockObject/class_call_parent_clone.phpt

@@ -41,6 +41,13 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
     public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
     {
         PHPUnit_Util_DeprecatedFeature_Logger::log('The stubbing and mocking of static methods is deprecated and will be removed in PHPUnit 3.9.');

Tests/MockObject/class_call_parent_constructor.phpt

@@ -40,6 +40,13 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
     public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
     {
         PHPUnit_Util_DeprecatedFeature_Logger::log('The stubbing and mocking of static methods is deprecated and will be removed in PHPUnit 3.9.');

Tests/MockObject/class_dont_call_parent_clone.phpt

@@ -40,6 +40,13 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
     public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
     {
         PHPUnit_Util_DeprecatedFeature_Logger::log('The stubbing and mocking of static methods is deprecated and will be removed in PHPUnit 3.9.');

Tests/MockObject/class_dont_call_parent_constructor.phpt

@@ -40,6 +40,13 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
     public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
     {
         PHPUnit_Util_DeprecatedFeature_Logger::log('The stubbing and mocking of static methods is deprecated and will be removed in PHPUnit 3.9.');

Tests/MockObject/class_implementing_interface_call_parent_constructor.phpt

@@ -45,6 +45,13 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
     public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
     {
         PHPUnit_Util_DeprecatedFeature_Logger::log('The stubbing and mocking of static methods is deprecated and will be removed in PHPUnit 3.9.');

Tests/MockObject/class_implementing_interface_dont_call_parent_constructor.phpt

@@ -45,6 +45,13 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
     public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
     {
         PHPUnit_Util_DeprecatedFeature_Logger::log('The stubbing and mocking of static methods is deprecated and will be removed in PHPUnit 3.9.');

Tests/MockObject/class_partial.phpt

@@ -67,6 +67,13 @@ class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
     public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
     {
         PHPUnit_Util_DeprecatedFeature_Logger::log('The stubbing and mocking of static methods is deprecated and will be removed in PHPUnit 3.9.');

Tests/MockObject/interface.phpt

@@ -61,6 +61,13 @@ class MockFoo implements PHPUnit_Framework_MockObject_MockObject, Foo
         return $this->__phpunit_getInvocationMocker()->expects($matcher);
     }
 
+    public function method()
+    {
+        $any = new PHPUnit_Framework_MockObject_Matcher_AnyInvokedCount;
+        $expects = $this->expects($any);
+        return call_user_func_array(array($expects, 'method'), func_get_args());
+    }
+
     public static function staticExpects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
     {
         PHPUnit_Util_DeprecatedFeature_Logger::log('The stubbing and mocking of static methods is deprecated and will be removed in PHPUnit 3.9.');