fix modulo operator when handling integer-ranges without 0

Author: staabm

src/Analyser/MutatingScope.php

@@ -1135,7 +1135,11 @@ private function resolveType(Expr $node): Type
 				} elseif ($rightType instanceof UnionType) {
 					foreach ($rightType->getTypes() as $type) {
 						if ($type instanceof IntegerRangeType) {
-							$rangeMax = max($rangeMax, $type->getMax() !== null ? $type->getMax() - 1 : null);
+							if ($type->getMax() === null) {
+								$rangeMax = null;
+							} else {
+								$rangeMax = max($rangeMax, $type->getMax());
+							}
 						} elseif ($type instanceof ConstantIntegerType) {
 							$rangeMax = max($rangeMax, $type->getValue() - 1);
 						}

tests/PHPStan/Analyser/data/modulo-operator.php

@@ -14,7 +14,7 @@ class Foo
 	 * @param int<min, 3>|int<4, max> $unionRange
 	 * @param int<min, 3>|7 $hybridUnionRange
 	 */
-	function doBar(int $i, $p, $range, $zeroOrMore, $intConst, $unionRange, $hybridUnionRange, $mixed)
+	function doBar(int $i, int $j, $p, $range, $zeroOrMore, $intConst, $unionRange, $hybridUnionRange, $mixed)
 	{
 		assertType('int<-1, 1>', $i % 2);
 		assertType('int<0, 1>', $p % 2);
@@ -38,5 +38,11 @@ function doBar(int $i, $p, $range, $zeroOrMore, $intConst, $unionRange, $hybridU
 		assertType('int<0, 6>', $p % $hybridUnionRange);
 
 		assertType('int<0, max>', $zeroOrMore % $mixed);
+
+		if ($i === 0) {
+			return;
+		}
+
+		assertType('int', $j % $i);
 	}
 }