Fix inline @var priority with prefixed PHPDoc tags

Author: ondrejmirtes

src/PhpDoc/PhpDocNodeResolver.php

@@ -48,8 +48,10 @@ public function __construct(TypeNodeResolver $typeNodeResolver, ConstExprNodeRes
 	 */
 	public function resolveVarTags(PhpDocNode $phpDocNode, NameScope $nameScope): array
 	{
-		foreach (['@phpstan-var', '@psalm-var', '@var'] as $tagName) {
-			$resolved = [];
+		$resolved = [];
+		$resolvedByTag = [];
+		foreach (['@var', '@psalm-var', '@phpstan-var'] as $tagName) {
+			$tagResolved = [];
 			foreach ($phpDocNode->getVarTagValues($tagName) as $tagValue) {
 				$type = $this->typeNodeResolver->resolve($tagValue->type, $nameScope);
 				if ($this->shouldSkipType($tagName, $type)) {
@@ -59,16 +61,23 @@ public function resolveVarTags(PhpDocNode $phpDocNode, NameScope $nameScope): ar
 					$variableName = substr($tagValue->variableName, 1);
 					$resolved[$variableName] = new VarTag($type);
 				} else {
-					$resolved[] = new VarTag($type);
+					$varTag = new VarTag($type);
+					$tagResolved[] = $varTag;
 				}
 			}
 
-			if (count($resolved) > 0) {
-				return $resolved;
+			if (count($tagResolved) === 0) {
+				continue;
 			}
+
+			$resolvedByTag[] = $tagResolved;
 		}
 
-		return [];
+		if (count($resolvedByTag) > 0) {
+			return array_reverse($resolvedByTag)[0];
+		}
+
+		return $resolved;
 	}
 
 	/**

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -10928,6 +10928,11 @@ public function dataBug4587(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-4587.php');
 	}
 
+	public function dataBug4606(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-4606.php');
+	}
+
 	/**
 	 * @param string $file
 	 * @return array<string, mixed[]>
@@ -11175,6 +11180,7 @@ private function gatherAssertTypes(string $file): array
 	 * @dataProvider dataBugInstanceOfClassString
 	 * @dataProvider dataBug4498
 	 * @dataProvider dataBug4587
+	 * @dataProvider dataBug4606
 	 * @param string $assertType
 	 * @param string $file
 	 * @param mixed ...$args

tests/PHPStan/Analyser/data/bug-4606.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Bug4606;
+
+use function PHPStan\Analyser\assertType;
+
+/**
+ * @var Foo $this
+ * @var array $assigned
+ * @phpstan-var list<array{\stdClass, int}> $assigned
+ */
+
+assertType(Foo::class, $this);
+assertType('array<int, array(stdClass, int)>', $assigned);
+
+
+/**
+ * @var array
+ * @phpstan-var array{\stdClass, int}
+ */
+$foo = doFoo();
+
+assertType('array(stdClass, int)', $foo);