Merge remote-tracking branch 'l3/MC-41712' into PR-L3-20210405

Author: veloraven

lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/TSample.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Framework\Reflection\Test\Unit\Fixture;
 
-class TSample implements TSampleInterface
+class TSample extends TSampleAbstract implements TSampleInterface
 {
     /**
      * @inheritdoc
@@ -38,4 +38,12 @@ public function getOnlyNull()
     {
         return null;
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function getDataOverridden()
+    {
+        return [];
+    }
 }

lib/internal/Magento/Framework/Reflection/Test/Unit/Fixture/TSampleAbstract.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Reflection\Test\Unit\Fixture;
+
+abstract class TSampleAbstract
+{
+    /**
+     * @return array
+     */
+    public function getData()
+    {
+        return [];
+    }
+
+    /**
+     * @return array
+     */
+    public function getDataOverridden()
+    {
+        return [];
+    }
+}

lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php

@@ -330,20 +330,50 @@ public function testGetOperationName()
 
     /**
      * Checks a case when method has only `@inheritdoc` annotation.
+     *
+     * @dataProvider getReturnTypeWithInheritDocBlockDataProvider
+     * @param string $methodName
+     * @param array $returnTypeData
      */
-    public function testGetReturnTypeWithInheritDocBlock()
+    public function testGetReturnTypeWithInheritDocBlock(string $methodName, array $returnTypeData)
     {
-        $expected = [
-            'type' => 'string',
-            'isRequired' => true,
-            'description' => null,
-            'parameterCount' => 0
-        ];
-
         $classReflection = new ClassReflection(TSample::class);
-        $methodReflection = $classReflection->getMethod('getPropertyName');
+        $methodReflection = $classReflection->getMethod($methodName);
 
-        self::assertEquals($expected, $this->typeProcessor->getGetterReturnType($methodReflection));
+        self::assertEquals($returnTypeData, $this->typeProcessor->getGetterReturnType($methodReflection));
+    }
+
+    public function getReturnTypeWithInheritDocBlockDataProvider(): array
+    {
+        return [
+            [
+                'getPropertyName',
+                [
+                    'type' => 'string',
+                    'isRequired' => true,
+                    'description' => null,
+                    'parameterCount' => 0,
+                ],
+            ],
+            [
+                'getData',
+                [
+                    'type' => 'array',
+                    'isRequired' => true,
+                    'description' => null,
+                    'parameterCount' => 0,
+                ],
+            ],
+            [
+                'getDataOverridden',
+                [
+                    'type' => 'array',
+                    'isRequired' => true,
+                    'description' => null,
+                    'parameterCount' => 0,
+                ],
+            ],
+        ];
     }
 
     /**

lib/internal/Magento/Framework/Reflection/TypeProcessor.php

@@ -851,9 +851,11 @@ private function getMethodReturnAnnotation(MethodReflection $methodReflection)
     {
         $methodName = $methodReflection->getName();
         $returnAnnotations = $this->getReturnFromDocBlock($methodReflection);
+
         if (empty($returnAnnotations)) {
+            $classReflection = $methodReflection->getDeclaringClass();
             // method can inherit doc block from implemented interface, like for interceptors
-            $implemented = $methodReflection->getDeclaringClass()->getInterfaces();
+            $implemented = $classReflection->getInterfaces();
             /** @var ClassReflection $parentClassReflection */
             foreach ($implemented as $parentClassReflection) {
                 if ($parentClassReflection->hasMethod($methodName)) {
@@ -863,14 +865,28 @@ private function getMethodReturnAnnotation(MethodReflection $methodReflection)
                     break;
                 }
             }
-            // throw an exception if even implemented interface doesn't have return annotations
+
             if (empty($returnAnnotations)) {
-                throw new \InvalidArgumentException(
-                    "Method's return type must be specified using @return annotation. "
-                    . "See {$methodReflection->getDeclaringClass()->getName()}::{$methodName}()"
-                );
+                while ($classReflection->getParentClass()) {
+                    $classReflection = $classReflection->getParentClass();
+                    if ($classReflection->hasMethod($methodName)) {
+                        $returnAnnotations = $this->getReturnFromDocBlock(
+                            $classReflection->getMethod($methodName)
+                        );
+                        break;
+                    }
+                }
+
+                // throw an exception if even implemented interface doesn't have return annotations
+                if (empty($returnAnnotations)) {
+                    throw new \InvalidArgumentException(
+                        "Method's return type must be specified using @return annotation. "
+                        . "See {$methodReflection->getDeclaringClass()->getName()}::{$methodName}()"
+                    );
+                }
             }
         }
+
         return $returnAnnotations;
     }