refactor(driver): use instanceof checks for correct phpdoc node

schmittjoh · Jul 22, 2024 · f877119 · f877119
1 parent d0a24b7
commit f877119
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/src/Metadata/Driver/DocBlockDriver/DocBlockTypeResolver.php b/src/Metadata/Driver/DocBlockDriver/DocBlockTypeResolver.php
@@ -7,6 +7,7 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
+use PHPStan\PhpDocParser\Ast\PhpDoc\TypeAliasTagValueNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
@@ -408,16 +409,20 @@ private function getPhpstanType(\ReflectionClass $declaringClass, string $typeHi
         $self = $this;
 
         foreach ($phpDocNode->children as $node) {
-            if ($node instanceof PhpDocTagNode && '@phpstan-type' === $node->name) {
-                $phpstanType = (string) $node->value;
-                preg_match_all(self::PHPSTAN_ARRAY_SHAPE, $phpstanType, $foundPhpstanArray);
-                if (isset($foundPhpstanArray[1][0]) && $foundPhpstanArray[1][0] === $typeHint) {
+            if (
+                $node instanceof PhpDocTagNode
+                && $node->value instanceof TypeAliasTagValueNode
+                && $node->value->alias === $typeHint
+            ) {
+                $phpstanType = $node->value->__toString();
+                preg_match(self::PHPSTAN_ARRAY_SHAPE, $phpstanType, $foundPhpstanArray);
+                if (isset($foundPhpstanArray[0])) {
                     return 'array';
                 }
 
-                preg_match_all(self::PHPSTAN_ARRAY_TYPE, $phpstanType, $foundPhpstanArray);
-                if (isset($foundPhpstanArray[2][0]) && $foundPhpstanArray[1][0] === $typeHint) {
-                    $types = explode(',', $foundPhpstanArray[2][0]);
+                preg_match(self::PHPSTAN_ARRAY_TYPE, $phpstanType, $foundPhpstanArray);
+                if (isset($foundPhpstanArray[0])) {
+                    $types = explode(',', $foundPhpstanArray[2]);
 
                     return sprintf('array<%s>', implode(
                         ',',