Merge pull request #9260 from weirdan/fix-crash-with-int-range-overflow

Fixes #9114
vimeo · Feb 10, 2023 · 468cc21 · 468cc21
2 parents a4d593c + 85d4acf
commit 468cc21
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -80,6 +80,7 @@
 use function count;
 use function explode;
 use function get_class;
+use function is_int;
 use function min;
 use function strlen;
 use function strpos;
@@ -2000,7 +2001,7 @@ private static function reconcileIsGreaterThan(
                         $existing_var_type->addType(new TIntRange($assertion_value, $atomic_type->value));
                     }
                 }*/
-            } elseif ($atomic_type instanceof TInt) {
+            } elseif ($atomic_type instanceof TInt && is_int($assertion_value)) {
                 $redundant = false;
                 $existing_var_type->removeType($atomic_type->getKey());
                 $existing_var_type->addType(new TIntRange($assertion_value, null));

diff --git a/tests/IntRangeTest.php b/tests/IntRangeTest.php
@@ -1017,6 +1017,19 @@ function bar(int $_a, int $_b): void {}
                     }
                 ',
             ],
+            'rangeOverflow' => [
+                'code' => '<?php
+                    $i = (int)ceil(1);
+                    if ($i <= 9223372036854775807) {
+                        $z = $i;
+                    } else {
+                        $z = null;
+                    }
+                ',
+                'assertions' => [
+                    '$z' => 'int<min, 9223372036854775807>|null',
+                ],
+            ],
         ];
     }