Fix

Author: VincentLanglet

src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php

@@ -20,7 +20,7 @@ final class ArrayCombineFunctionReturnTypeExtension implements DynamicFunctionRe
 
 	public function __construct(
 		private ArrayCombineHelper $arrayCombineHelper,
-		private PhpVersion $phpVersion
+		private PhpVersion $phpVersion,
 	)
 	{
 	}
@@ -39,25 +39,24 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		$firstArg = $functionCall->getArgs()[0]->value;
 		$secondArg = $functionCall->getArgs()[1]->value;
 
-		[$arrayType, $hasError] = $this->arrayCombineHelper->getArrayAndThrowType($firstArg, $secondArg, $scope);
-
-		if ($hasError->no()) {
-			return $arrayType;
+		[$returnType, $hasValueError] = $this->arrayCombineHelper->getReturnAndThrowType($firstArg, $secondArg, $scope);
+		if ($hasValueError->no()) {
+			return $returnType;
 		}
 
-		if ($hasError->yes()) {
-			if ($this->phpVersion->throwsTypeErrorForInternalFunctions()) {
+		if ($hasValueError->yes()) {
+			if ($this->phpVersion->throwsValueErrorForInternalFunctions()) {
 				return new NeverType();
 			}
 
 			return new ConstantBooleanType(false);
 		}
 
-		if ($this->phpVersion->throwsTypeErrorForInternalFunctions()) {
-			return $arrayType;
+		if ($this->phpVersion->throwsValueErrorForInternalFunctions()) {
+			return $returnType;
 		}
 
-		return new UnionType([$arrayType, new ConstantBooleanType(false)]);
+		return new UnionType([$returnType, new ConstantBooleanType(false)]);
 	}
 
 }

src/Type/Php/ArrayCombineFunctionThrowTypeExtension.php

@@ -5,14 +5,9 @@
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\DependencyInjection\AutowiredService;
-use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\FunctionReflection;
-use PHPStan\Type\Constant\ConstantBooleanType;
-use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\DynamicFunctionThrowTypeExtension;
-use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
-use PHPStan\Type\UnionType;
 use function count;
 
 #[AutowiredService]
@@ -37,8 +32,8 @@ public function getThrowTypeFromFunctionCall(FunctionReflection $functionReflect
 		$firstArg = $funcCall->getArgs()[0]->value;
 		$secondArg = $funcCall->getArgs()[1]->value;
 
-		$hasError = $this->arrayCombineHelper->getArrayAndThrowType($firstArg, $secondArg, $scope)[1];
-		if (!$hasError->no()) {
+		$hasValueError = $this->arrayCombineHelper->getReturnAndThrowType($firstArg, $secondArg, $scope)[1];
+		if (!$hasValueError->no()) {
 			return $functionReflection->getThrowType();
 		}
 

src/Type/Php/ArrayCombineHelper.php

@@ -26,9 +26,9 @@ final class ArrayCombineHelper
 {
 
 	/**
-	 * @return array{Type, TrinaryLogic} The array result and if an error may occur.
+	 * @return array{Type, TrinaryLogic} The return type and if a ValueError may occur on PHP8 (and a warning on PHP7).
 	 */
-	public function getArrayAndThrowType(Expr $firstArg, Expr $secondArg, Scope $scope): array
+	public function getReturnAndThrowType(Expr $firstArg, Expr $secondArg, Scope $scope): array
 	{
 		$keysParamType = $scope->getType($firstArg);
 		$valuesParamType = $scope->getType($secondArg);
@@ -79,7 +79,7 @@ public function getArrayAndThrowType(Expr $firstArg, Expr $secondArg, Scope $sco
 
 			if ($itemType->isInteger()->no()) {
 				if ($itemType->toString() instanceof ErrorType) {
-					return [new NeverType(), TrinaryLogic::createYes()];
+					return [new NeverType(), TrinaryLogic::createNo()];
 				}
 
 				$keyType = $itemType->toString();