Fix ArrayCountValues

Author: VincentLanglet

src/Type/Php/ArrayCountValuesDynamicReturnTypeExtension.php

@@ -10,8 +10,10 @@
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
-use PHPStan\Type\ErrorType;
 use PHPStan\Type\IntegerRangeType;
+use PHPStan\Type\IntegerType;
+use PHPStan\Type\NeverType;
+use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
@@ -43,17 +45,11 @@ public function getTypeFromFunctionCall(
 		$arrayTypes = $inputType->getArrays();
 
 		$outputTypes = [];
+		$allowedValues = new UnionType([new IntegerType(), new StringType()]);
 
 		foreach ($arrayTypes as $arrayType) {
-			$itemType = $arrayType->getItemType();
-
-			if ($itemType instanceof UnionType) {
-				$itemType = $itemType->filterTypes(
-					static fn ($type) => !$type->toArrayKey() instanceof ErrorType,
-				);
-			}
-
-			if ($itemType->toArrayKey() instanceof ErrorType) {
+			$itemType = TypeCombinator::intersect($arrayType->getItemType(), $allowedValues);
+			if ($itemType instanceof NeverType) {
 				continue;
 			}
 

tests/PHPStan/Analyser/nsrt/array-count-values.php

@@ -41,3 +41,8 @@ public function __toString(): string
 $stringable = array_count_values([new StringableObject(), 'string', 1]);
 
 assertType('non-empty-array<1|\'string\', int<1, max>>', $stringable);
+
+// Booleans, floats and null are ignored by array_count_values even if they can be cast to array key.
+$scalar = array_count_values([true, 1.0, false, 0.0, null]);
+
+assertType('array{}', $scalar);