Revert "Merge foreach loops for gotGreater/gotSmaller and newMin/newMax computation"

This reverts commit 309179a.

Author: staabm

src/Analyser/MutatingScope.php

@@ -4100,24 +4100,30 @@ private function generalizeType(Type $a, Type $b, int $depth): Type
 
 					$gotGreater = false;
 					$gotSmaller = false;
-					$newMin = $min;
-					$newMax = $max;
 					foreach ($constantIntegers['b'] as $int) {
 						if ($int->getValue() > $max) {
 							$gotGreater = true;
 						}
-						if ($int->getValue() < $min) {
-							$gotSmaller = true;
-						}
-						if ($int->getValue() < $newMin) {
-							$newMin = $int->getValue();
-						}
-						if ($int->getValue() > $newMax) {
-							$newMax = $int->getValue();
+						if ($int->getValue() >= $min) {
+							continue;
 						}
+
+						$gotSmaller = true;
 					}
 
 					if ($gotGreater && $gotSmaller) {
+						$newMin = $min;
+						$newMax = $max;
+						foreach ($constantIntegers['b'] as $int) {
+							if ($int->getValue() < $newMin) {
+								$newMin = $int->getValue();
+							}
+							if ($int->getValue() <= $newMax) {
+								continue;
+							}
+
+							$newMax = $int->getValue();
+						}
 						$resultTypes[] = IntegerRangeType::fromInterval($newMin, $newMax);
 					} elseif ($gotGreater) {
 						$resultTypes[] = IntegerRangeType::fromInterval($min, null);
@@ -4168,8 +4174,6 @@ private function generalizeType(Type $a, Type $b, int $depth): Type
 
 					$gotGreater = false;
 					$gotSmaller = false;
-					$newMin = $min;
-					$newMax = $max;
 					foreach ($integerRanges['b'] as $range) {
 						if ($range->getMin() === null) {
 							$rangeMin = PHP_INT_MIN;
@@ -4185,15 +4189,11 @@ private function generalizeType(Type $a, Type $b, int $depth): Type
 						if ($rangeMax > $max) {
 							$gotGreater = true;
 						}
-						if ($rangeMin < $min) {
-							$gotSmaller = true;
-						}
-						if ($rangeMin < $newMin) {
-							$newMin = $rangeMin;
-						}
-						if ($rangeMax > $newMax) {
-							$newMax = $rangeMax;
+						if ($rangeMin >= $min) {
+							continue;
 						}
+
+						$gotSmaller = true;
 					}
 
 					if ($min === PHP_INT_MIN) {
@@ -4202,15 +4202,9 @@ private function generalizeType(Type $a, Type $b, int $depth): Type
 					if ($max === PHP_INT_MAX) {
 						$max = null;
 					}
-					if ($newMin === PHP_INT_MIN) {
-						$newMin = null;
-					}
-					if ($newMax === PHP_INT_MAX) {
-						$newMax = null;
-					}
 
 					if ($gotGreater && $gotSmaller) {
-						$resultTypes[] = IntegerRangeType::fromInterval($newMin, $newMax);
+						$resultTypes[] = new IntegerType();
 					} elseif ($gotGreater) {
 						$resultTypes[] = IntegerRangeType::fromInterval($min, null);
 					} elseif ($gotSmaller) {