Closes #159

Author: sebastianbergmann

src/Framework/MockObject/Generator.php

@@ -126,7 +126,6 @@ class PHPUnit_Framework_MockObject_Generator
       'interface' => TRUE,
       'isset' => TRUE,
       'list' => TRUE,
-      'method' => TRUE,
       'namespace' => TRUE,
       'new' => TRUE,
       'or' => TRUE,
@@ -785,6 +784,16 @@ protected function generateMock($type, $methods, $mockClassName, $callOriginalCl
             }
         }
 
+        $method = '';
+
+        if (!in_array('method', $methods)) {
+            $methodTemplate = new Text_Template(
+                $templateDir . 'mocked_class_method.tpl'
+            );
+
+            $method = $methodTemplate->render();
+        }
+
         $classTemplate->setVar(
           array(
             'prologue'          => isset($prologue) ? $prologue : '',
@@ -796,7 +805,8 @@ protected function generateMock($type, $methods, $mockClassName, $callOriginalCl
                                    ),
             'clone'             => $cloneTemplate,
             'mock_class_name'   => $mockClassName['className'],
-            'mocked_methods'    => $mockedMethods
+            'mocked_methods'    => $mockedMethods,
+            'method'            => $method
           )
         );
 

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

@@ -8,14 +8,7 @@
     {
         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());
-    }
-
+{method}
     public function __phpunit_setOriginalObject($originalObject)
     {
         $this->__phpunit_originalObject = $originalObject;

src/Framework/MockObject/Generator/mocked_class_method.tpl.dist

@@ -0,0 +1,7 @@
+
+    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());
+    }

tests/MockObject/class_with_method_named_method.phpt

@@ -0,0 +1,87 @@
+--TEST--
+PHPUnit_Framework_MockObject_Generator::generate('Foo', array(), 'MockFoo', TRUE, TRUE)
+--FILE--
+<?php
+class Foo
+{
+    public function method()
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new PHPUnit_Framework_MockObject_Generator;
+
+$mock = $generator->generate(
+  'Foo',
+  array(),
+  'MockFoo',
+  TRUE,
+  TRUE
+);
+
+print $mock['code'];
+?>
+--EXPECTF--
+class MockFoo extends Foo implements PHPUnit_Framework_MockObject_MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function method()
+    {
+        $arguments = array();
+        $count     = func_num_args();
+
+        if ($count > 0) {
+            $_arguments = func_get_args();
+
+            for ($i = 0; $i < $count; $i++) {
+                $arguments[] = $_arguments[$i];
+            }
+        }
+
+        $result = $this->__phpunit_getInvocationMocker()->invoke(
+          new PHPUnit_Framework_MockObject_Invocation_Object(
+            'Foo', 'method', $arguments, $this, TRUE
+          )
+        );
+
+        return $result;
+    }
+
+    public function expects(PHPUnit_Framework_MockObject_Matcher_Invocation $matcher)
+    {
+        return $this->__phpunit_getInvocationMocker()->expects($matcher);
+    }
+
+    public function __phpunit_setOriginalObject($originalObject)
+    {
+        $this->__phpunit_originalObject = $originalObject;
+    }
+
+    public function __phpunit_getInvocationMocker()
+    {
+        if ($this->__phpunit_invocationMocker === NULL) {
+            $this->__phpunit_invocationMocker = new PHPUnit_Framework_MockObject_InvocationMocker;
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify()
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+    }
+}