fix

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;
@@ -92,6 +93,8 @@
 final class LegacyTypeSpecifier implements TypeSpecifier
 {
 
+	private const MAX_ACCESSORIES_LIMIT = 8;
+
 	/** @var MethodTypeSpecifyingExtension[][]|null */
 	private ?array $methodTypeSpecifyingExtensionsByClass = null;
 
@@ -1189,7 +1192,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;
 				}
 

src/Type/IntersectionType.php

@@ -691,6 +691,10 @@ public function getArraySize(): Type
 			$knownOffsets[$type->getOffsetType()->getValue()] = true;
 		}
 
+		if ($this->isIterableAtLeastOnce()->yes()) {
+			$knownOffsets[0] = true;
+		}
+
 		if ($knownOffsets !== []) {
 			return TypeCombinator::intersect($arraySize, IntegerRangeType::fromInterval(count($knownOffsets), null));
 		}
@@ -830,9 +834,26 @@ public function isOffsetAccessLegal(): TrinaryLogic
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		if ($this->isList()->yes() && $this->isIterableAtLeastOnce()->yes()) {
+		if ($this->isList()->yes()) {
 			$arrayKeyOffsetType = $offsetType->toArrayKey();
-			if ((new ConstantIntegerType(0))->isSuperTypeOf($arrayKeyOffsetType)->yes()) {
+
+			$negative = IntegerRangeType::fromInterval(null, -1);
+			if ($negative->isSuperTypeOf($arrayKeyOffsetType)->yes()) {
+				return TrinaryLogic::createNo();
+			}
+
+			$size = $this->getArraySize();
+			if ($size instanceof IntegerRangeType && $size->getMin() !== null) {
+				$knownOffsets = IntegerRangeType::fromInterval(0, $size->getMin());
+			} elseif ($size instanceof ConstantIntegerType) {
+				$knownOffsets = IntegerRangeType::fromInterval(0, $size->getValue());
+			} elseif ($this->isIterableAtLeastOnce()->yes()) {
+				$knownOffsets = new ConstantIntegerType(0);
+			} else {
+				$knownOffsets = null;
+			}
+
+			if ($knownOffsets !== null && $knownOffsets->isSuperTypeOf($arrayKeyOffsetType)->yes()) {
 				return TrinaryLogic::createYes();
 			}
 

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

@@ -14,6 +14,12 @@ public function count($list): void
 		}
 
 		if (count($list) > 2) {
+			assertType('false', array_key_exists(-1, $list));
+			assertType('true', array_key_exists(0, $list));
+			assertType('true', array_key_exists(1, $list));
+			assertType('true', array_key_exists(2, $list));
+			assertType('bool', array_key_exists(3, $list));
+
 			assertType('non-empty-list<int>&hasOffsetValue(1, int)&hasOffsetValue(2, int)', $list);
 			assertType('int<3, max>', count($list));
 		} else {

tests/PHPStan/Analyser/nsrt/count-recursive.php

@@ -84,18 +84,18 @@ public function countList($list): void
 	{
 		if (count($list) > 2) {
 			assertType('int<3, max>', count($list));
-			assertType('int<1, max>', count($list, COUNT_NORMAL));
-			assertType('int<1, max>', count($list, COUNT_RECURSIVE));
+			assertType('int<2, max>', count($list, COUNT_NORMAL));
+			assertType('int<2, max>', count($list, COUNT_RECURSIVE));
 		}
 	}
 
 	/** @param list<int> $list */
 	public function countListNormal($list): void
 	{
 		if (count($list, COUNT_NORMAL) > 2) {
-			assertType('int<1, max>', count($list));
+			assertType('int<2, max>', count($list));
 			assertType('int<3, max>', count($list, COUNT_NORMAL));
-			assertType('int<1, max>', count($list, COUNT_RECURSIVE));
+			assertType('int<2, max>', count($list, COUNT_RECURSIVE));
 		}
 	}
 
@@ -124,8 +124,8 @@ public function countMixed($arr, $mode): void
 	public function countListRecursive($list): void
 	{
 		if (count($list, COUNT_RECURSIVE) > 2) {
-			assertType('int<1, max>', count($list));
-			assertType('int<1, max>', count($list, COUNT_NORMAL));
+			assertType('int<2, max>', count($list));
+			assertType('int<2, max>', count($list, COUNT_NORMAL));
 			assertType('int<3, max>', count($list, COUNT_RECURSIVE));
 		}
 	}