add more tests, simplify impl

Author: staabm

src/Type/IntersectionType.php

@@ -683,17 +683,17 @@ public function getArraySize(): Type
 	{
 		$arraySize = $this->intersectTypes(static fn (Type $type): Type => $type->getArraySize());
 
-		if ($arraySize instanceof IntegerRangeType) {
-			$knownOffsets = [];
-			foreach ($this->types as $type) {
-				if (!($type instanceof HasOffsetValueType) && !($type instanceof HasOffsetType)) {
-					continue;
-				}
-
-				$knownOffsets[$type->getOffsetType()->getValue()] = true;
+		$knownOffsets = [];
+		foreach ($this->types as $type) {
+			if (!($type instanceof HasOffsetValueType) && !($type instanceof HasOffsetType)) {
+				continue;
 			}
 
-			return IntegerRangeType::fromInterval(max(count($knownOffsets), $arraySize->getMin()), $arraySize->getMax());
+			$knownOffsets[$type->getOffsetType()->getValue()] = true;
+		}
+
+		if ($knownOffsets !== []) {
+			return TypeCombinator::intersect($arraySize, IntegerRangeType::fromInterval(count($knownOffsets), null));
 		}
 
 		return $arraySize;

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

@@ -130,6 +130,24 @@ public function countListRecursive($list): void
 		}
 	}
 
+	/** @param arary<int> $array */
+	public function countListRecursiveOnUnionOfRanges($array): void
+	{
+		if (!array_key_exists(5, $array)) {
+			return;
+		}
+		assertType('non-empty-array&hasOffset(5)', $array);
+		assertType('int<1, max>', count($array));
+
+		if (
+			(count($array) > 2 && count($array) < 5)
+			|| (count($array) > 20 && count($array) < 50)
+		) {
+			assertType('int<3, 4>|int<21, 49>', count($array));
+		}
+	}
+
+
 	public function countConstantArray(array $anotherArray): void {
 		$arr = [1, 2, 3, [4, 5]];
 		assertType('4', count($arr));
@@ -177,4 +195,19 @@ public function countAfterKeyExists(array $array, int $i): void {
 			}
 		}
 	}
+
+	public function unionIntegerCountAfterKeyExists(array $array, int $i): void {
+		if ($array === []) {
+			return;
+		}
+
+		assertType('non-empty-array', $array);
+		if (count($array) === 3 || count($array) === 4) {
+			assertType('3|4', count($array));
+			if (array_key_exists(5, $array)) {
+				assertType('non-empty-array&hasOffset(5)', $array);
+				assertType('3|4', count($array));
+			}
+		}
+	}
 }