Use ParametersAcceptorSelector::selectFromArgs() instead of `select…

…Single()` wherever possible
phpstan · Sep 26, 2024 · e283d3a · e283d3a
1 parent 865c618
commit e283d3a
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 11 deletions.
diff --git a/src/Internal/ContainerDynamicReturnTypeExtension.php b/src/Internal/ContainerDynamicReturnTypeExtension.php
@@ -33,11 +33,19 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
 		if (count($methodCall->getArgs()) === 0) {
-			return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+			return ParametersAcceptorSelector::selectFromArgs(
+				$scope,
+				$methodCall->getArgs(),
+				$methodReflection->getVariants(),
+			)->getReturnType();
 		}
 		$argType = $scope->getType($methodCall->getArgs()[0]->value);
 		if (!$argType instanceof ConstantStringType) {
-			return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+			return ParametersAcceptorSelector::selectFromArgs(
+				$scope,
+				$methodCall->getArgs(),
+				$methodReflection->getVariants(),
+			)->getReturnType();
 		}
 
 		$type = new ObjectType($argType->getValue());

diff --git a/src/Type/Php/HashFunctionsReturnTypeExtension.php b/src/Type/Php/HashFunctionsReturnTypeExtension.php
@@ -88,7 +88,11 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo
 
 	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type
 	{
-		$defaultReturnType = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+		$defaultReturnType = ParametersAcceptorSelector::selectFromArgs(
+			$scope,
+			$functionCall->getArgs(),
+			$functionReflection->getVariants(),
+		)->getReturnType();
 
 		if (!isset($functionCall->getArgs()[0])) {
 			return $defaultReturnType;

diff --git a/src/Type/Php/JsonThrowOnErrorDynamicReturnTypeExtension.php b/src/Type/Php/JsonThrowOnErrorDynamicReturnTypeExtension.php
@@ -54,7 +54,11 @@ public function getTypeFromFunctionCall(
 	): Type
 	{
 		$argumentPosition = $this->argumentPositions[$functionReflection->getName()];
-		$defaultReturnType = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+		$defaultReturnType = ParametersAcceptorSelector::selectFromArgs(
+			$scope,
+			$functionCall->getArgs(),
+			$functionReflection->getVariants(),
+		)->getReturnType();
 
 		if ($functionReflection->getName() === 'json_decode') {
 			$defaultReturnType = $this->narrowTypeForJsonDecode($functionCall, $scope, $defaultReturnType);

diff --git a/src/Type/Php/MbFunctionsReturnTypeExtension.php b/src/Type/Php/MbFunctionsReturnTypeExtension.php
@@ -47,7 +47,11 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo
 
 	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type
 	{
-		$returnType = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+		$returnType = ParametersAcceptorSelector::selectFromArgs(
+			$scope,
+			$functionCall->getArgs(),
+			$functionReflection->getVariants(),
+		)->getReturnType();
 		$positionEncodingParam = $this->encodingPositionMap[$functionReflection->getName()];
 
 		if (count($functionCall->getArgs()) < $positionEncodingParam) {

diff --git a/src/Type/Php/MbStrlenFunctionReturnTypeExtension.php b/src/Type/Php/MbStrlenFunctionReturnTypeExtension.php
@@ -147,7 +147,11 @@ public function getTypeFromFunctionCall(
 			$range = new ConstantIntegerType(0);
 		} else {
 			$range = TypeCombinator::remove(
-				ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType(),
+				ParametersAcceptorSelector::selectFromArgs(
+					$scope,
+					$functionCall->getArgs(),
+					$functionReflection->getVariants(),
+				)->getReturnType(),
 				new ConstantBooleanType(false),
 			);
 		}

diff --git a/src/Type/Php/PregFilterFunctionReturnTypeExtension.php b/src/Type/Php/PregFilterFunctionReturnTypeExtension.php
@@ -25,7 +25,11 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo
 
 	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type
 	{
-		$defaultReturn = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+		$defaultReturn = ParametersAcceptorSelector::selectFromArgs(
+			$scope,
+			$functionCall->getArgs(),
+			$functionReflection->getVariants(),
+		)->getReturnType();
 
 		$argsCount = count($functionCall->getArgs());
 		if ($argsCount < 3) {

diff --git a/src/Type/Php/StrtotimeFunctionReturnTypeExtension.php b/src/Type/Php/StrtotimeFunctionReturnTypeExtension.php
@@ -31,7 +31,11 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo
 
 	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type
 	{
-		$defaultReturnType = ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+		$defaultReturnType = ParametersAcceptorSelector::selectFromArgs(
+			$scope,
+			$functionCall->getArgs(),
+			$functionReflection->getVariants(),
+		)->getReturnType();
 		if (count($functionCall->getArgs()) === 0) {
 			return $defaultReturnType;
 		}

diff --git a/tests/PHPStan/Analyser/data/MethodCallReturnsBoolExpressionTypeResolverExtension.php b/tests/PHPStan/Analyser/data/MethodCallReturnsBoolExpressionTypeResolverExtension.php
@@ -34,7 +34,11 @@ public function getType(Expr $expr, Scope $scope): ?Type
 			return null;
 		}
 
-		$returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+		$returnType = ParametersAcceptorSelector::selectFromArgs(
+			$scope,
+			$expr->getArgs(),
+			$methodReflection->getVariants(),
+		)->getReturnType();
 
 		if ($returnType instanceof StringType) {
 			return null;

diff --git a/tests/PHPStan/Analyser/nsrt/preg_filter.php b/tests/PHPStan/Analyser/nsrt/preg_filter.php
@@ -24,10 +24,10 @@ function doFoo1() {
 
 	function doFoo2() {
 		$subject = 123;
-		assertType('list<string>|string|null', preg_filter('/\d/', '$0', $subject));
+		assertType('string|null', preg_filter('/\d/', '$0', $subject));
 
 		$subject = 123.123;
-		assertType('list<string>|string|null', preg_filter('/\d/', '$0', $subject));
+		assertType('string|null', preg_filter('/\d/', '$0', $subject));
 	}
 
 	public function dooFoo3(string $pattern, string $replace) {