Merge pull request #9466 from weirdan/unary-minus-overflow

vimeo · Mar 7, 2023 · 222887a · 222887a
2 parents c82191b + 193a0db
commit 222887a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/UnaryPlusMinusAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/UnaryPlusMinusAnalyzer.php
@@ -20,6 +20,8 @@
 use Psalm\Type\Union;
 use RuntimeException;
 
+use function is_int;
+
 /**
  * @internal
  */
@@ -51,7 +53,9 @@ public static function analyze(
                         continue;
                     }
                     if ($type_part instanceof TLiteralInt) {
-                        $type_part = new TLiteralInt(-$type_part->value);
+                        /** @var int|float $value */
+                        $value = -$type_part->value;
+                        $type_part = is_int($value) ? new TLiteralInt($value) : new TLiteralFloat($value);
                     } elseif ($type_part instanceof TLiteralFloat) {
                         $type_part = new TLiteralFloat(-$type_part->value);
                     } elseif ($type_part instanceof TIntRange) {

diff --git a/tests/BinaryOperationTest.php b/tests/BinaryOperationTest.php
@@ -1013,6 +1013,15 @@ function toPositiveInt(int $i): int
                     '$b===' => 'non-falsy-string',
                 ],
             ],
+            'unaryMinusOverflows' => [
+                'code' => <<<'PHP'
+                    <?php
+                    $a = -(1 << 63);
+                    PHP,
+                'assertions' => [
+                    '$a===' => 'float(9.2233720368548E+18)',
+                ],
+            ],
         ];
     }