Commit b60d12c

schlndhondrejmirtes

authored and

committed

fix spaceship operator for large constant unions

1 parent 4e1bfac commit b60d12cCopy full SHA for b60d12c

File tree

+12

-5

lines changed

+12

-5

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -746,17 +746,13 @@ public function getSpaceshipType(Expr $left, Expr $right, callable $getTypeCallb`
`746`	`746`
`747`	`747`	`$leftTypesCount = count($leftTypes);`
`748`	`748`	`$rightTypesCount = count($rightTypes);`
`749`		`- if ($leftTypesCount > 0 && $rightTypesCount > 0) {`
	`749`	`+ if ($leftTypesCount > 0 && $rightTypesCount > 0 && $leftTypesCount * $rightTypesCount <= self::CALCULATE_SCALARS_LIMIT) {`
`750`	`750`	`$resultTypes = [];`
`751`		`- $generalize = $leftTypesCount * $rightTypesCount > self::CALCULATE_SCALARS_LIMIT;`
`752`	`751`	`foreach ($leftTypes as $leftType) {`
`753`	`752`	`foreach ($rightTypes as $rightType) {`
`754`	`753`	`$leftValue = $leftType->getValue();`
`755`	`754`	`$rightValue = $rightType->getValue();`
`756`	`755`	`$resultType = $this->getTypeFromValue($leftValue <=> $rightValue);`
`757`		`- if ($generalize) {`
`758`		`- $resultType = $resultType->generalize(GeneralizePrecision::lessSpecific());`
`759`		`- }`
`760`	`756`	`$resultTypes[] = $resultType;`
`761`	`757`	`}`
`762`	`758`	`}`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,9 @@ public function testBug8179(): void`
`60`	`60`	`$this->analyse([__DIR__ . '/data/bug-8179.php'], []);`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ public function testBugSpaceship(): void`
	`64`	`+ {`
	`65`	`+ $this->analyse([__DIR__ . '/data/bug-spaceship.php'], []);`
	`66`	`+ }`
	`67`	`+`
`63`	`68`	`}`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,6 @@`
	`1`	`+<?php declare(strict_types=1);`
	`2`	`+`
	`3`	`+namespace BugSpaceship;`
	`4`	`+`
	`5`	`+$arr = range(1, 16);`
	`6`	`+usort($arr, static fn (int $a, int $b): int => $a <=> $b);`

Comments

(0)