Closes #406

Author: sebastianbergmann

ChangeLog.md

@@ -0,0 +1,13 @@
+# ChangeLog
+
+All notable changes are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
+
+## [6.0.1] - 2018-02-15
+
+### Fixed
+
+* Fixed [#406](https://github.com/sebastianbergmann/phpunit-mock-objects/issues/406): `parent` return type declaration is not handled correctly
+
+## [6.0.0] - 2018-02-01
+
+[6.0.0]: https://github.com/sebastianbergmann/phpunit-mock-objects/compare/5.0...6.0.0

src/Generator.php

@@ -979,6 +979,8 @@ private function generateMockedMethodDefinitionFromExisting(ReflectionMethod $me
      * @param bool|string $deprecation
      * @param bool        $allowsReturnNull
      *
+     * @throws \ReflectionException
+     * @throws \PHPUnit\Framework\MockObject\RuntimeException
      * @throws \InvalidArgumentException
      *
      * @return string
@@ -1001,13 +1003,31 @@ private function generateMockedMethodDefinition($className, $methodName, $cloneA
             }
         }
 
-        // Mocked interfaces returning 'self' must explicitly declare the
-        // interface name as the return type. See
-        // https://bugs.php.net/bug.php?id=70722
+        // @see https://bugs.php.net/bug.php?id=70722
         if ($returnType === 'self') {
             $returnType = $className;
         }
 
+        // @see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/406
+        if ($returnType === 'parent') {
+            $reflector = new ReflectionClass($className);
+
+            $parentClass = $reflector->getParentClass();
+
+            if ($parentClass === null) {
+                throw new RuntimeException(
+                    \sprintf(
+                        'Cannot mock %s::%s because "parent" return type declaration is used but %s does not have a parent class',
+                        $className,
+                        $methodName,
+                        $className
+                    )
+                );
+            }
+
+            $returnType = $parentClass->getName();
+        }
+
         if (false !== $deprecation) {
             $deprecation         = "The $className::$methodName method is deprecated ($deprecation).";
             $deprecationTemplate = $this->getTemplate('deprecation.tpl');

tests/Generator/return_type_declarations_parent.phpt

@@ -0,0 +1,104 @@
+--TEST--
+\PHPUnit\Framework\MockObject\Generator::generate('Bar', [], 'MockBar', true, true)
+--FILE--
+<?php
+abstract class Foo
+{
+    abstract public function baz();
+}
+
+class Bar extends Foo
+{
+    public function baz(): parent
+    {
+    }
+}
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+$generator = new \PHPUnit\Framework\MockObject\Generator;
+
+$mock = $generator->generate(
+    'Bar',
+    [],
+    'MockBar',
+    true,
+    true
+);
+
+print $mock['code'];
+--EXPECT--
+class MockBar extends Bar implements PHPUnit\Framework\MockObject\MockObject
+{
+    private $__phpunit_invocationMocker;
+    private $__phpunit_originalObject;
+    private $__phpunit_configurable = ['baz'];
+
+    public function __clone()
+    {
+        $this->__phpunit_invocationMocker = clone $this->__phpunit_getInvocationMocker();
+    }
+
+    public function baz(): Foo
+    {
+        $arguments = [];
+        $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\ObjectInvocation(
+                'Bar', 'baz', $arguments, 'Foo', $this, true
+            )
+        );
+
+        return $result;
+    }
+
+    public function expects(\PHPUnit\Framework\MockObject\Matcher\Invocation $matcher)
+    {
+        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([$expects, 'method'], func_get_args());
+    }
+
+    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($this->__phpunit_configurable);
+        }
+
+        return $this->__phpunit_invocationMocker;
+    }
+
+    public function __phpunit_hasMatchers()
+    {
+        return $this->__phpunit_getInvocationMocker()->hasMatchers();
+    }
+
+    public function __phpunit_verify($unsetInvocationMocker = true)
+    {
+        $this->__phpunit_getInvocationMocker()->verify();
+
+        if ($unsetInvocationMocker) {
+            $this->__phpunit_invocationMocker = null;
+        }
+    }
+}