Fix false positive with array_combine() on php8

staabm · ondrejmirtes · commit 04edd0483f92 · 2023-03-08T08:13:19.000+01:00
diff --git a/src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php b/src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php
@@ -7,7 +7,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\FunctionReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
@@ -36,10 +35,10 @@ public function isFunctionSupported(FunctionReflection $functionReflection): boo
 		return $functionReflection->getName() === 'array_combine';
 	}
 
-	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): Type
+	public function getTypeFromFunctionCall(FunctionReflection $functionReflection, FuncCall $functionCall, Scope $scope): ?Type
 	{
 		if (count($functionCall->getArgs()) < 2) {
-			return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
+			return null;
 		}
 
 		$firstArg = $functionCall->getArgs()[0]->value;
@@ -56,6 +55,9 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			$valueTypes = $valuesParamType->getValueTypes();
 
 			if (count($keyTypes) !== count($valueTypes)) {
+				if ($this->phpVersion->throwsTypeErrorForInternalFunctions()) {
+					return null;
+				}
 				return new ConstantBooleanType(false);
 			}
 
diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -4555,7 +4555,7 @@ public function dataArrayFunctions(): array
 				'array_combine([1], [2])',
 			],
 			[
-				'false',
+				PHP_VERSION_ID < 80000 ? 'false' : 'array',
 				'array_combine([1, 2], [3])',
 			],
 			[
diff --git a/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php b/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php
@@ -846,4 +846,19 @@ public function testBug8879(): void
 		$this->analyse([__DIR__ . '/data/bug-8879.php'], []);
 	}
 
+	public function testBug9011(): void
+	{
+		$errors = [];
+		if (PHP_VERSION_ID < 80000) {
+			$errors = [
+				[
+					'Method Bug9011\HelloWorld::getX() should return array<string> but returns false.',
+					16,
+				],
+			];
+		}
+
+		$this->analyse([__DIR__ . '/data/bug-9011.php'], $errors);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/bug-9011.php b/tests/PHPStan/Rules/Methods/data/bug-9011.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bug9011;
+
+class HelloWorld
+{
+	/**
+	 * @return string[]
+	 */
+	public function getX(): array
+	{
+		$a = array('green', 'red', 'yellow', 'y');
+		$b = array('avocado', 'apple', 'banana');
+		return array_combine($a, $b);
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -4555,7 +4555,7 @@ public function dataArrayFunctions(): array`
`4555`	`4555`	`'array_combine([1], [2])',`
`4556`	`4556`	`],`
`4557`	`4557`	`[`
`4558`		`- 'false',`
	`4558`	`+ PHP_VERSION_ID < 80000 ? 'false' : 'array',`
`4559`	`4559`	`'array_combine([1, 2], [3])',`
`4560`	`4560`	`],`
`4561`	`4561`	`[`