fix

Author: staabm

src/Type/IntersectionType.php

@@ -691,7 +691,7 @@ public function getArraySize(): Type
 			$knownOffsets[$type->getOffsetType()->getValue()] = true;
 		}
 
-		if ($this->isIterableAtLeastOnce()->yes()) {
+		if ($this->isList()->yes() && $this->isIterableAtLeastOnce()->yes()) {
 			$knownOffsets[0] = true;
 		}
 
@@ -844,7 +844,7 @@ public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 
 			$size = $this->getArraySize();
 			if ($size instanceof IntegerRangeType && $size->getMin() !== null) {
-				$knownOffsets = IntegerRangeType::fromInterval(0, $size->getMin());
+				$knownOffsets = IntegerRangeType::fromInterval(0, $size->getMin() - 1);
 			} elseif ($size instanceof ConstantIntegerType) {
 				$knownOffsets = IntegerRangeType::fromInterval(0, $size->getValue());
 			} elseif ($this->isIterableAtLeastOnce()->yes()) {

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<2, max>', count($list, COUNT_NORMAL));
-			assertType('int<2, max>', count($list, COUNT_RECURSIVE));
+			assertType('int<3, max>', count($list, COUNT_NORMAL));
+			assertType('int<3, max>', count($list, COUNT_RECURSIVE));
 		}
 	}
 
 	/** @param list<int> $list */
 	public function countListNormal($list): void
 	{
 		if (count($list, COUNT_NORMAL) > 2) {
-			assertType('int<2, max>', count($list));
+			assertType('int<3, max>', count($list));
 			assertType('int<3, max>', count($list, COUNT_NORMAL));
-			assertType('int<2, max>', count($list, COUNT_RECURSIVE));
+			assertType('int<3, 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<2, max>', count($list));
-			assertType('int<2, max>', count($list, COUNT_NORMAL));
+			assertType('int<3, max>', count($list));
+			assertType('int<3, max>', count($list, COUNT_NORMAL));
 			assertType('int<3, max>', count($list, COUNT_RECURSIVE));
 		}
 	}