[+]: fix for modern phpdocs

-> see phpDocumentor/ReflectionDocBlock#263

Author: voku

composer.json

@@ -18,13 +18,13 @@
     "require": {
         "php": ">=7.2",
         "amphp/parallel": "~1.4",
-        "phpdocumentor/type-resolver": "~1.3",
-        "phpdocumentor/reflection-docblock": "~5.1",
+        "phpdocumentor/type-resolver": "~1.4",
+        "phpdocumentor/reflection-docblock": "~5.2",
         "phpdocumentor/reflection-common": "~2.2",
         "phpstan/phpdoc-parser": "~0.4",
+        "voku/better-reflection": "dev-master",
         "voku/simple-cache": "~4.0",
-        "nikic/php-parser": "~4.10",
-        "ondrejmirtes/better-reflection": "~4.3"
+        "nikic/php-parser": "~4.10"
     },
     "require-dev": {
         "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"

src/voku/SimplePhpParser/Model/PHPFunction.php

@@ -5,6 +5,7 @@
 namespace voku\SimplePhpParser\Model;
 
 use phpDocumentor\Reflection\DocBlock\Tags\Generic;
+use phpDocumentor\Reflection\DocBlock\Tags\InvalidTag;
 use phpDocumentor\Reflection\DocBlock\Tags\Return_;
 use PhpParser\Node\Stmt\Function_;
 use Roave\BetterReflection\Reflection\ReflectionFunction;
@@ -271,6 +272,10 @@ protected function readPhpDoc(string $docComment): void
                 if ($this->returnTypeFromPhpDoc) {
                     $this->returnTypeFromPhpDocExtended = Utils::modernPhpdoc($this->returnTypeFromPhpDoc);
                 }
+            } elseif (!empty($parsedReturnTag) && $parsedReturnTag[0] instanceof InvalidTag) {
+                $parsedReturnTagReturn = (string) $parsedReturnTag[0];
+
+                $this->returnTypeFromPhpDocExtended = Utils::modernPhpdoc($parsedReturnTagReturn);
             }
 
             /** @noinspection AdditionOperationOnArraysInspection */

src/voku/SimplePhpParser/Model/PHPParameter.php

@@ -282,6 +282,17 @@ private function readPhpDoc(string $docComment, string $parameterName): void
                         if ($this->typeFromPhpDoc) {
                             $this->typeFromPhpDocExtended = Utils::modernPhpdoc($this->typeFromPhpDoc);
                         }
+                    } elseif ($parsedParamTag instanceof \phpDocumentor\Reflection\DocBlock\Tags\InvalidTag) {
+                        $parsedParamTagParam = (string) $parsedParamTag;
+
+                        \preg_match('#\$\p{L}*#u', $parsedParamTagParam, $variableName);
+                        if (
+                            \count($variableName) > 0
+                            &&
+                            \strtoupper('$' . $parameterName) === \strtoupper($variableName[0])
+                        ) {
+                            $this->typeFromPhpDocExtended = Utils::modernPhpdoc($parsedParamTagParam);
+                        }
                     }
                 }
             }

tests/Dummy8.php

@@ -21,4 +21,29 @@ public function getFieldArray($RowOffset, $OrderByField, $OrderByDir): array
             ['foo' => 2]
         ];
     }
+
+    /**
+     * @return list<int>
+     */
+    public function foo_list() {
+        return [4, 1, 2, 3, 4];
+    }
+
+    /**
+     * @param array{stdClass: \stdClass, numbers: int|float} $lall
+     *
+     * @return array{stdClass: \stdClass, numbers: int|float}
+     */
+    public function foo_mixed($lall) {
+        return $lall;
+    }
+
+    /**
+     * @param array{stdClass: \stdClass, numbers: int|float $lall
+     *
+     * @return array{stdClass: \stdClass, numbers: int|float
+     */
+    public function foo_broken($lall) {
+        return $lall;
+    }
 }

tests/ParserTest.php

@@ -79,6 +79,20 @@ public function testSimpleOneClassWithTrait(): void
         $method = $phpClasses[Dummy8::class]->methods['getLallTrait'];
 
         static::assertSame('getLallTrait', $method->name);
+
+        static::assertSame(
+            'array{stdClass: \stdClass, numbers: (int|float)}',
+            $phpClasses[Dummy8::class]->methods['foo_mixed']->returnTypeFromPhpDocExtended
+        );
+
+        static::assertSame(
+            'array{stdClass: \stdClass, numbers: (int|float)}',
+            $phpClasses[Dummy8::class]->methods['foo_mixed']->parameters['lall']->typeFromPhpDocExtended
+        );
+
+        static::assertNull($phpClasses[Dummy8::class]->methods['foo_broken']->returnTypeFromPhpDocExtended);
+
+        static::assertNull($phpClasses[Dummy8::class]->methods['foo_broken']->parameters['lall']->typeFromPhpDocExtended);
     }
 
     public function testSimpleOneTrait(): void