Resolve @param-out type in ResolvedFunctionVariant

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -3783,26 +3783,8 @@ private function processArgs(
 		?MutatingScope $closureBindScope = null,
 	): ExpressionResult
 	{
-		$paramOutTypes = [];
 		if ($parametersAcceptor !== null) {
 			$parameters = $parametersAcceptor->getParameters();
-
-			foreach ($parameters as $parameter) {
-				if (!$parameter instanceof ParameterReflectionWithPhpDocs) {
-					continue;
-				}
-
-				if ($parameter->getOutType() === null) {
-					continue;
-				}
-
-				$paramOutTypes[$parameter->getName()] = TemplateTypeHelper::resolveTemplateTypes(
-					$parameter->getOutType(),
-					$parametersAcceptor->getResolvedTemplateTypeMap(),
-					$parametersAcceptor instanceof ParametersAcceptorWithPhpDocs ? $parametersAcceptor->getCallSiteVarianceMap() : TemplateTypeVarianceMap::createEmpty(),
-					TemplateTypeVariance::createCovariant(),
-				);
-			}
 		}
 
 		$hasYield = false;
@@ -3879,14 +3861,14 @@ private function processArgs(
 			$assignByReference = false;
 			if (isset($parameters[$i])) {
 				$assignByReference = $parameters[$i]->passedByReference()->createsNewVariable();
-				if (isset($paramOutTypes[$parameters[$i]->getName()])) {
-					$byRefType = $paramOutTypes[$parameters[$i]->getName()];
+				if ($parameters[$i] instanceof ParameterReflectionWithPhpDocs && $parameters[$i]->getOutType() !== null) {
+					$byRefType = $parameters[$i]->getOutType();
 				}
 			} elseif (count($parameters) > 0 && $parametersAcceptor->isVariadic()) {
 				$lastParameter = $parameters[count($parameters) - 1];
 				$assignByReference = $lastParameter->passedByReference()->createsNewVariable();
-				if (isset($paramOutTypes[$lastParameter->getName()])) {
-					$byRefType = $paramOutTypes[$lastParameter->getName()];
+				if ($lastParameter instanceof ParameterReflectionWithPhpDocs && $lastParameter->getOutType() !== null) {
+					$byRefType = $lastParameter->getOutType();
 				}
 			}
 

src/Reflection/ResolvedFunctionVariant.php

@@ -82,6 +82,16 @@ function (ParameterReflectionWithPhpDocs $param): ParameterReflectionWithPhpDocs
 						false,
 					);
 
+					$paramOutType = $param->getOutType();
+					if ($paramOutType !== null) {
+						$paramOutType = TemplateTypeHelper::resolveTemplateTypes(
+							$paramOutType,
+							$this->resolvedTemplateTypeMap,
+							$this->callSiteVarianceMap,
+							TemplateTypeVariance::createCovariant(),
+						);
+					}
+
 					return new DummyParameterWithPhpDocs(
 						$param->getName(),
 						$paramType,
@@ -91,7 +101,7 @@ function (ParameterReflectionWithPhpDocs $param): ParameterReflectionWithPhpDocs
 						$param->getDefaultValue(),
 						$param->getNativeType(),
 						$param->getPhpDocType(),
-						$param->getOutType(),
+						$paramOutType,
 					);
 				},
 				$this->parametersAcceptor->getParameters(),