Check for method method to avoid collision

sebastianbergmann · Apr 20, 2016 · e630305 · e630305
1 parent 7b18bbd
commit e630305
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php
@@ -819,7 +819,7 @@ private function generateMock($type, $methods, $mockClassName, $callOriginalClon
 
         $method = '';
 
-        if (!in_array('method', $methods)) {
+        if (!in_array('method', $methods) && (!isset($class) || !$class->hasMethod('method'))) {
             $methodTemplate = new Text_Template(
                 $templateDir . 'mocked_class_method.tpl'
             );