use BenevolentUnionType

phpstan · Nov 28, 2023 · 093bbb2 · 093bbb2
1 parent 0044649
commit 093bbb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/Type/Php/ArrayFilterFunctionReturnTypeReturnTypeExtension.php b/src/Type/Php/ArrayFilterFunctionReturnTypeReturnTypeExtension.php
@@ -23,13 +23,13 @@
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
-use PHPStan\Type\ErrorType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\StaticTypeFactory;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use PHPStan\Type\TypeUtils;
 use function array_map;
 use function count;
 use function is_string;
@@ -55,13 +55,10 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		}
 
 		$arrayArgType = $scope->getType($arrayArg);
-		$arrayArgType->isArray();
+		$arrayArgType = TypeUtils::toBenevolentUnion($arrayArgType);
 		$keyType = $arrayArgType->getIterableKeyType();
 		$itemType = $arrayArgType->getIterableValueType();
 
-		if ($itemType instanceof ErrorType || $keyType instanceof ErrorType) {
-			return new ConstantArrayType([], []);
-		}
 		if ($itemType instanceof NeverType || $keyType instanceof NeverType) {
 			return new ConstantArrayType([], []);
 		}

diff --git a/tests/PHPStan/Analyser/data/bug-10189.php b/tests/PHPStan/Analyser/data/bug-10189.php
@@ -20,7 +20,7 @@ function file_managed_file_save_upload(): array {
 	}
 	assertType('non-empty-array|Bug10189\SomeInterface', $files);
 	$files = array_filter($files);
-	assertType('array{}', $files);
+	assertType("array<mixed~0|0.0|''|'0'|array{}|false|null>", $files);
 
 	return empty($files) ? [] : [1,2];
 }