wip

Author: staabm

closure.php

@@ -0,0 +1,8 @@
+<?php
+
+array_find(
+	['foo' => 1, 'bar' => 2],
+	function(int $value, string $key) {
+		return $key;
+	},
+);

foo.php

@@ -0,0 +1,11 @@
+<?php
+
+class Foo
+{
+
+	public function doFoo(DateTimeImmutable $d): void
+	{
+		$a = $d->format('j. n. Y');
+	}
+
+}

foob.php

@@ -0,0 +1,6 @@
+<?php
+
+function doFoo(A $a)
+{
+
+}

log.txt

@@ -2922,7 +2922,7 @@ 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];
@@ -2945,7 +2945,11 @@ public function pushInFunctionCall($reflection, ?ParameterReflection $parameter)
 			$this->parentScope,
 			$this->nativeTypesPromoted,
 		);
-		$functionScope->resolvedTypes = $this->resolvedTypes;
+
+		if ($rememberTypes) {
+			$functionScope->resolvedTypes = $this->resolvedTypes;
+		}
+
 		return $functionScope;
 	}
 
@@ -2972,7 +2976,9 @@ public function popInFunctionCall(): self
 			$this->parentScope,
 			$this->nativeTypesPromoted,
 		);
+
 		$parentScope->resolvedTypes = $this->resolvedTypes;
+
 		return $parentScope;
 	}
 

src/Analyser/MutatingScope.php

@@ -5604,7 +5604,8 @@ private function processArgs(
 			}
 
 			if ($calleeReflection !== null) {
-				$scope = $scope->pushInFunctionCall($calleeReflection, $parameter);
+				$scope = $scope->pushInFunctionCall($calleeReflection, $parameter, true);
+				$pushTimeScope = $scope;
 			}
 
 			$originalArg = $arg->getAttribute(ArgumentsNormalizer::ORIGINAL_ARG_ATTRIBUTE) ?? $arg;

src/Analyser/NodeScopeResolver.php

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

src/Reflection/ParametersAcceptorSelector.php

@@ -319,7 +319,9 @@ 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);
+					$pushTimeScope = $scope;
 				}
 				$argumentValueType = $scope->getType($argumentValue);