[+]: "PhpCodeParser" -> use all types (not only from phpdoc) from par…

…ent classes & interfaces
voku · Sep 23, 2022 · 9275289 · 9275289
1 parent f238b28
commit 9275289
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 5 deletions.
diff --git a/src/voku/SimplePhpParser/Parsers/PhpCodeParser.php b/src/voku/SimplePhpParser/Parsers/PhpCodeParser.php
@@ -392,7 +392,7 @@ private static function mergeInheritdocData(
                     &&
                     $parentMethod->{$key} !== null
                     &&
-                    \stripos($key, 'typeFromPhpDoc') !== false
+                    \stripos($key, 'type') !== false
                 ) {
                     $value = $parentMethod->{$key};
                 }
@@ -434,7 +434,7 @@ private static function mergeInheritdocData(
                         &&
                         $interfaceMethod->{$key} !== null
                         &&
-                        \stripos($key, 'typeFromPhpDoc') !== false
+                        \stripos($key, 'type') !== false
                     ) {
                         $value = $interfaceMethod->{$key};
                     }
@@ -466,7 +466,7 @@ private static function mergeInheritdocData(
                                     &&
                                     $interfaceMethodParameter->{$keyInner} !== null
                                     &&
-                                    \stripos($keyInner, 'typeFromPhpDoc') !== false
+                                    \stripos($keyInner, 'type') !== false
                                 ) {
                                     $valueInner = $interfaceMethodParameter->{$keyInner};
                                 }
@@ -495,7 +495,7 @@ private static function mergeInheritdocData(
                     &&
                     $parentMethod->{$key} !== null
                     &&
-                    \stripos($key, 'typeFromPhpDoc') !== false
+                    \stripos($key, 'type') !== false
                 ) {
                     $value = $parentMethod->{$key};
                 }
@@ -527,7 +527,7 @@ private static function mergeInheritdocData(
                                 &&
                                 $parentMethodParameter->{$keyInner} !== null
                                 &&
-                                \stripos($keyInner, 'typeFromPhpDoc') !== false
+                                \stripos($keyInner, 'type') !== false
                             ) {
                                 $valueInner = $parentMethodParameter->{$keyInner};
                             }

diff --git a/tests/Dummy12.php b/tests/Dummy12.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace voku\tests;
+
+/**
+ * @internal
+ */
+final class Dummy12 implements DummyInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function withComplexReturnArray($parsedParamTag)
+    {
+        return [
+            'parsedParamTagStr' => 'foo',
+            'variableName'      => [null],
+        ];
+    }
+}
diff --git a/tests/Dummy8.php b/tests/Dummy8.php
@@ -64,4 +64,14 @@ public function foo_broken($lall)
     {
         return $lall;
     }
+
+    /**
+     * @param callable(string): string $callback
+     *
+     * @return string
+     */
+    public function withCallback($callback)
+    {
+        return $callback('foo');
+    }
 }
diff --git a/tests/ParserTest.php b/tests/ParserTest.php
@@ -130,6 +130,19 @@ public function testConstructorPropertyPromotion(): void
         }
     }
 
+    public function testInheritDocFromInterface(): void
+    {
+        $phpCode = PhpCodeParser::getPhpFiles(__DIR__ . '/Dummy12.php');
+        $phpClasses = $phpCode->getClasses();
+
+        $getFieldArray = $phpClasses[Dummy12::class]->methods['withComplexReturnArray'];
+        static::assertSame('withComplexReturnArray', $getFieldArray->name);
+        static::assertSame('\phpDocumentor\Reflection\DocBlock\Tags\BaseTag', $getFieldArray->parameters['parsedParamTag']->type);
+        static::assertSame('\phpDocumentor\Reflection\DocBlock\Tags\BaseTag', $getFieldArray->parameters['parsedParamTag']->typeFromPhpDocSimple);
+        static::assertSame('array', $getFieldArray->returnTypeFromPhpDocSimple);
+        static::assertSame('array{parsedParamTagStr: string, variableName: (null[]|string)}', $getFieldArray->returnTypeFromPhpDocExtended);
+    }
+
     public function testSimpleOneClassWithTrait(): void
     {
         $phpCode = PhpCodeParser::getPhpFiles(__DIR__ . '/Dummy8.php');
@@ -176,6 +189,11 @@ public function testSimpleOneClassWithTrait(): void
         static::assertNull($phpClasses[Dummy8::class]->methods['foo_broken']->returnTypeFromPhpDocExtended);
 
         static::assertNull($phpClasses[Dummy8::class]->methods['foo_broken']->parameters['lall']->typeFromPhpDocExtended);
+
+        static::assertSame(
+            'callable(string ): string',
+            $phpClasses[Dummy8::class]->methods['withCallback']->parameters['callback']->typeFromPhpDocExtended
+        );
     }
 
     public function testSimpleOneTrait(): void