From 8dc819a8359c3856dc1d88c4f5a77b09ec39cfc9 Mon Sep 17 00:00:00 2001 From: phpstan-bot <79867460+phpstan-bot@users.noreply.github.com> Date: Wed, 18 Nov 2026 00:21:26 +0000 Subject: [PATCH 1/2] Convert `int` and `decimal-int-string` to a finite float range in `toFloat()` and float arithmetic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - IntegerType::toFloat() returns float<(float) PHP_INT_MIN, (float) PHP_INT_MAX> instead of float, like IntegerRangeType::toFloat() already did for bounded ranges. This covers (float), floatval()/doubleval(), settype($x, 'float'|'double'), filter_var(FILTER_VALIDATE_FLOAT), round()/floor()/ceil() and the non-strict coerced argument type. - AccessoryDecimalIntegerStringType::toFloat() returns the same range when not inverted (a decimal-int-string always holds an int); the inverse still gives float. - NumberSet::integerToFloatInterval() bounds an unbounded integer side at the float closest to PHP_INT_MIN/PHP_INT_MAX instead of ±INF, so `$int + 0.0`, `$int * 1.0`, `$int / 2`, `$int += 0.0`, … are finite float ranges too, and int<0, max> + 0.0 no longer reaches INF. - Ported all three changes to the turbo-ext mirrors (IntegerType.cpp, AccessoryDecimalIntegerStringType.cpp, NumberSet.cpp). - Updated existing type assertions that now get more precise (finite bounds instead of `min`/`max`, `float` or ranges touching 0 for int divisors). - Probed but left alone: numeric-string/string casts (can be INF, e.g. "1e999"), fdiv() (has no range inference at all). Co-Authored-By: Claude Opus 5.5 --- .../AccessoryDecimalIntegerStringType.php | 7 ++- src/Type/IntegerType.php | 5 +- src/Type/NumberSet.php | 6 +- tests/PHPStan/Analyser/nsrt/binary.php | 12 ++-- tests/PHPStan/Analyser/nsrt/bug-12393.php | 4 +- tests/PHPStan/Analyser/nsrt/bug-12393b.php | 4 +- tests/PHPStan/Analyser/nsrt/bug-15767.php | 57 +++++++++++++++++++ tests/PHPStan/Analyser/nsrt/bug-9724.php | 2 +- .../nsrt/division-by-possible-zero.php | 16 +++--- tests/PHPStan/Analyser/nsrt/filter-var.php | 2 +- .../Analyser/nsrt/float-range-arithmetic.php | 4 +- .../Analyser/nsrt/float-range-functions.php | 4 +- .../Analyser/nsrt/float-range-narrowing.php | 2 +- .../Analyser/nsrt/integer-range-types.php | 20 +++---- tests/PHPStan/Analyser/nsrt/math.php | 8 +-- .../Analyser/nsrt/node-callback-scope.php | 6 +- .../nsrt/set-type-type-specifying.php | 4 +- tests/PHPStan/Analyser/nsrt/strval.php | 6 +- .../nsrt/weird-array_key_exists-issue.php | 4 +- .../Rules/Functions/ReturnTypeRuleTest.php | 12 ++++ .../Rules/Functions/data/bug-15767.php | 35 ++++++++++++ .../src/AccessoryDecimalIntegerStringType.cpp | 11 +++- turbo-ext/src/IntegerType.cpp | 4 +- turbo-ext/src/NumberSet.cpp | 4 +- 24 files changed, 178 insertions(+), 61 deletions(-) create mode 100644 tests/PHPStan/Analyser/nsrt/bug-15767.php create mode 100644 tests/PHPStan/Rules/Functions/data/bug-15767.php diff --git a/src/Type/Accessory/AccessoryDecimalIntegerStringType.php b/src/Type/Accessory/AccessoryDecimalIntegerStringType.php index b1c29178ca5..574e8e2ed7f 100644 --- a/src/Type/Accessory/AccessoryDecimalIntegerStringType.php +++ b/src/Type/Accessory/AccessoryDecimalIntegerStringType.php @@ -261,9 +261,14 @@ public function toInteger(): Type return new IntegerType(); } + /** A decimal integer string holds an int, which converts to a finite float. */ public function toFloat(): Type { - return new FloatType(); + if ($this->inverse) { + return new FloatType(); + } + + return (new IntegerType())->toFloat(); } public function toString(): Type diff --git a/src/Type/IntegerType.php b/src/Type/IntegerType.php index 97c4f08d09f..6855b3874a1 100644 --- a/src/Type/IntegerType.php +++ b/src/Type/IntegerType.php @@ -22,6 +22,8 @@ use PHPStan\Type\Traits\OperatorTypeTrait; use PHPStan\Type\Traits\UndecidedBooleanTypeTrait; use PHPStan\Type\Traits\UndecidedComparisonTypeTrait; +use const PHP_INT_MAX; +use const PHP_INT_MIN; /** @api */ #[ShadowedByTurboExtension(implementation: __DIR__ . '/../../turbo-ext/src/IntegerType.cpp')] @@ -76,9 +78,10 @@ public function toAbsoluteNumber(): Type return IntegerRangeType::createAllGreaterThanOrEqualTo(0); } + /** An int converts to the float closest to it, which is never INF, -INF or NAN. */ public function toFloat(): Type { - return new FloatType(); + return FloatRangeType::fromInterval((float) PHP_INT_MIN, (float) PHP_INT_MAX); } public function toInteger(): Type diff --git a/src/Type/NumberSet.php b/src/Type/NumberSet.php index 15cac0a9686..30aa5838313 100644 --- a/src/Type/NumberSet.php +++ b/src/Type/NumberSet.php @@ -449,8 +449,8 @@ private function toHull(): self } /** - * The floats an integer interval stands for. An unbounded side reaches the - * infinity on that side, which the integer never is. + * The floats an integer interval stands for. An unbounded side ends at the + * float closest to PHP_INT_MIN or PHP_INT_MAX: an int is never infinite. * * @param array{int|null, int|null} $interval * @return array{float, float, bool} [min, max, whether an infinite bound is a value] @@ -459,7 +459,7 @@ private static function integerToFloatInterval(array $interval): array { [$min, $max] = $interval; - return [$min === null ? -INF : (float) $min, $max === null ? INF : (float) $max, false]; + return [(float) ($min ?? PHP_INT_MIN), (float) ($max ?? PHP_INT_MAX), false]; } /** diff --git a/tests/PHPStan/Analyser/nsrt/binary.php b/tests/PHPStan/Analyser/nsrt/binary.php index d1d7f29ffac..a8ca971c678 100644 --- a/tests/PHPStan/Analyser/nsrt/binary.php +++ b/tests/PHPStan/Analyser/nsrt/binary.php @@ -285,7 +285,7 @@ public function doFoo(array $generalArray) assertType('1', 1 * 1); assertType('1', 1 ** 1); assertType('0', 1 % 1); - assertType('(float|int)', $integer1 /= 2); + assertType('(float<-4.611686018427388E+18, 4.611686018427388E+18>|int)', $integer1 /= 2); assertType('int', $integer2 *= 1); assertType('2.5999999999999996', 1.2 + 1.4); assertType('-0.19999999999999996', 1.2 - 1.4); @@ -301,10 +301,10 @@ public function doFoo(array $generalArray) assertType('1.4', 1 * 1.4); assertType('1.0', 1 ** 1.4); assertType('1', 3 % 2.4); - assertType('float', $integer3 /= 2.4); - assertType('float', $integer4 *= 2.4); + assertType('float<-3.8430716820228234E+18, 3.8430716820228234E+18>', $integer3 /= 2.4); + assertType('float<-2.213609288845146E+19, 2.213609288845146E+19>', $integer4 *= 2.4); assertType('int', $otherInteger + 1); - assertType('float', $otherInteger + 1.0); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $otherInteger + 1.0); assertType('2.2', 1.2 + 1); assertType('0.19999999999999996', 1.2 - 1); assertType('0.6', 1.2 / 2); @@ -459,8 +459,8 @@ public function doFoo(array $generalArray) assertType('int<0, max>', count($appendingToArrayInBranches)); assertType('3|5', count($conditionalArray)); assertType('2', $array[1]); - assertType('(float|int)', $integer / $integer); - assertType('(float|int)', $otherInteger / $integer); + assertType('(float<-9.223372036854776E+18, 9.223372036854776E+18>|int)', $integer / $integer); + assertType('(float<-9.223372036854776E+18, 9.223372036854776E+18>|int)', $otherInteger / $integer); assertType('(array|float|int)', $mixed + $mixed); assertType('(float|int)', $mixed - $mixed); assertType('array', $mixed + []); diff --git a/tests/PHPStan/Analyser/nsrt/bug-12393.php b/tests/PHPStan/Analyser/nsrt/bug-12393.php index 813dc3b7b46..c13a4489088 100644 --- a/tests/PHPStan/Analyser/nsrt/bug-12393.php +++ b/tests/PHPStan/Analyser/nsrt/bug-12393.php @@ -37,7 +37,7 @@ public function doFoo(array $plugin){ public function doBar(int $i){ $this->float = $i; - assertType('float', $this->float); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $this->float); } public function doBaz(int $i){ @@ -89,7 +89,7 @@ public function doFoo(array $plugin){ public function doBar(int $i){ self::$float = $i; - assertType('float', self::$float); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', self::$float); } public function doBaz(int $i){ diff --git a/tests/PHPStan/Analyser/nsrt/bug-12393b.php b/tests/PHPStan/Analyser/nsrt/bug-12393b.php index 06e4f99a01f..4ba88067b2e 100644 --- a/tests/PHPStan/Analyser/nsrt/bug-12393b.php +++ b/tests/PHPStan/Analyser/nsrt/bug-12393b.php @@ -39,7 +39,7 @@ public function doFoo(array $plugin){ public function doBar(int $i){ $this->float = $i; - assertType('float', $this->float); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $this->float); } public function doBaz(int $i){ @@ -91,7 +91,7 @@ public function doFoo(array $plugin){ public function doBar(int $i){ self::$float = $i; - assertType('float', self::$float); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', self::$float); } public function doBaz(int $i){ diff --git a/tests/PHPStan/Analyser/nsrt/bug-15767.php b/tests/PHPStan/Analyser/nsrt/bug-15767.php new file mode 100644 index 00000000000..8c89e0c49ad --- /dev/null +++ b/tests/PHPStan/Analyser/nsrt/bug-15767.php @@ -0,0 +1,57 @@ +', (float) $x); + return (float) $x; +} + +/** + * @param decimal-int-string $x + * @return finite-float + */ +function decimal_int_string_to_float(string $x): float { + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', (float) $x); + return (float) $x; +} + +/** + * @param decimal-int-string $d + * @param non-decimal-int-string $nd + * @param int<0, max> $nonNegative + */ +function alternatives(int $x, string $d, string $nd, int $nonNegative): void +{ + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', floatval($x)); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', doubleval($d)); + assertType('float', (float) $nd); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $x + 0.0); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', 0.0 + $x); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $x * 1.0); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $x - 0.0); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $x / 1.0); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $d + 0.0); + assertType('float<0.0, 9.223372036854776E+18>', $nonNegative + 0.0); + assertType('float<-1.8446744073709552E+19, 1.8446744073709552E+19>', $x * 2.0); + assertType('float', $x * 1e300); + assertType('(float<-4.611686018427388E+18, 4.611686018427388E+18>|int)', $x / 2); + + $y = $x; + $y += 0.0; + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $y); + + $y = $x; + settype($y, 'float'); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $y); + + $y = $d; + settype($y, 'double'); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $y); + + assertType('true', is_finite((float) $x)); + assertType('false', is_nan($x + 0.0)); +} diff --git a/tests/PHPStan/Analyser/nsrt/bug-9724.php b/tests/PHPStan/Analyser/nsrt/bug-9724.php index 91187d422da..ef233b3e17d 100644 --- a/tests/PHPStan/Analyser/nsrt/bug-9724.php +++ b/tests/PHPStan/Analyser/nsrt/bug-9724.php @@ -28,7 +28,7 @@ public function thisDoesntWork(?int $limit, int $offset = 0): void public function withRange(int $limit, int $offset, int $offsetRange): void { if ($limit) { - assertType('(float|int)', $offset / $limit); + assertType('(float<-9.223372036854776E+18, 9.223372036854776E+18>|int)', $offset / $limit); assertType('float<-2.0, 2.0>|int<-2, 2>', $offsetRange / $limit); } } diff --git a/tests/PHPStan/Analyser/nsrt/division-by-possible-zero.php b/tests/PHPStan/Analyser/nsrt/division-by-possible-zero.php index 9b985c5567c..c00e561e100 100644 --- a/tests/PHPStan/Analyser/nsrt/division-by-possible-zero.php +++ b/tests/PHPStan/Analyser/nsrt/division-by-possible-zero.php @@ -19,13 +19,13 @@ */ function doFoo(int $range1, int $range2, int $int, int $r1, int $i, int $rMin, int $a, int $b, int $p, int $u): void { - assertType('float<0.0, 5.0>|int<1, 5>', 5 / $range1); - assertType('float<-5.0, 0.0>|int<-5, -1>', 5 / $range2); - assertType('float|int', $range1 / $range2); - assertType('(float<-5.0, 5.0>|int<-5, -1>|int<1, 5>)', 5 / $int); - assertType('(float<-10.0, 10.0>|int<-10, -1>|int<1, 10>)', $r1 / $i); - assertType('float<-10.0, 0.0>|float<0.2, 10.0>|int<-10, -1>|int<1, 10>', $r1 / $rMin); - assertType('float<0.0, max>|int<0, max>', $a / $b); - assertType('-1|1|float<-1.0, -0.2>|float<0.0, 1.0>', -1 / $rMin); + assertType('float<5.421010862427522E-19, 5.0>|int<1, 5>', 5 / $range1); + assertType('float<-5.0, -5.421010862427522E-19>|int<-5, -1>', 5 / $range2); + assertType('float<-9.223372036854776E+18, 0.0>|int', $range1 / $range2); + assertType('(float<-5.0, -5.421010862427522E-19>|float<5.421010862427522E-19, 5.0>|int<-5, -1>|int<1, 5>)', 5 / $int); + assertType('(float<-10.0, -1.0842021724855044E-19>|float<1.0842021724855044E-19, 10.0>|int<-10, -1>|int<1, 10>)', $r1 / $i); + assertType('float<-10.0, -1.0842021724855044E-19>|float<0.2, 10.0>|int<-10, -1>|int<1, 10>', $r1 / $rMin); + assertType('float<0.0, 9.223372036854776E+18>|int<0, max>', $a / $b); + assertType('-1|1|float<-1.0, -0.2>|float<1.0842021724855044E-19, 1.0>', -1 / $rMin); assertType('float<-2.0, 2.0>|int<-2, 2>', $p / $u); } diff --git a/tests/PHPStan/Analyser/nsrt/filter-var.php b/tests/PHPStan/Analyser/nsrt/filter-var.php index 94851b08d19..5db056f44bb 100644 --- a/tests/PHPStan/Analyser/nsrt/filter-var.php +++ b/tests/PHPStan/Analyser/nsrt/filter-var.php @@ -124,7 +124,7 @@ public function scalars(bool $bool, float $float, int $int, string $string, int assertType('17.0', filter_var(17.0, FILTER_VALIDATE_FLOAT)); assertType('17.1', filter_var(17.1, FILTER_VALIDATE_FLOAT)); assertType('1.0E-50', filter_var(1e-50, FILTER_VALIDATE_FLOAT)); - assertType('float', filter_var($int, FILTER_VALIDATE_FLOAT)); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', filter_var($int, FILTER_VALIDATE_FLOAT)); assertType('float<0.0, 9.0>', filter_var($intRange, FILTER_VALIDATE_FLOAT)); assertType('17.0', filter_var(17, FILTER_VALIDATE_FLOAT)); assertType('float|false', filter_var($string, FILTER_VALIDATE_FLOAT)); diff --git a/tests/PHPStan/Analyser/nsrt/float-range-arithmetic.php b/tests/PHPStan/Analyser/nsrt/float-range-arithmetic.php index b3b0272507e..bb54774eac1 100644 --- a/tests/PHPStan/Analyser/nsrt/float-range-arithmetic.php +++ b/tests/PHPStan/Analyser/nsrt/float-range-arithmetic.php @@ -24,8 +24,8 @@ public function doFoo(float $a, float $b, float $p, float $nn, float $fin, int $ assertType('float<-6.0, 8.0>', $a * $b); assertType('float<-3.0, 4.0>', $b * 1); - // a non-int bounded operand stays unbounded on that side - assertType('float', $a + $int); + // an int operand ends at the floats closest to PHP_INT_MIN and PHP_INT_MAX + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $a + $int); assertType('float', $a + $f); // overflow reaches the infinities diff --git a/tests/PHPStan/Analyser/nsrt/float-range-functions.php b/tests/PHPStan/Analyser/nsrt/float-range-functions.php index 566a04a94cd..e3ff000e9e6 100644 --- a/tests/PHPStan/Analyser/nsrt/float-range-functions.php +++ b/tests/PHPStan/Analyser/nsrt/float-range-functions.php @@ -78,8 +78,8 @@ public function producers(array $list): void assertType('float<0.0, max>', microtime(true)); // https://github.com/phpstan/phpstan/issues/6963 - assertType('float<0.0, max>|int<0, max>', count($list) / 4); - assertType('float<0.0, max>', ceil(count($list) / 4)); + assertType('float<0.0, 2.305843009213694E+18>|int<0, max>', count($list) / 4); + assertType('float<0.0, 9.223372036854776E+18>', ceil(count($list) / 4)); } } diff --git a/tests/PHPStan/Analyser/nsrt/float-range-narrowing.php b/tests/PHPStan/Analyser/nsrt/float-range-narrowing.php index a0bac178dfe..a49964db674 100644 --- a/tests/PHPStan/Analyser/nsrt/float-range-narrowing.php +++ b/tests/PHPStan/Analyser/nsrt/float-range-narrowing.php @@ -103,7 +103,7 @@ function casts(int $oneToFive, int $nonNegative, int $upToMinusThree, int $int): assertType('float<1.0, 5.0>', (float) $oneToFive); assertType('float<0.0, 9.223372036854776E+18>', (float) $nonNegative); assertType('float<-9.223372036854776E+18, -3.0>', floatval($upToMinusThree)); - assertType('float', (float) $int); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', (float) $int); } /** diff --git a/tests/PHPStan/Analyser/nsrt/integer-range-types.php b/tests/PHPStan/Analyser/nsrt/integer-range-types.php index 67b478d5297..44bcf3b6476 100644 --- a/tests/PHPStan/Analyser/nsrt/integer-range-types.php +++ b/tests/PHPStan/Analyser/nsrt/integer-range-types.php @@ -238,11 +238,11 @@ public function math($i, $j, $z, $pi, $r1, $r2, $r3, $rMin, $rMax, $x, $y) { assertType('int<2, max>', $pi + 1); assertType('int<-1, max>', $pi - 2); assertType('int<2, max>', $pi * 2); - assertType('float<0.5, max>|int<1, max>', $pi / 2); + assertType('float<0.5, 4.611686018427388E+18>|int<1, max>', $pi / 2); assertType('int<2, max>', 1 + $pi); assertType('int', 2 - $pi); assertType('int<2, max>', 2 * $pi); - assertType('float<0.0, 2.0>|int<1, 2>', 2 / $pi); + assertType('float<2.168404344971009E-19, 2.0>|int<1, 2>', 2 / $pi); assertType('int<5, 14>', $r1 + 4); assertType('int<-3, 6>', $r1 - 4); @@ -251,7 +251,7 @@ public function math($i, $j, $z, $pi, $r1, $r2, $r3, $rMin, $rMax, $x, $y) { assertType('int<9, max>', $rMax + 4); assertType('int<1, max>', $rMax - 4); assertType('int<20, max>', $rMax * 4); - assertType('float<1.25, max>|int<2, max>', $rMax / 4); + assertType('float<1.25, 2.305843009213694E+18>|int<2, max>', $rMax / 4); assertType('int<6, 20>', $r1 + $r2); assertType('int<-9, 5>', $r1 - $r2); @@ -266,21 +266,21 @@ public function math($i, $j, $z, $pi, $r1, $r2, $r3, $rMin, $rMax, $x, $y) { assertType('int', $rMin + $r1); assertType('int', $rMin - $r1); assertType('int', $rMin * $r1); - assertType('float|int', $rMin / $r1); + assertType('float<-9.223372036854776E+18, 5.0>|int', $rMin / $r1); assertType('int<6, max>', $r1 + $rMax); assertType('int', $r1 - $rMax); assertType('int<5, max>', $r1 * $rMax); - assertType('float<0.0, 2.0>|int<1, 2>', $r1 / $rMax); + assertType('float<1.0842021724855044E-19, 2.0>|int<1, 2>', $r1 / $rMax); assertType('int<6, max>', $rMax + $r1); assertType('int<-5, max>', $rMax - $r1); assertType('int<5, max>', $rMax * $r1); - assertType('float<0.5, max>|int<1, max>', $rMax / $r1); + assertType('float<0.5, 9.223372036854776E+18>|int<1, max>', $rMax / $r1); assertType('5|10|15|20|30', $x / $y); - assertType('float<0.0, max>|int<1, max>', $rMax / $rMax); - assertType('(float|int)', $rMin / $rMin); + assertType('float<5.421010862427522E-19, 1.8446744073709553E+18>|int<1, max>', $rMax / $rMax); + assertType('(float<-9.223372036854776E+18, 9.223372036854776E+18>|int)', $rMin / $rMin); } /** @@ -308,10 +308,10 @@ public function maximaInversion($rMin, $rMax) { assertType('int<-5, max>', $rMin * -1); assertType('int', $rMax * -2); - assertType('float<-0.4, 0.0>', -2 / $rMax); + assertType('float<-0.4, -2.168404344971009E-19>', -2 / $rMax); assertType('int<-5, max>', $rMin / -1); - assertType('float|int', $rMax / -2); + assertType('float<-4.611686018427388E+18, -2.5>|int', $rMax / -2); } /** diff --git a/tests/PHPStan/Analyser/nsrt/math.php b/tests/PHPStan/Analyser/nsrt/math.php index 98d34d3d55b..378e34024b4 100644 --- a/tests/PHPStan/Analyser/nsrt/math.php +++ b/tests/PHPStan/Analyser/nsrt/math.php @@ -81,9 +81,9 @@ public function doIpsum(int $newLevel): void $min = min(30, $newLevel); assertType('int', $min); $minDivFive = $min / 5; - assertType('float|int', $minDivFive); + assertType('float<-1.8446744073709553E+18, 6.0>|int', $minDivFive); $volume = 0x10000000 * $minDivFive; - assertType('float|int', $volume); + assertType('float<-4.9517601571415214E+26, 1610612736.0>|int', $volume); } public function doDolor(int $i): void @@ -91,8 +91,8 @@ public function doDolor(int $i): void $chunks = min(200, $i); assertType('int', $chunks); $divThirty = $chunks / 30; - assertType('float|int', $divThirty); - assertType('float|int', $divThirty + 3); + assertType('float<-3.0744573456182586E+17, 6.666666666666667>|int', $divThirty); + assertType('float<-3.0744573456182586E+17, 9.666666666666668>|int', $divThirty + 3); } public function doSit(int $i, int $j): void diff --git a/tests/PHPStan/Analyser/nsrt/node-callback-scope.php b/tests/PHPStan/Analyser/nsrt/node-callback-scope.php index bcd93e475ce..3a32b138528 100644 --- a/tests/PHPStan/Analyser/nsrt/node-callback-scope.php +++ b/tests/PHPStan/Analyser/nsrt/node-callback-scope.php @@ -46,12 +46,12 @@ public function doPlus($a, $b, int $c, int $d): void */ public function doDiv($a, $b, int $c, int $d): void { - assertType('(float|int)', $a / $b); + assertType('(float<-9.223372036854776E+18, 9.223372036854776E+18>|int)', $a / $b); assertNativeType('(float|int)', $a / $b); assertType('1', 1 / 1); assertNativeType('1', 1 / 1); - assertType('(float|int)', $c / $d); - assertNativeType('(float|int)', $c / $d); + assertType('(float<-9.223372036854776E+18, 9.223372036854776E+18>|int)', $c / $d); + assertNativeType('(float<-9.223372036854776E+18, 9.223372036854776E+18>|int)', $c / $d); assertType('*ERROR*', $c / 0); // DivisionByZeroError } diff --git a/tests/PHPStan/Analyser/nsrt/set-type-type-specifying.php b/tests/PHPStan/Analyser/nsrt/set-type-type-specifying.php index a6de24b7546..7ae0b7e813c 100644 --- a/tests/PHPStan/Analyser/nsrt/set-type-type-specifying.php +++ b/tests/PHPStan/Analyser/nsrt/set-type-type-specifying.php @@ -65,7 +65,7 @@ function doFloat(string $s, int $i, float $f, array $a, object $o) assertType('float', $s); settype($i, 'float'); - assertType('float', $i); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $i); settype($f, 'float'); assertType('float', $f); @@ -83,7 +83,7 @@ function doDouble(string $s, int $i, float $f, array $a, object $o) assertType('float', $s); settype($i, 'double'); - assertType('float', $i); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', $i); settype($f, 'double'); assertType('float', $f); diff --git a/tests/PHPStan/Analyser/nsrt/strval.php b/tests/PHPStan/Analyser/nsrt/strval.php index 847e106ab18..507f087cdc8 100644 --- a/tests/PHPStan/Analyser/nsrt/strval.php +++ b/tests/PHPStan/Analyser/nsrt/strval.php @@ -18,7 +18,7 @@ function strvalTest(string $string, string $class): void assertType('\'\'|\'1\'', strval(rand(0, 1) === 0)); assertType('\'42\'', strval(42)); assertType('decimal-int-string', strval(rand())); - assertType('non-empty-string&uppercase-string', strval(rand() * 0.1)); + assertType('numeric-string&uppercase-string', strval(rand() * 0.1)); assertType('decimal-int-string', strval(strval(rand()))); assertType('class-string', strval($class)); assertType('string', strval(new \Exception())); @@ -40,7 +40,7 @@ function intvalTest(string $string): void assertType('0|1', intval(rand(0, 1) === 0)); assertType('42', intval(42)); assertType('int<0, max>', intval(rand())); - assertType('int', intval(rand() * 0.1)); + assertType('int<0, 922337203685477632>', intval(rand() * 0.1)); assertType('0', intval([])); assertType('1', intval([null])); assertType('int', intval(new \stdClass())); @@ -60,7 +60,7 @@ function floatvalTest(string $string): void assertType('0.0|1.0', floatval(rand(0, 1) === 0)); assertType('42.0', floatval(42)); assertType('float<0.0, 9.223372036854776E+18>', floatval(rand())); - assertType('float<0.0, max>', floatval(rand() * 0.1)); + assertType('float<0.0, 9.223372036854776E+17>', floatval(rand() * 0.1)); assertType('0.0', floatval([])); assertType('1.0', floatval([null])); assertType('float', floatval(new \stdClass())); diff --git a/tests/PHPStan/Analyser/nsrt/weird-array_key_exists-issue.php b/tests/PHPStan/Analyser/nsrt/weird-array_key_exists-issue.php index b8d7f026ae9..63c9eaf2c11 100644 --- a/tests/PHPStan/Analyser/nsrt/weird-array_key_exists-issue.php +++ b/tests/PHPStan/Analyser/nsrt/weird-array_key_exists-issue.php @@ -31,7 +31,7 @@ public function doFoo(array $data): array } else { $key = 'Ostatní'; assertType('bool', array_key_exists($key, $otherData)); - assertType('array<\'Ostatní\', array{abs: int, rel: (float|int)}>', $otherData); + assertType('array<\'Ostatní\', array{abs: int, rel: (float<-9.223372036854776E+20, 9.223372036854776E+20>|int)}>', $otherData); if (!array_key_exists($key, $otherData)) { $otherData[$key] = [ 'abs' => 0, @@ -41,7 +41,7 @@ public function doFoo(array $data): array } $otherData[$key]['abs'] += $count; $otherData[$key]['rel'] += $count / $total * 100; - assertType('array{Ostatní: array{abs: int, rel: (float|int)}}', $otherData); + assertType('array{Ostatní: array{abs: int, rel: (float<-1.8446744073709552E+21, 1.8446744073709552E+21>|int)}}', $otherData); } $i++; } diff --git a/tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php b/tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php index 55f68eca67d..34cf5edcccf 100644 --- a/tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php +++ b/tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php @@ -605,4 +605,16 @@ public function testBug15714(): void ]); } + public function testBug15767(): void + { + $this->checkNullables = true; + $this->checkExplicitMixed = true; + $this->analyse([__DIR__ . '/data/bug-15767.php'], [ + [ + 'Function Bug15767ReturnType\\non_decimal_int_string_to_float() should return float<-1.7976931348623157E+308, 1.7976931348623157E+308> but returns float.', + 34, + ], + ]); + } + } diff --git a/tests/PHPStan/Rules/Functions/data/bug-15767.php b/tests/PHPStan/Rules/Functions/data/bug-15767.php new file mode 100644 index 00000000000..f07db1a5885 --- /dev/null +++ b/tests/PHPStan/Rules/Functions/data/bug-15767.php @@ -0,0 +1,35 @@ +(); } - /* new FloatType() */ - static zv::Val toFloat() + /* new FloatType() when inverted, (new IntegerType())->toFloat() otherwise: + * FloatRangeType::fromInterval((float) PHP_INT_MIN, (float) PHP_INT_MAX); + * UNDEF = pending exception */ + zv::Val toFloat() const { - return pt_val_of(); + bool inverse = false; + if (UNEXPECTED(!this->inverse(inverse))) return zv::Val(); + if (inverse) return pt_val_of(); + return pt_float_range_from_interval((double) ZEND_LONG_MIN, (double) ZEND_LONG_MAX); } /* new ConstantArrayType([new ConstantIntegerType(0)], [$this], [1], isList: TrinaryLogic::createYes()) */ diff --git a/turbo-ext/src/IntegerType.cpp b/turbo-ext/src/IntegerType.cpp index d239aae2c99..a0fe93fe0bf 100644 --- a/turbo-ext/src/IntegerType.cpp +++ b/turbo-ext/src/IntegerType.cpp @@ -52,10 +52,10 @@ class IntegerType return pt_integer_range_create_all_greater_than_or_equal_to(&zero); } - /* new FloatType() — the shadowing class */ + /* FloatRangeType::fromInterval((float) PHP_INT_MIN, (float) PHP_INT_MAX) */ static zv::Val toFloat() { - return pt_val_of(); + return pt_float_range_from_interval((double) ZEND_LONG_MIN, (double) ZEND_LONG_MAX); } /* $this */ diff --git a/turbo-ext/src/NumberSet.cpp b/turbo-ext/src/NumberSet.cpp index 2565b3d7f6d..c67c6abc180 100644 --- a/turbo-ext/src/NumberSet.cpp +++ b/turbo-ext/src/NumberSet.cpp @@ -339,8 +339,8 @@ class NumberSetMath static FloatBounds integerToFloatInterval(const NumberSetData::IntegerInterval &interval) { return { - interval.min.isNull ? -HUGE_VAL : static_cast(interval.min.value), - interval.max.isNull ? HUGE_VAL : static_cast(interval.max.value), + static_cast(interval.min.isNull ? ZEND_LONG_MIN : interval.min.value), + static_cast(interval.max.isNull ? ZEND_LONG_MAX : interval.max.value), false, }; } From 56235b6dc0921d12b477609b0e82c0de1d229ee4 Mon Sep 17 00:00:00 2001 From: phpstan-bot Date: Wed, 18 Nov 2026 06:28:36 +0000 Subject: [PATCH 2/2] Test int range, bool and union conversions to finite float Co-Authored-By: Claude Opus 5.5 --- tests/PHPStan/Analyser/nsrt/bug-15767.php | 32 +++++++++++++++++++ .../Rules/Functions/ReturnTypeRuleTest.php | 4 +++ .../Rules/Functions/data/bug-15767.php | 29 +++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/tests/PHPStan/Analyser/nsrt/bug-15767.php b/tests/PHPStan/Analyser/nsrt/bug-15767.php index 8c89e0c49ad..5f1813546e3 100644 --- a/tests/PHPStan/Analyser/nsrt/bug-15767.php +++ b/tests/PHPStan/Analyser/nsrt/bug-15767.php @@ -55,3 +55,35 @@ function alternatives(int $x, string $d, string $nd, int $nonNegative): void assertType('true', is_finite((float) $x)); assertType('false', is_nan($x + 0.0)); } + +/** + * @param int<0, 10> $range + * @param int<0, max> $nonNegative + * @param int $upToFive + * @param 1|2|3 $constants + * @param int|bool $intOrBool + * @param int|decimal-int-string $intOrDecimal + * @param int|string $intOrString + * @param int|float $intOrFloat + */ +function review(bool $b, $range, $nonNegative, $upToFive, $constants, $intOrBool, $intOrDecimal, $intOrString, $intOrFloat, ?int $nullableInt): void +{ + // int ranges + assertType('float<0.0, 10.0>', (float) $range); + assertType('float<0.0, 9.223372036854776E+18>', (float) $nonNegative); + assertType('float<-9.223372036854776E+18, 5.0>', (float) $upToFive); + assertType('1.0|2.0|3.0', (float) $constants); + assertType('float<0.0, 10.0>', $range + 0.0); + + // bool + assertType('0.0|1.0', (float) $b); + assertType('1.0', (float) true); + + // unions + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', (float) $intOrBool); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', floatval($intOrBool)); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', (float) $intOrDecimal); + assertType('float<-9.223372036854776E+18, 9.223372036854776E+18>', (float) $nullableInt); + assertType('float', (float) $intOrString); // a string can be "1e999" + assertType('float', (float) $intOrFloat); // a float can be INF or NAN +} diff --git a/tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php b/tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php index 34cf5edcccf..b9ca8e73878 100644 --- a/tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php +++ b/tests/PHPStan/Rules/Functions/ReturnTypeRuleTest.php @@ -614,6 +614,10 @@ public function testBug15767(): void 'Function Bug15767ReturnType\\non_decimal_int_string_to_float() should return float<-1.7976931348623157E+308, 1.7976931348623157E+308> but returns float.', 34, ], + [ + 'Function Bug15767ReturnType\\int_or_string_to_float() should return float<-1.7976931348623157E+308, 1.7976931348623157E+308> but returns float.', + 63, + ], ]); } diff --git a/tests/PHPStan/Rules/Functions/data/bug-15767.php b/tests/PHPStan/Rules/Functions/data/bug-15767.php index f07db1a5885..19a0a94f325 100644 --- a/tests/PHPStan/Rules/Functions/data/bug-15767.php +++ b/tests/PHPStan/Rules/Functions/data/bug-15767.php @@ -33,3 +33,32 @@ function int_settype(int $x): float { function non_decimal_int_string_to_float(string $x): float { return (float) $x; } + +/** + * @param int<0, max> $x + * @return finite-float + */ +function int_range_to_float(int $x): float { + return (float) $x; +} + +/** @return finite-float */ +function bool_to_float(bool $x): float { + return (float) $x; +} + +/** + * @param int|bool|decimal-int-string|null $x + * @return finite-float + */ +function union_to_float($x): float { + return (float) $x; +} + +/** + * @param int|string $x + * @return finite-float + */ +function int_or_string_to_float($x): float { + return (float) $x; +}