More precise Type->getCallableParametersAcceptors() return type (#4713)

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -5281,25 +5281,23 @@ public function createCallableParameters(Scope $scope, Expr $closureExpr, ?array
 			}
 
 			$acceptors = $passedToType->getCallableParametersAcceptors($scope);
-			if (count($acceptors) > 0) {
-				foreach ($acceptors as $acceptor) {
-					if ($callableParameters === null) {
-						$callableParameters = $acceptor->getParameters();
-						continue;
-					}
-
-					$newParameters = [];
-					foreach ($acceptor->getParameters() as $i => $callableParameter) {
-						if (!array_key_exists($i, $callableParameters)) {
-							$newParameters[] = $callableParameter;
-							continue;
-						}
+			foreach ($acceptors as $acceptor) {
+				if ($callableParameters === null) {
+					$callableParameters = $acceptor->getParameters();
+					continue;
+				}
 
-						$newParameters[] = $callableParameters[$i]->union($callableParameter);
+				$newParameters = [];
+				foreach ($acceptor->getParameters() as $i => $callableParameter) {
+					if (!array_key_exists($i, $callableParameters)) {
+						$newParameters[] = $callableParameter;
+						continue;
 					}
 
-					$callableParameters = $newParameters;
+					$newParameters[] = $callableParameters[$i]->union($callableParameter);
 				}
+
+				$callableParameters = $newParameters;
 			}
 		}
 

src/Reflection/Callables/FunctionCallableVariant.php

@@ -33,8 +33,8 @@ public function __construct(
 	}
 
 	/**
-	 * @param ExtendedParametersAcceptor[] $variants
-	 * @return self[]
+	 * @param list<ExtendedParametersAcceptor> $variants
+	 * @return list<self>
 	 */
 	public static function createFromVariants(FunctionReflection|ExtendedMethodReflection $function, array $variants): array
 	{

src/Type/ObjectType.php

@@ -1550,7 +1550,7 @@ public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope)
 	}
 
 	/**
-	 * @return CallableParametersAcceptor[]|null
+	 * @return list<CallableParametersAcceptor>|null
 	 */
 	private function findCallableParametersAcceptors(): ?array
 	{

src/Type/Type.php

@@ -207,7 +207,7 @@ public function exponentiate(Type $exponent): Type;
 	public function isCallable(): TrinaryLogic;
 
 	/**
-	 * @return CallableParametersAcceptor[]
+	 * @return list<CallableParametersAcceptor>
 	 */
 	public function getCallableParametersAcceptors(ClassMemberAccessAnswerer $scope): array;