FileTypeMapper - fix wrong template type scope for inline @var

Author: ondrejmirtes

src/Type/FileTypeMapper.php

@@ -325,7 +325,7 @@ private function getNameScopeMap(string $fileName): array
 	{
 		if (!isset($this->memoryCache[$fileName])) {
 			$cacheKey = sprintf('ftm-%s', $fileName);
-			$variableCacheKey = sprintf('v2-%s', ComposerHelper::getPhpDocParserVersion());
+			$variableCacheKey = sprintf('v3-%s', ComposerHelper::getPhpDocParserVersion());
 			$cached = $this->loadCachedPhpDocNodeMap($cacheKey, $variableCacheKey);
 			if ($cached === null) {
 				[$nameScopeMap, $files] = $this->createPhpDocNodeMap($fileName, null, null, [], $fileName);
@@ -507,6 +507,19 @@ function (Node $node) use ($fileName, $lookForTrait, &$traitFound, $traitMethodA
 						);
 					} elseif ($node instanceof Node\Stmt\ClassLike) {
 						$typeAliasStack[] = [];
+					} else {
+						$parentNameScope = array_last($typeMapStack) ?? null;
+						$typeMapStack[] = new IntermediaryNameScope(
+							$namespace,
+							$uses,
+							$className,
+							$functionName,
+							[],
+							$parentNameScope,
+							array_last($typeAliasStack) ?? [],
+							constUses: $constUses,
+							typeAliasClassName: $lookForTrait,
+						);
 					}
 				}
 
@@ -542,7 +555,7 @@ function (Node $node) use ($fileName, $lookForTrait, &$traitFound, $traitMethodA
 				}
 
 				if ($node instanceof Node\Stmt\ClassLike || $node instanceof Node\Stmt\ClassMethod || $node instanceof Node\Stmt\Function_ || $node instanceof Node\PropertyHook) {
-					if ($phpDocNode !== null) {
+					if ($phpDocNode !== null || !$node instanceof Node\Stmt\ClassLike) {
 						return self::POP_TYPE_MAP_STACK;
 					}
 

tests/PHPStan/Analyser/nsrt/generics.php

@@ -1577,3 +1577,47 @@ function constantArrayBound(array $a): array
 function (): void {
 	assertType('array{\'string\', true}', constantArrayBound(['string', true]));
 };
+
+/**
+ * @phpstan-template TParametersTypes of non-empty-list<mixed>
+ */
+class InlineVar
+{
+
+	public function doFoo(): void
+	{
+		/** @var TParametersTypes $a */
+		$a = [1, 2, 3];
+		assertType('TParametersTypes of non-empty-list<mixed> (class PHPStan\Generics\FunctionsAssertType\InlineVar, parameter)', $a);
+	}
+
+	/**
+	 * @template T
+	 * @param T $b
+	 */
+	public function doBar($b): void
+	{
+		assertType('T (method PHPStan\Generics\FunctionsAssertType\InlineVar::doBar(), argument)', $b);
+
+		/** @var T $c */
+		$c = 2;
+		assertType('T (method PHPStan\Generics\FunctionsAssertType\InlineVar::doBar(), parameter)', $c);
+
+		/** @var TParametersTypes $a */
+		$a = [1, 2, 3];
+		assertType('TParametersTypes of non-empty-list<mixed> (class PHPStan\Generics\FunctionsAssertType\InlineVar, parameter)', $a);
+	}
+
+	/**
+	 * @param int $b
+	 */
+	public function doBaz($b): void
+	{
+		assertType('int', $b);
+
+		/** @var TParametersTypes $a */
+		$a = [1, 2, 3];
+		assertType('TParametersTypes of non-empty-list<mixed> (class PHPStan\Generics\FunctionsAssertType\InlineVar, parameter)', $a);
+	}
+
+}