Fix phpstan/phpstan#12163: non-negative-int evaluated to int

src/Analyser/MutatingScope.php

@@ -4098,21 +4098,25 @@ private function generalizeType(Type $a, Type $b, int $depth): Type
 						$max = $int->getValue();
 					}
 
+					$newMin = $min;
+					$newMax = $max;
 					$gotGreater = false;
 					$gotSmaller = false;
 					foreach ($constantIntegers['b'] as $int) {
 						if ($int->getValue() > $max) {
+							$newMax = $int->getValue();
 							$gotGreater = true;
 						}
 						if ($int->getValue() >= $min) {
 							continue;
 						}
 
+						$newMin = $int->getValue();
 						$gotSmaller = true;
 					}
 
 					if ($gotGreater && $gotSmaller) {
-						$resultTypes[] = new IntegerType();
+						$resultTypes[] = IntegerRangeType::fromInterval($newMin, $newMax);
 					} elseif ($gotGreater) {
 						$resultTypes[] = IntegerRangeType::fromInterval($min, null);
 					} elseif ($gotSmaller) {

tests/PHPStan/Analyser/nsrt/bug-12163.php

@@ -0,0 +1,102 @@
+<?php declare(strict_types = 1);
+
+namespace Bug12163;
+
+use function PHPStan\Testing\assertType;
+
+class Test
+{
+	public function iterateRowColumnIndicesIncrementing(int $rows, int $columns): void
+	{
+		if ($rows < 1 || $columns < 1) return;
+		$size = $rows * $columns;
+
+		$rowIndex = 0;
+		$columnIndex = 0;
+		for ($i = 0; $i < $size; $i++) {
+			assertType('int<0, max>', $rowIndex);
+			assertType('int<0, max>', $columnIndex);
+			if ($columnIndex < $columns) {
+				$columnIndex++;
+			} else {
+				$columnIndex = 0;
+				$rowIndex++;
+			}
+		}
+	}
+}
+
+class Test2
+{
+	public function iterateRowColumnIndicesDecrementing(int $rows, int $columns): void
+	{
+		if ($rows < 1 || $columns < 1) return;
+		$size = $rows * $columns;
+
+		$rowIndex = 0;
+		$columnIndex = 0;
+		for ($i = 0; $i < $size; $i++) {
+			assertType('0', $rowIndex); // `0`, because the IF in line 41 is always TRUE
+			assertType('int<min, 0>', $columnIndex);
+			if ($columnIndex < $columns) {
+				$columnIndex--;
+			} else {
+				$columnIndex = 0;
+				$rowIndex++;
+			}
+		}
+	}
+}
+
+class Test3
+{
+	/**
+	 * @param int<0, 30> $columnIndex
+	 */
+	public function iterateRowColumnIndicesDecrementing(int $rows, int $columns, int $columnIndex): void
+	{
+		if ($rows < 1 || $columns < 1) return;
+		$size = $rows * $columns;
+
+		for ($i = 0; $i < $size; $i++) {
+			assertType('int<min, 30>', $columnIndex);
+			if ($columnIndex < 3) {
+				$columnIndex--;
+			} else {
+				$columnIndex = 0;
+			}
+			assertType('int<min, 1>', $columnIndex);
+		}
+	}
+}
+
+class Bug12163
+{
+	/**
+	 * @param non-negative-int $value
+	 * @return void
+	 */
+	private function checkNonNegative(int $value): void
+	{
+		sleep(1);
+	}
+
+	public function iterateRowColumnIndices(int $rows, int $columns): void
+	{
+		if ($rows < 1 || $columns < 1) return;
+		$size = $rows * $columns;
+
+		$rowIndex = 0;
+		$columnIndex = 0;
+		for ($i = 0; $i < $size; $i++) {
+			$this->checkNonNegative($rowIndex);
+			$this->checkNonNegative($columnIndex);
+			if ($columnIndex < $columns) {
+				$columnIndex++;
+			} else {
+				$columnIndex = 0;
+				$rowIndex++;
+			}
+		}
+	}
+}

tests/PHPStan/Rules/Comparison/NumberComparisonOperatorsConstantConditionRuleTest.php

@@ -288,4 +288,14 @@ public function testBug13874(): void
 		$this->analyse([__DIR__ . '/data/bug-13874.php'], []);
 	}
 
+	public function testBug12163(): void
+	{
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-12163.php'], [
+			[
+				'Comparison operation "<" between int<min, 0> and int<1, max> is always true.',
+				41,
+			],
+		]);
+	}
+
 }