take HasOffset*Type into account

Author: staabm

src/Type/IntersectionType.php

@@ -53,6 +53,7 @@
 use function in_array;
 use function is_int;
 use function ksort;
+use function max;
 use function md5;
 use function sprintf;
 use function strcasecmp;
@@ -680,7 +681,25 @@ public function isIterableAtLeastOnce(): TrinaryLogic
 
 	public function getArraySize(): Type
 	{
-		return $this->intersectTypes(static fn (Type $type): Type => $type->getArraySize());
+		$arraySize = $this->intersectTypes(static fn (Type $type): Type => $type->getArraySize());
+
+		if ($arraySize instanceof IntegerRangeType) {
+			$knownOffsets = [];
+			foreach ($this->types as $type) {
+				if ($type instanceof HasOffsetValueType) {
+					$knownOffsets[$type->getOffsetType()->getValue()] = true;
+				}
+				if (!($type instanceof HasOffsetType)) {
+					continue;
+				}
+
+				$knownOffsets[$type->getOffsetType()->getValue()] = true;
+			}
+
+			return IntegerRangeType::fromInterval(max(count($knownOffsets), $arraySize->getMin()), $arraySize->getMax());
+		}
+
+		return $arraySize;
 	}
 
 	public function getIterableKeyType(): Type

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

@@ -116,14 +116,36 @@ public function countConstantArray(array $anotherArray): void {
 		assertType('int<1, max>', count($arr, COUNT_RECURSIVE));
 
 		$arr = [1, 2, 3, $anotherArray];
+		assertType('array{1, 2, 3, array}', $arr);
 		assertType('4', count($arr));
 		assertType('4', count($arr, COUNT_NORMAL));
 		assertType('int<1, max>', count($arr, COUNT_RECURSIVE)); // could be int<4, max>
 
 		$arr = [1, 2, 3] + $anotherArray;
 		assertType('non-empty-array&hasOffsetValue(0, 1)&hasOffsetValue(1, 2)&hasOffsetValue(2, 3)', $arr);
-		assertType('int<1, max>', count($arr)); // could be int<3, max>
-		assertType('int<1, max>', count($arr, COUNT_NORMAL));  // could be int<3, max>
-		assertType('int<1, max>', count($arr, COUNT_RECURSIVE));
+		assertType('int<3, max>', count($arr));
+		assertType('int<3, max>', count($arr, COUNT_NORMAL));
+		assertType('int<1, max>', count($arr, COUNT_RECURSIVE)); // could be int<3, max>
+	}
+
+	public function countAfterKeyExists(array $array, int $i): void {
+		if (array_key_exists(5, $array)) {
+			assertType('non-empty-array&hasOffset(5)', $array);
+			assertType('int<1, max>', count($array));
+		}
+
+		if ($array !== []) {
+			assertType('non-empty-array', $array);
+			assertType('int<1, max>', count($array));
+			if (array_key_exists(5, $array)) {
+				assertType('non-empty-array&hasOffset(5)', $array);
+				assertType('int<1, max>', count($array));
+
+				if (array_key_exists(15, $array)) {
+					assertType('non-empty-array&hasOffset(15)&hasOffset(5)', $array);
+					assertType('int<2, max>', count($array));
+				}
+			}
+		}
 	}
 }