Remember resolved types after pushInFunctionCall

Author: staabm

src/Analyser/MutatingScope.php

@@ -2922,12 +2922,12 @@ public function hasExpressionType(Expr $node): TrinaryLogic
 	/**
 	 * @param MethodReflection|FunctionReflection|null $reflection
 	 */
-	public function pushInFunctionCall($reflection, ?ParameterReflection $parameter): self
+	public function pushInFunctionCall($reflection, ?ParameterReflection $parameter, bool $rememberTypes): self
 	{
 		$stack = $this->inFunctionCallsStack;
 		$stack[] = [$reflection, $parameter];
 
-		return $this->scopeFactory->create(
+		$functionScope = $this->scopeFactory->create(
 			$this->context,
 			$this->isDeclareStrictTypes(),
 			$this->getFunction(),
@@ -2945,14 +2945,20 @@ public function pushInFunctionCall($reflection, ?ParameterReflection $parameter)
 			$this->parentScope,
 			$this->nativeTypesPromoted,
 		);
+
+		if ($rememberTypes) {
+			$functionScope->resolvedTypes = $this->resolvedTypes;
+		}
+
+		return $functionScope;
 	}
 
 	public function popInFunctionCall(): self
 	{
 		$stack = $this->inFunctionCallsStack;
 		array_pop($stack);
 
-		return $this->scopeFactory->create(
+		$parentScope = $this->scopeFactory->create(
 			$this->context,
 			$this->isDeclareStrictTypes(),
 			$this->getFunction(),
@@ -2970,6 +2976,10 @@ public function popInFunctionCall(): self
 			$this->parentScope,
 			$this->nativeTypesPromoted,
 		);
+
+		$parentScope->resolvedTypes = $this->resolvedTypes;
+
+		return $parentScope;
 	}
 
 	/** @api */

src/Analyser/NodeScopeResolver.php

@@ -5603,11 +5603,12 @@ private function processArgs(
 				}
 			}
 
+			$originalArg = $arg->getAttribute(ArgumentsNormalizer::ORIGINAL_ARG_ATTRIBUTE) ?? $arg;
 			if ($calleeReflection !== null) {
-				$scope = $scope->pushInFunctionCall($calleeReflection, $parameter);
+				$rememberTypes = !$originalArg->value instanceof Expr\Closure && !$originalArg->value instanceof Expr\ArrowFunction;
+				$scope = $scope->pushInFunctionCall($calleeReflection, $parameter, $rememberTypes);
 			}
 
-			$originalArg = $arg->getAttribute(ArgumentsNormalizer::ORIGINAL_ARG_ATTRIBUTE) ?? $arg;
 			$this->callNodeCallback($nodeCallback, $originalArg, $scope, $storage);
 
 			$originalScope = $scope;

src/Reflection/ParametersAcceptorSelector.php

@@ -499,7 +499,8 @@ public static function selectFromArgs(
 			}
 
 			if ($parameter !== null && $scope instanceof MutatingScope) {
-				$scope = $scope->pushInFunctionCall(null, $parameter);
+				$rememberTypes = !$originalArg->value instanceof Node\Expr\Closure && !$originalArg->value instanceof Node\Expr\ArrowFunction;
+				$scope = $scope->pushInFunctionCall(null, $parameter, $rememberTypes);
 			}
 
 			$type = $scope->getType($originalArg->value);

src/Rules/FunctionCallParametersCheck.php

@@ -319,7 +319,8 @@ public function check(
 
 			if ($argumentValueType === null) {
 				if ($scope instanceof MutatingScope) {
-					$scope = $scope->pushInFunctionCall(null, $parameter);
+					$rememberTypes = !$argumentValue instanceof Expr\Closure && !$argumentValue instanceof Expr\ArrowFunction;
+					$scope = $scope->pushInFunctionCall(null, $parameter, $rememberTypes);
 				}
 				$argumentValueType = $scope->getType($argumentValue);