Fix throw on failure with require/force array (#5349)

Author: VincentLanglet

src/Type/Php/FilterFunctionReturnTypeHelper.php

@@ -151,8 +151,9 @@ public function getType(Type $inputType, ?Type $filterType, ?Type $flagsType): T
 
 		$inputIsArray = $inputType->isArray();
 		$hasRequireArrayFlag = $this->hasFlag('FILTER_REQUIRE_ARRAY', $flagsType);
+		$hasThrowOnFailureFlag = $this->hasFlag('FILTER_THROW_ON_FAILURE', $flagsType);
 		if ($inputIsArray->no() && $hasRequireArrayFlag->yes()) {
-			if ($this->hasFlag('FILTER_THROW_ON_FAILURE', $flagsType)->yes()) {
+			if ($hasThrowOnFailureFlag->yes()) {
 				return new ErrorType();
 			}
 
@@ -197,9 +198,13 @@ public function getType(Type $inputType, ?Type $filterType, ?Type $flagsType): T
 			}
 		}
 
+		if ($hasThrowOnFailureFlag->yes()) {
+			$type = TypeCombinator::remove($type, $defaultType);
+		}
+
 		if ($hasRequireArrayFlag->yes()) {
 			$type = new ArrayType($inputArrayKeyType ?? $mixedType, $type);
-			if (!$inputIsArray->yes()) {
+			if (!$hasThrowOnFailureFlag->yes() && !$inputIsArray->yes()) {
 				$type = TypeCombinator::union($type, $defaultType);
 			}
 		}
@@ -208,10 +213,6 @@ public function getType(Type $inputType, ?Type $filterType, ?Type $flagsType): T
 			return new ArrayType($inputArrayKeyType ?? $mixedType, $type);
 		}
 
-		if ($this->hasFlag('FILTER_THROW_ON_FAILURE', $flagsType)->yes()) {
-			$type = TypeCombinator::remove($type, $defaultType);
-		}
-
 		return $type;
 	}
 

tests/PHPStan/Analyser/nsrt/filter-var-php85.php

@@ -23,4 +23,10 @@ public function doFoo($mixed): void
 		assertType('int', filter_var($mixed, FILTER_VALIDATE_INT, FILTER_THROW_ON_FAILURE));
 		assertType('int', filter_var($mixed, FILTER_VALIDATE_INT, ['flags' => FILTER_THROW_ON_FAILURE]));
 	}
+
+	public function more($mixed): void
+	{
+		assertType('array<int>', filter_var($mixed, FILTER_VALIDATE_INT, FILTER_FORCE_ARRAY|FILTER_THROW_ON_FAILURE));
+		assertType('array<int>', filter_var($mixed, FILTER_VALIDATE_INT, FILTER_REQUIRE_ARRAY|FILTER_THROW_ON_FAILURE));
+	}
 }