fix spaceship operator for large constant unions

phpstan · Jan 21, 2024 · b60d12c · b60d12c
1 parent 4e1bfac
commit b60d12c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/Reflection/InitializerExprTypeResolver.php b/src/Reflection/InitializerExprTypeResolver.php
@@ -746,17 +746,13 @@ public function getSpaceshipType(Expr $left, Expr $right, callable $getTypeCallb
 
 		$leftTypesCount = count($leftTypes);
 		$rightTypesCount = count($rightTypes);
-		if ($leftTypesCount > 0 && $rightTypesCount > 0) {
+		if ($leftTypesCount > 0 && $rightTypesCount > 0 && $leftTypesCount * $rightTypesCount <= self::CALCULATE_SCALARS_LIMIT) {
 			$resultTypes = [];
-			$generalize = $leftTypesCount * $rightTypesCount > self::CALCULATE_SCALARS_LIMIT;
 			foreach ($leftTypes as $leftType) {
 				foreach ($rightTypes as $rightType) {
 					$leftValue = $leftType->getValue();
 					$rightValue = $rightType->getValue();
 					$resultType = $this->getTypeFromValue($leftValue <=> $rightValue);
-					if ($generalize) {
-						$resultType = $resultType->generalize(GeneralizePrecision::lessSpecific());
-					}
 					$resultTypes[] = $resultType;
 				}
 			}

diff --git a/tests/PHPStan/Rules/Functions/ArrowFunctionReturnTypeRuleTest.php b/tests/PHPStan/Rules/Functions/ArrowFunctionReturnTypeRuleTest.php
@@ -60,4 +60,9 @@ public function testBug8179(): void
 		$this->analyse([__DIR__ . '/data/bug-8179.php'], []);
 	}
 
+	public function testBugSpaceship(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-spaceship.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Functions/data/bug-spaceship.php b/tests/PHPStan/Rules/Functions/data/bug-spaceship.php
@@ -0,0 +1,6 @@
+<?php declare(strict_types=1);
+
+namespace BugSpaceship;
+
+$arr = range(1, 16);
+usort($arr, static fn (int $a, int $b): int => $a <=> $b);