Fix combination of non-falsy-string and falsy literal

vimeo · Jul 24, 2023 · dfbc9dd · dfbc9dd
1 parent 9c814c8
commit dfbc9dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Type/TypeCombiner.php b/src/Psalm/Internal/Type/TypeCombiner.php
@@ -1038,11 +1038,6 @@ private static function scrapeStringProperties(
                     && $type->value
                 ) {
                     // do nothing
-                } elseif (isset($combination->value_types['string'])
-                    && $combination->value_types['string'] instanceof TNonEmptyString
-                    && $type->value !== ''
-                ) {
-                    // do nothing
                 } else {
                     $combination->value_types['string'] = new TString();
                 }

diff --git a/tests/TypeCombinationTest.php b/tests/TypeCombinationTest.php
@@ -860,6 +860,13 @@ public function providerTestValidTypeCombination(): array
                     'non-empty-literal-string',
                 ],
             ],
+            'nonFalsyStringAndFalsyLiteral' => [
+                'string',
+                [
+                    'non-falsy-string',
+                    '"0"',
+                ],
+            ],
         ];
     }