Expanding also parent type when looking at method return types

zendframework · Ocramius · Oct 24, 2016 · Aug 19, 2016 · Aug 19, 2016 · Aug 19, 2016
commit 6bb8fcdf6d480ca23a2413a145d223c184fb706a
diff --git a/src/Generator/MethodGenerator.php b/src/Generator/MethodGenerator.php
@@ -9,6 +9,7 @@
 
 namespace Zend\Code\Generator;
 
+use ReflectionMethod;
 use Zend\Code\Reflection\MethodReflection;
 
 class MethodGenerator extends AbstractMemberGenerator
@@ -390,20 +391,29 @@ private static function extractReturnTypeFromMethodReflection(MethodReflection $
         }
 
         if (! method_exists($returnType, 'getName')) {
-            $literalReturnType = (string) $returnType;
-
-            return 'self' === $literalReturnType
-                ? $methodReflection->getDeclaringClass()->getName()
-                : $literalReturnType;
+            return self::expandLiteralType((string) $returnType, $methodReflection);
         }
 
-        $nullable         = $returnType->allowsNull() ? '?' : '';
-        $returnTypeString = $returnType->getName();
+        return ($returnType->allowsNull() ? '?' : '')
+            . self::expandLiteralType($returnType->getName(), $methodReflection);
+    }
+
+    /**
+     * @param string           $literalReturnType
+     * @param ReflectionMethod $methodReflection
+     *
+     * @return string
+     */
+    private static function expandLiteralType($literalReturnType, ReflectionMethod $methodReflection)
+    {
+        if ('self' === strtolower($literalReturnType)) {
+            return $methodReflection->getDeclaringClass()->getName();
+        }
 
-        if ('self' === strtolower($returnTypeString)) {
-            return $nullable . $methodReflection->getDeclaringClass()->getName();
+        if ('parent' === strtolower($literalReturnType)) {
+            return $methodReflection->getDeclaringClass()->getParentClass()->getName();
         }
 
-        return $nullable . $returnTypeString;
+        return $literalReturnType;
     }
 }