Merge pull request #9339 from edsrzf/is-numeric-negated

vimeo · Feb 19, 2023 · d934875 · d934875
2 parents 863f15a + 38cc316
commit d934875
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleNegatedAssertionReconciler.php
@@ -1292,6 +1292,10 @@ private static function reconcileNumeric(
             } elseif ($type instanceof TArrayKey) {
                 $redundant = false;
                 $non_numeric_types[] = new TString();
+            } elseif ($type instanceof TScalar) {
+                $redundant = false;
+                $non_numeric_types[] = new TString();
+                $non_numeric_types[] = new TBool();
             } elseif (!$type->isNumericType()) {
                 $non_numeric_types[] = $type;
             } else {

diff --git a/tests/TypeReconciliation/ConditionalTest.php b/tests/TypeReconciliation/ConditionalTest.php
@@ -197,6 +197,20 @@ function foo ($a) {
                     '$a' => 'string',
                 ],
             ],
+            'typeRefinementonWithNegatedIsNumeric' => [
+                'code' => '<?php
+                    /**
+                     * @param scalar $v
+                     * @return bool|string
+                     */
+                    function toString($v)
+                    {
+                        if (is_numeric($v)) {
+                            return false;
+                        }
+                        return $v;
+                    }',
+            ],
             'typeRefinementWithStringOrTrue' => [
                 'code' => '<?php
                     $a = rand(0, 5) > 4 ? "hello" : true;