Consider offset for truthy int range

phpstan · Dec 5, 2024 · 7cf4b1a · 7cf4b1a
1 parent 22ef97b
commit 7cf4b1a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -285,7 +285,9 @@ public function specifyTypesInCondition(
 						$sizeType = IntegerRangeType::createAllGreaterThan($leftType->getValue());
 					}
 				} elseif ($leftType instanceof IntegerRangeType) {
-					$sizeType = $leftType;
+					$sizeType = $context->true()
+						? IntegerRangeType::fromInterval($leftType->getMin() + $offset, $leftType->getMax())
+						: $leftType;
 				}
 
 				$specifiedTypes = $this->specifyTypesForCountFuncCall($expr->right, $argType, $sizeType, $context, $scope, $rootExpr);

diff --git a/tests/PHPStan/Analyser/nsrt/bug-4700.php b/tests/PHPStan/Analyser/nsrt/bug-4700.php
@@ -41,7 +41,7 @@ function(array $array, int $count): void {
 	if (isset($array['e'])) $a[] = $array['e'];
 	if (count($a) > $count) {
 		assertType('int<2, 5>', count($a));
-		assertType('array{0: mixed~null, 1?: mixed~null, 2?: mixed~null, 3?: mixed~null, 4?: mixed~null}', $a);
+		assertType('array{0: mixed~null, 1: mixed~null, 2?: mixed~null, 3?: mixed~null, 4?: mixed~null}&list', $a);
 	} else {
 		assertType('0', count($a));
 		assertType('array{}', $a);