test different count() variants

Author: staabm

src/Analyser/LegacyTypeSpecifier.php

@@ -38,6 +38,7 @@
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
 use PHPStan\Type\Accessory\AccessoryNonFalsyStringType;
 use PHPStan\Type\Accessory\HasOffsetType;
+use PHPStan\Type\Accessory\HasOffsetValueType;
 use PHPStan\Type\Accessory\HasPropertyType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
@@ -91,6 +92,7 @@
 #[AutowiredService(name: 'typeSpecifier', factory: '@typeSpecifierFactory::create', as: TypeSpecifier::class)]
 final class LegacyTypeSpecifier implements TypeSpecifier
 {
+	private const MAX_ACCESSORIES_LIMIT = 8;
 
 	/** @var MethodTypeSpecifyingExtension[][]|null */
 	private ?array $methodTypeSpecifyingExtensionsByClass = null;
@@ -1189,7 +1191,27 @@ private function specifyTypesForCountFuncCall(
 						$builderData[] = [$offsetType, $arrayType->getOffsetValueType($offsetType), !$hasOffset->yes()];
 					}
 				} else {
-					$resultTypes[] = TypeCombinator::intersect($arrayType, new NonEmptyArrayType());
+					$intersection = [];
+					$intersection[] = $arrayType;
+					$intersection[] = new NonEmptyArrayType();
+
+					$zero = new ConstantIntegerType(0);
+					$i = 0;
+					foreach ($builderData as [$offsetType, $valueType]) {
+						// non-empty-list already implies the offset 0
+						if ($zero->isSuperTypeOf($offsetType)->yes()) {
+							continue;
+						}
+
+						if ($i > self::MAX_ACCESSORIES_LIMIT) {
+							break;
+						}
+
+						$intersection[] = new HasOffsetValueType($offsetType, $valueType);
+						$i++;
+					}
+
+					$resultTypes[] = TypeCombinator::intersect(...$intersection);
 					continue;
 				}
 

tests/PHPStan/Analyser/nsrt/bug-13747.php

@@ -23,15 +23,15 @@ public function count($list): void
 
 		if (count($list, COUNT_NORMAL) > 2) {
 			assertType('non-empty-list<int>&hasOffsetValue(1, int)&hasOffsetValue(2, int)', $list);
-			assertType('int<3, max>', count($list));
+			assertType('int<3, max>', count($list, COUNT_NORMAL));
 		} else {
 			assertType('non-empty-list<int>', $list);
 		}
 
 		assertType('non-empty-list<int>', $list);
-		if (count($list, COUNT_RECURSIVE) > 2) {
-			assertType('non-empty-list<int>', $list);
-			assertType('int<1, max>', count($list));
+		if (count($list, COUNT_RECURSIVE) > 2) { // COUNT_RECURSIVE on non-recursive array
+			assertType('non-empty-list<int>&hasOffsetValue(1, int)&hasOffsetValue(2, int)', $list);
+			assertType('int<3, max>', count($list, COUNT_RECURSIVE));
 		} else {
 			assertType('non-empty-list<int>', $list);
 		}