Merge pull request #9385 from ygottschalk/fix/9384-wrong-type-from-is…

…-long
vimeo · Feb 23, 2023 · b7646d9 · b7646d9
2 parents e96a929 + f026226
commit b7646d9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php b/src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
@@ -1871,9 +1871,9 @@ private static function getIsAssertion(string $function_name): ?Assertion
                 return new IsType(new Atomic\TString());
             case 'is_int':
             case 'is_integer':
+            case 'is_long':
                 return new IsType(new Atomic\TInt());
             case 'is_float':
-            case 'is_long':
             case 'is_double':
             case 'is_real':
                 return new IsType(new Atomic\TFloat());

diff --git a/tests/TypeReconciliation/TypeTest.php b/tests/TypeReconciliation/TypeTest.php
@@ -1239,6 +1239,32 @@ function foo(array $arr) : void {
                         strlen($s);
                     }',
             ],
+            'testIsIntAndAliasesTypeNarrowing' => [
+                'code' => '<?php
+                    /** @var mixed $a */
+                    $a;
+                    /** @var never $b */
+                    $b;
+                    /** @var never $c */
+                    $c;
+                    /** @var never $d */
+                    $d;
+                    if (is_int($a)) {
+                        $b = $a;
+                    }
+                    if (is_integer($a)) {
+                        $c = $a;
+                    }
+                    if (is_long($a)) {
+                        $d = $a;
+                    }
+                ',
+                'assertions' => [
+                    '$b===' => 'int',
+                    '$c===' => 'int',
+                    '$d===' => 'int',
+                ],
+            ],
             'narrowWithCountToAllowNonTupleKeyedArray' => [
                 'code' => '<?php
                     /**