Simplify and generalise safe-guards

Author: herndlm

src/Analyser/TypeSpecifier.php

@@ -1087,10 +1087,7 @@ private function specifyTypesForCountFuncCall(
 			if (
 				$sizeType instanceof ConstantIntegerType
 				&& $sizeType->getValue() < ConstantArrayTypeBuilder::ARRAY_COUNT_LIMIT
-				&& (
-					$isList->yes()
-					|| $isConstantArray->yes() && $arrayType->getKeyType()->isSuperTypeOf(IntegerRangeType::fromInterval(0, $sizeType->getValue() - 1))->yes()
-				)
+				&& $arrayType->getKeyType()->isSuperTypeOf(IntegerRangeType::fromInterval(0, $sizeType->getValue() - 1))->yes()
 			) {
 				// turn optional offsets non-optional
 				$valueTypesBuilder = ConstantArrayTypeBuilder::createEmpty();
@@ -1107,28 +1104,18 @@ private function specifyTypesForCountFuncCall(
 				&& $sizeType->getMin() !== null
 				&& $sizeType->getMin() <= ConstantArrayTypeBuilder::ARRAY_COUNT_LIMIT
 				&& ($sizeType->getMax() === null || $sizeType->getMax() - $sizeType->getMin() <= ConstantArrayTypeBuilder::ARRAY_COUNT_LIMIT)
-				&& (
-					$isList->yes()
-					|| $isConstantArray->yes() && $arrayType->getKeyType()->isSuperTypeOf(IntegerRangeType::fromInterval(0, $sizeType->getMin() - 1))->yes()
-				)
+				&& $arrayType->getKeyType()->isSuperTypeOf(IntegerRangeType::fromInterval(0, $sizeType->getMin() - 1))->yes()
+				&& ($sizeType->getMax() === null || $arrayType->getKeyType()->isSuperTypeOf(IntegerRangeType::fromInterval(0, $sizeType->getMax() - 1))->yes())
 			) {
 				// turn optional offsets non-optional
 				$valueTypesBuilder = ConstantArrayTypeBuilder::createEmpty();
 				for ($i = 0; $i < $sizeType->getMin(); $i++) {
 					$offsetType = new ConstantIntegerType($i);
-					$hasOffset = $arrayType->hasOffsetValueType($offsetType);
-					if ($hasOffset->no()) {
-						break;
-					}
 					$valueTypesBuilder->setOffsetValueType($offsetType, $arrayType->getOffsetValueType($offsetType));
 				}
 				if ($sizeType->getMax() !== null) {
 					for ($i = $sizeType->getMin(); $i < $sizeType->getMax(); $i++) {
 						$offsetType = new ConstantIntegerType($i);
-						$hasOffset = $arrayType->hasOffsetValueType($offsetType);
-						if ($hasOffset->no()) {
-							break;
-						}
 						$valueTypesBuilder->setOffsetValueType($offsetType, $arrayType->getOffsetValueType($offsetType), true);
 					}
 				} elseif ($arrayType->isConstantArray()->yes()) {

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

@@ -376,7 +376,7 @@ protected function testOptionalKeysInUnionListWithIntRange($row, $listRow, $twoO
 		}
 
 		if (count($row) >= $threeOrMoreInRangeLimit) {
-			assertType('array{0: int, 1: string|null, 2: int|null, 3?: float|null}', $row);
+			assertType('list{0: int, 1?: string|null, 2?: int|null, 3?: float|null}', $row);
 		} else {
 			assertType('array{string}|list{0: int, 1?: string|null, 2?: int|null, 3?: float|null}', $row);
 		}