Add array_filter support for union of arrays

phpstan · Jun 18, 2018 · 9e6ab0b · 9e6ab0b
1 parent 6c4bbce
commit 9e6ab0b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Type/Php/ArrayFilterFunctionReturnTypeReturnTypeExtension.php b/src/Type/Php/ArrayFilterFunctionReturnTypeReturnTypeExtension.php
@@ -20,6 +20,7 @@
 use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use PHPStan\Type\TypeUtils;
 use PHPStan\Type\UnionType;
 
 class ArrayFilterFunctionReturnTypeReturnTypeExtension implements \PHPStan\Type\DynamicFunctionReturnTypeExtension
@@ -42,7 +43,9 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			$itemType = $arrayArgType->getIterableValueType();
 
 			if ($callbackArg === null) {
-				return $this->removeFalsey($arrayArgType);
+				return TypeCombinator::union(
+					...array_map([$this, 'removeFalsey'], TypeUtils::getArrays($arrayArgType))
+				);
 			}
 
 			if ($flagArg === null && $callbackArg instanceof Closure && count($callbackArg->stmts) === 1) {
@@ -66,7 +69,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		return new ArrayType($keyType, $itemType);
 	}
 
-	private function removeFalsey(Type $type): Type
+	public function removeFalsey(Type $type): Type
 	{
 		$falseyTypes = new UnionType([
 			new NullType(),

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -4140,6 +4140,10 @@ public function dataArrayFunctions(): array
 				'array<int, true>',
 				'array_filter($withFalsey)',
 			],
+			[
+				'array(\'a\' => 1)',
+				'array_filter($union)',
+			],
 		];
 	}
 

diff --git a/tests/PHPStan/Analyser/data/array-functions.php b/tests/PHPStan/Analyser/data/array-functions.php
@@ -51,6 +51,11 @@
 /** @var array<int, bool|null> $withFalsey */
 $withFalsey = doFoo();
 
+$union = ['a' => 1];
+if (rand(0, 1) === 1) {
+	$union['b'] = false;
+}
+
 /** @var array<string, int> $generalStringKeys */
 $generalStringKeys = doFoo();