Sort IntegerRangeType numerically

phpstan · Oct 25, 2020 · d23684e · d23684e
1 parent dcd8734
commit d23684e
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 15 deletions.
diff --git a/src/Type/UnionTypeHelper.php b/src/Type/UnionTypeHelper.php
@@ -86,6 +86,10 @@ public static function sortTypes(array $types): array
 				return 0;
 			}
 
+			if ($a instanceof IntegerRangeType && $b instanceof IntegerRangeType) {
+				return $a->getMin() <=> $b->getMin();
+			}
+
 			if ($a instanceof ConstantStringType && $b instanceof ConstantStringType) {
 				return strcasecmp($a->getValue(), $b->getValue());
 			}

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -2343,7 +2343,7 @@ public function dataBinaryOperations(): array
 				'@$stringOrNull ?: 12',
 			],
 			[
-				'int<1, max>|int<min, -1>',
+				'int<min, -1>|int<1, max>',
 				'$integer ?: 12',
 			],
 			[
@@ -5244,7 +5244,7 @@ public function dataArrayFunctions(): array
 				'array_filter($union)',
 			],
 			[
-				'array<int, int<1, max>|int<min, -1>|true>',
+				'array<int, int<min, -1>|int<1, max>|true>',
 				'array_filter($withPossiblyFalsey)',
 			],
 			[

diff --git a/tests/PHPStan/Analyser/TypeSpecifierTest.php b/tests/PHPStan/Analyser/TypeSpecifierTest.php
@@ -702,7 +702,7 @@ public function dataCondition(): array
 					)
 				),
 				[
-					'$n' => '~int<6, max>|int<min, 2>',
+					'$n' => '~int<min, 2>|int<6, max>',
 				],
 				[
 					'$n' => '~int<3, 5>',

diff --git a/tests/PHPStan/Analyser/data/bug-2954.php b/tests/PHPStan/Analyser/data/bug-2954.php
@@ -6,31 +6,31 @@
 
 function (int $x) {
 	if ($x === 0) return;
-	assertType('int<1, max>|int<min, -1>', $x);
+	assertType('int<min, -1>|int<1, max>', $x);
 
 	$x++;
 	assertType('int', $x);
 };
 
 function (int $x) {
 	if ($x === 0) return;
-	assertType('int<1, max>|int<min, -1>', $x);
+	assertType('int<min, -1>|int<1, max>', $x);
 
 	++$x;
 	assertType('int', $x);
 };
 
 function (int $x) {
 	if ($x === 0) return;
-	assertType('int<1, max>|int<min, -1>', $x);
+	assertType('int<min, -1>|int<1, max>', $x);
 
 	$x--;
 	assertType('int', $x);
 };
 
 function (int $x) {
 	if ($x === 0) return;
-	assertType('int<1, max>|int<min, -1>', $x);
+	assertType('int<min, -1>|int<1, max>', $x);
 
 	--$x;
 	assertType('int', $x);

diff --git a/tests/PHPStan/Analyser/data/integer-range-types.php b/tests/PHPStan/Analyser/data/integer-range-types.php
@@ -21,18 +21,18 @@ function (int $i) {
 		assertType('int<min, 1>', $i);
 	}
 
-	assertType('int<3, max>|int<min, 1>', $i);
+	assertType('int<min, 1>|int<3, max>', $i);
 
 	if ($i < 3 && $i > 5) {
 		assertType('*NEVER*', $i);
 	} else {
-		assertType('int<3, max>|int<min, 1>', $i);
+		assertType('int<min, 1>|int<3, max>', $i);
 	}
 
 	if ($i > 3 && $i < 5) {
 		assertType('4', $i);
 	} else {
-		assertType('3|int<5, max>|int<min, 1>', $i);
+		assertType('3|int<min, 1>|int<5, max>', $i);
 	}
 
 	if ($i >= 3 && $i <= 5) {

diff --git a/tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php b/tests/PHPStan/Rules/Comparison/StrictComparisonOfDifferentTypesRuleTest.php
@@ -159,11 +159,11 @@ public function testStrictComparison(): void
 					438,
 				],
 				[
-					'Strict comparison using === between int<2, max>|int<min, 0>|string and 1.0 will always evaluate to false.',
+					'Strict comparison using === between int<min, 0>|int<2, max>|string and 1.0 will always evaluate to false.',
 					464,
 				],
 				[
-					'Strict comparison using === between int<2, max>|int<min, 0>|string and stdClass will always evaluate to false.',
+					'Strict comparison using === between int<min, 0>|int<2, max>|string and stdClass will always evaluate to false.',
 					466,
 				],
 				[
@@ -333,11 +333,11 @@ public function testStrictComparisonWithoutAlwaysTrue(): void
 					438,
 				],
 				[
-					'Strict comparison using === between int<2, max>|int<min, 0>|string and 1.0 will always evaluate to false.',
+					'Strict comparison using === between int<min, 0>|int<2, max>|string and 1.0 will always evaluate to false.',
 					464,
 				],
 				[
-					'Strict comparison using === between int<2, max>|int<min, 0>|string and stdClass will always evaluate to false.',
+					'Strict comparison using === between int<min, 0>|int<2, max>|string and stdClass will always evaluate to false.',
 					466,
 				],
 				[

diff --git a/tests/PHPStan/Type/TypeCombinatorTest.php b/tests/PHPStan/Type/TypeCombinatorTest.php
@@ -1426,6 +1426,14 @@ public function dataUnion(): array
 				UnionType::class,
 				'int<1, 3>|int<7, 9>',
 			],
+			[
+				[
+					IntegerRangeType::fromInterval(7, 9),
+					IntegerRangeType::fromInterval(1, 3),
+				],
+				UnionType::class,
+				'int<1, 3>|int<7, 9>',
+			],
 			[
 				[
 					IntegerRangeType::fromInterval(1, 3),
@@ -3204,7 +3212,7 @@ public function dataRemove(): array
 				new BenevolentUnionType([new IntegerType(), new StringType()]),
 				new ConstantIntegerType(1),
 				UnionType::class,
-				'int<2, max>|int<min, 0>|string',
+				'int<min, 0>|int<2, max>|string',
 			],
 			[
 				new BenevolentUnionType([new IntegerType(), new StringType()]),