Use the right scope here

Author: ondrejmirtes

src/PhpDoc/PhpDocNodeResolver.php

@@ -30,6 +30,9 @@
 use PHPStan\PhpDocParser\Ast\PhpDoc\TemplateTagValueNode;
 use PHPStan\Reflection\PassedByReference;
 use PHPStan\Rules\PhpDoc\UnresolvableTypeHelper;
+use PHPStan\Type\Generic\TemplateTypeFactory;
+use PHPStan\Type\Generic\TemplateTypeMap;
+use PHPStan\Type\Generic\TemplateTypeScope;
 use PHPStan\Type\Generic\TemplateTypeVariance;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
@@ -160,6 +163,24 @@ public function resolveMethodTags(PhpDocNode $phpDocNode, NameScope $nameScope):
 
 		foreach (['@method', '@psalm-method', '@phpstan-method'] as $tagName) {
 			foreach ($phpDocNode->getMethodTagValues($tagName) as $tagValue) {
+				$templateTags = [];
+
+				if (count($tagValue->templateTypes) > 0) {
+					foreach ($tagValue->templateTypes as $templateType) {
+						$templateTags[$templateType->name] = new TemplateTag(
+							$templateType->name,
+							$templateType->bound !== null
+								? $this->typeNodeResolver->resolve($templateType->bound, $nameScope)
+								: new MixedType(),
+							TemplateTypeVariance::createInvariant()
+						);
+					}
+
+					$templateTypeScope = TemplateTypeScope::createWithMethod($nameScope->getClassName(), $tagValue->methodName);
+					$templateTypeMap = new TemplateTypeMap(array_map(static fn (TemplateTag $tag): Type => TemplateTypeFactory::fromTemplateTag($templateTypeScope, $tag), $templateTags));
+					$nameScope = $nameScope->withTemplateTypeMap($templateTypeMap);
+				}
+
 				$parameters = [];
 				foreach ($tagValue->parameters as $parameterNode) {
 					$parameterName = substr($parameterNode->parameterName, 1);
@@ -185,24 +206,13 @@ public function resolveMethodTags(PhpDocNode $phpDocNode, NameScope $nameScope):
 					);
 				}
 
-				$templates = [];
-				foreach ($tagValue->templateTypes as $templateType) {
-					$templates[$templateType->name] = new TemplateTag(
-						$templateType->name,
-						$templateType->bound !== null
-							? $this->typeNodeResolver->resolve($templateType->bound, $nameScope)
-							: new MixedType(),
-						TemplateTypeVariance::createInvariant()
-					);
-				}
-
 				$resolved[$tagValue->methodName] = new MethodTag(
 					$tagValue->returnType !== null
 						? $this->typeNodeResolver->resolve($tagValue->returnType, $nameScope)
 						: new MixedType(),
 					$tagValue->isStatic,
 					$parameters,
-					$templates
+					$templateTags,
 				);
 			}
 		}