Merge pull request #10039 from nicelocal/non_falsy_string_literal

Fix combination of non-falsy-string and falsy literal
vimeo · Jul 29, 2023 · 80ddbd3 · 80ddbd3
2 parents 7e4a6f5 + 63347e7
commit 80ddbd3
Show file tree

Hide file tree

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

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"',
+                ],
+            ],
         ];
     }