DynamicReturnType for array search call not strict

VincentLanglet · ondrejmirtes · commit c74dca665399 · 2020-05-28T08:36:34.000+02:00
diff --git a/src/Type/Php/ArraySearchFunctionDynamicReturnTypeExtension.php b/src/Type/Php/ArraySearchFunctionDynamicReturnTypeExtension.php
@@ -42,12 +42,14 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		}
 
 		if ($argsCount < 3) {
-			return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+			return TypeCombinator::union($haystackArgType->getIterableKeyType(), new ConstantBooleanType(false));
 		}
 
 		$strictArgType = $scope->getType($functionCall->args[2]->value);
-		if (!($strictArgType instanceof ConstantBooleanType) || $strictArgType->getValue() === false) {
+		if (!($strictArgType instanceof ConstantBooleanType)) {
 			return TypeCombinator::union($haystackArgType->getIterableKeyType(), new ConstantBooleanType(false), new NullType());
+		} elseif ($strictArgType->getValue() === false) {
+			return TypeCombinator::union($haystackArgType->getIterableKeyType(), new ConstantBooleanType(false));
 		}
 
 		$needleArgType = $scope->getType($functionCall->args[0]->value);
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -5261,6 +5261,14 @@ public function dataArrayFunctions(): array
 				'string|false',
 				'array_search(9, $generalStringKeys, true)',
 			],
+			[
+				'string|false',
+				'array_search(9, $generalStringKeys, false)',
+			],
+			[
+				'string|false',
+				'array_search(9, $generalStringKeys)',
+			],
 			[
 				'null',
 				'array_search(999, $integer, true)',
@@ -5274,7 +5282,7 @@ public function dataArrayFunctions(): array
 				'array_search($mixed, $array, true)',
 			],
 			[
-				'int|string|false|null',
+				'int|string|false',
 				'array_search($mixed, $array, false)',
 			],
 			[
@@ -5298,7 +5306,7 @@ public function dataArrayFunctions(): array
 				'array_search($generalIntegerOrString, $clonedConditionalArray, true)',
 			],
 			[
-				'int|string|false|null',
+				'int|string|false',
 				'array_search($generalIntegerOrString, $generalIntegerOrStringKeys, false)',
 			],
 			[

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,14 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`if ($argsCount < 3) {`
`45`		`- return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();`
	`45`	`+ return TypeCombinator::union($haystackArgType->getIterableKeyType(), new ConstantBooleanType(false));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`$strictArgType = $scope->getType($functionCall->args[2]->value);`
`49`		`- if (!($strictArgType instanceof ConstantBooleanType) \|\| $strictArgType->getValue() === false) {`
	`49`	`+ if (!($strictArgType instanceof ConstantBooleanType)) {`
`50`	`50`	`return TypeCombinator::union($haystackArgType->getIterableKeyType(), new ConstantBooleanType(false), new NullType());`
	`51`	`+ } elseif ($strictArgType->getValue() === false) {`
	`52`	`+ return TypeCombinator::union($haystackArgType->getIterableKeyType(), new ConstantBooleanType(false));`
`51`	`53`	`}`
`52`	`54`
`53`	`55`	`$needleArgType = $scope->getType($functionCall->args[0]->value);`