[+]: use "phpstan/phpdoc-parser" for properties

Author: voku

src/voku/SimplePhpParser/Model/PHPParameter.php

@@ -253,12 +253,11 @@ private function readPhpDoc($doc, string $parameterName): void
 
                     $parsedParamTagParam = (string) $parsedParamTag;
                     $spitedData = Utils::splitTypeAndVariable($parsedParamTag);
-                    $parsedParamTagStr = $spitedData['parsedParamTagStr'];
                     $variableName = $spitedData['variableName'];
 
                     // check only the current "param"-tag
                     if ($variableName && \strtoupper($parameterName) === \strtoupper($variableName)) {
-                        $this->phpDocRaw = (string) $parsedParamTag;
+                        $this->phpDocRaw = $parsedParamTagParam;
                         $this->typeFromPhpDocExtended = Utils::modernPhpdoc($parsedParamTagParam);
                     }
 
@@ -285,15 +284,10 @@ private function readPhpDoc($doc, string $parameterName): void
                     }
 
                     $this->typeFromPhpDocExtended = Utils::modernPhpdoc($parsedParamTagStr);
-
-                    break;
                 }
             }
 
-            // fallback for e.g. `callable()`
-            if (!$this->phpDocRaw || !$this->typeFromPhpDocExtended) {
-                $this->readPhpDocByTokens($docComment, $parameterName);
-            }
+            $this->readPhpDocByTokens($docComment, $parameterName);
 
         } catch (\Exception $e) {
             $tmpErrorMessage = $this->name . ':' . ($this->line ?? '?') . ' | ' . \print_r($e->getMessage(), true);

src/voku/SimplePhpParser/Model/PHPProperty.php

@@ -235,12 +235,14 @@ private function readPhpDoc($doc): void
 
             if (!empty($parsedParamTags)) {
                 foreach ($parsedParamTags as $parsedParamTag) {
+                    $parsedParamTagParam = (string) $parsedParamTag;
+
                     if ($parsedParamTag instanceof \phpDocumentor\Reflection\DocBlock\Tags\Var_) {
                         $type = $parsedParamTag->getType();
 
                         $this->typeFromPhpDoc = Utils::normalizePhpType($type . '');
 
-                        $typeFromPhpDocMaybeWithCommentTmp = \trim((string) $parsedParamTag);
+                        $typeFromPhpDocMaybeWithCommentTmp = \trim($parsedParamTagParam);
                         if (
                             $typeFromPhpDocMaybeWithCommentTmp
                             &&
@@ -255,8 +257,8 @@ private function readPhpDoc($doc): void
                         }
                     }
 
-                    $this->phpDocRaw = (string) $parsedParamTag;
-                    $this->typeFromPhpDocExtended = Utils::modernPhpdoc((string) $parsedParamTag);
+                    $this->phpDocRaw = $parsedParamTagParam;
+                    $this->typeFromPhpDocExtended = Utils::modernPhpdoc($parsedParamTagParam);
                 }
             }
 
@@ -275,9 +277,42 @@ private function readPhpDoc($doc): void
                     $this->typeFromPhpDocExtended = Utils::modernPhpdoc($parsedParamTagStr);
                 }
             }
+
+            $this->readPhpDocByTokens($docComment);
+
         } catch (\Exception $e) {
             $tmpErrorMessage = $this->name . ':' . ($this->line ?? '?') . ' | ' . \print_r($e->getMessage(), true);
             $this->parseError[\md5($tmpErrorMessage)] = $tmpErrorMessage;
         }
     }
+
+    /**
+     * @throws \PHPStan\PhpDocParser\Parser\ParserException
+     */
+    private function readPhpDocByTokens(string $docComment): void
+    {
+        $tokens = Utils::modernPhpdocTokens($docComment);
+
+        $paramContent = null;
+        foreach ($tokens->getTokens() as $token) {
+            $content = $token[0];
+
+            if ($content === '@var' || $content === '@psalm-var' || $content === '@phpstan-var') {
+                // reset
+                $paramContent = '';
+
+                continue;
+            }
+
+            if ($paramContent !== null) {
+                $paramContent .= $content;
+            }
+        }
+
+        $paramContent = $paramContent ? \trim($paramContent) : null;
+        if ($paramContent) {
+            $this->phpDocRaw = $paramContent;
+            $this->typeFromPhpDocExtended = Utils::modernPhpdoc($paramContent);
+        }
+    }
 }

tests/Dummy13.php

@@ -9,6 +9,9 @@
  */
 readonly final class Dummy13 implements \voku\tests\DummyInterface
 {
+    /**
+     * @var callable(int): string
+     */
     public int $lall;
 
     public function __construct(int $lall)

tests/ParserTest.php

@@ -142,6 +142,8 @@ public function testReadonlyClass(): void
             $isReadonly = $phpClasses[Dummy13::class]->is_readonly;
             static::assertSame(true, $isReadonly);
 
+            static::assertSame('callable(int): string', $phpClasses[Dummy13::class]->properties['lall']->typeFromPhpDocExtended);
+
             $isReadonly = $phpClasses[Dummy13::class]->properties['lall']->is_readonly;
             static::assertSame(true, $isReadonly);
         } else {