Merge pull request #10459 from kkmuffme/dont-combine-empty-string-wit…

…h-numeric-string dont combine empty string with numeric-string
vimeo · Dec 9, 2023 · 5e221f3 · 5e221f3
2 parents 93c7a8f + 5fccb33
commit 5e221f3
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Type/TypeCombiner.php b/src/Psalm/Internal/Type/TypeCombiner.php
@@ -1080,6 +1080,9 @@ private static function scrapeStringProperties(
 
                         if ($has_only_numeric_strings) {
                             $combination->value_types['string'] = $type;
+                        } elseif (count($combination->strings) === 1 && !$has_only_non_empty_strings) {
+                            $combination->value_types['string'] = $type;
+                            return;
                         } elseif ($has_only_non_empty_strings) {
                             $combination->value_types['string'] = new TNonEmptyString();
                         } else {

diff --git a/tests/TypeCombinationTest.php b/tests/TypeCombinationTest.php
@@ -88,6 +88,38 @@ function expectsTraversableOrArray($_a): void
                     }
                     ',
             ],
+            'emptyStringNumericStringDontCombine' => [
+                'code' => '<?php
+                    /**
+                     * @param numeric-string $arg
+                     * @return void
+                     */
+                    function takesNumeric($arg) {}
+
+                    $b = rand(0, 10);
+                    $a = $b < 5 ? "" : (string) $b;
+                    if ($a !== "") {
+                        takesNumeric($a);
+                    }
+
+                    /** @var ""|numeric-string $c */
+                    if (is_numeric($c)) {
+                        takesNumeric($c);
+                    }',
+            ],
+            'emptyStringNumericStringDontCombineNegation' => [
+                'code' => '<?php
+                    /**
+                     * @param ""|"hello" $arg
+                     * @return void
+                     */
+                    function takesLiteralString($arg) {}
+
+                    /** @var ""|numeric-string $c */
+                    if (!is_numeric($c)) {
+                        takesLiteralString($c);
+                    }',
+            ],
         ];
     }