Rework

Author: VincentLanglet

src/Analyser/MutatingScope.php

@@ -2020,7 +2020,9 @@ public function enterAnonymousFunctionWithoutReflection(
 			$paramExprString = sprintf('$%s', $parameter->var->name);
 			$isNullable = $this->isParameterValueNullable($parameter);
 			$parameterType = $this->getFunctionType($parameter->type, $isNullable, $parameter->variadic);
-			$parameterType = self::resolveCallableParameterType($parameterType, $callableParameters, $i);
+			if ($callableParameters !== null) {
+				$parameterType = self::intersectButNotNever($parameterType, $this->getCallableParameterType($callableParameters, $i));
+			}
 			$holder = ExpressionTypeHolder::createYes($parameter->var, $parameterType);
 			$expressionTypes[$paramExprString] = $holder;
 			$nativeTypes[$paramExprString] = $holder;
@@ -2218,7 +2220,9 @@ public function enterArrowFunctionWithoutReflection(Expr\ArrowFunction $arrowFun
 		foreach ($arrowFunction->params as $i => $parameter) {
 			$isNullable = $this->isParameterValueNullable($parameter);
 			$parameterType = $this->getFunctionType($parameter->type, $isNullable, $parameter->variadic);
-			$parameterType = self::resolveCallableParameterType($parameterType, $callableParameters, $i);
+			if ($callableParameters !== null) {
+				$parameterType = self::intersectButNotNever($parameterType, $this->getCallableParameterType($callableParameters, $i));
+			}
 
 			if (!$parameter->var instanceof Variable || !is_string($parameter->var->name)) {
 				throw new ShouldNotHappenException();
@@ -2284,26 +2288,24 @@ public function getFunctionType($type, bool $isNullable, bool $isVariadic): Type
 	}
 
 	/**
-	 * @param ParameterReflection[]|null $callableParameters
+	 * @param ParameterReflection[] $callableParameters
 	 */
-	private static function resolveCallableParameterType(Type $declaredType, ?array $callableParameters, int $i): Type
+	private function getCallableParameterType(array $callableParameters, int $index): Type
 	{
-		if ($callableParameters === null) {
-			return $declaredType;
+		if (isset($callableParameters[$index])) {
+			return $callableParameters[$index]->getType();
 		}
 
-		if (isset($callableParameters[$i])) {
-			return self::intersectButNotNever($declaredType, $callableParameters[$i]->getType());
+		if (count($callableParameters) === 0) {
+			return new MixedType();
 		}
 
-		if (count($callableParameters) > 0) {
-			$lastParameter = array_last($callableParameters);
-			if ($lastParameter->isVariadic()) {
-				return self::intersectButNotNever($declaredType, $lastParameter->getType());
-			}
+		$lastParameter = array_last($callableParameters);
+		if ($lastParameter->isVariadic()) {
+			return $lastParameter->getType();
 		}
 
-		return self::intersectButNotNever($declaredType, new MixedType());
+		return new MixedType();
 	}
 
 	public static function intersectButNotNever(Type $nativeType, Type $inferredType): Type