Merge pull request #10930 from VincentLanglet/literalStringUnion

vimeo · May 5, 2024 · 10956df · 10956df
2 parents 08ea062 + 4b10905
commit 10956df
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/TypeCombiner.php b/src/Psalm/Internal/Type/TypeCombiner.php
@@ -1227,9 +1227,16 @@ private static function scrapeStringProperties(
                     ) {
                         $combination->value_types['string'] = new TNonEmptyString();
                     } elseif (get_class($type) === TNonEmptyNonspecificLiteralString::class
-                        && $combination->value_types['string'] instanceof TNonEmptyString
+                        && (
+                            $combination->value_types['string'] instanceof TNonEmptyString
+                            || $combination->value_types['string'] instanceof TNonspecificLiteralString
+                        )
                     ) {
                         // do nothing
+                    } elseif (get_class($type) === TNonspecificLiteralString::class
+                        && get_class($combination->value_types['string']) === TNonEmptyNonspecificLiteralString::class
+                    ) {
+                        $combination->value_types['string'] = $type;
                     } else {
                         $combination->value_types['string'] = new TString();
                     }

diff --git a/tests/TypeCombinationTest.php b/tests/TypeCombinationTest.php
@@ -947,6 +947,20 @@ public function providerTestValidTypeCombination(): array
                     'class-string<IFoo & IBar>',
                 ],
             ],
+            'unionNonEmptyLiteralStringAndLiteralString' => [
+                'literal-string',
+                [
+                    'non-empty-literal-string',
+                    'literal-string',
+                ],
+            ],
+            'unionLiteralStringAndNonEmptyLiteralString' => [
+                'literal-string',
+                [
+                    'literal-string',
+                    'non-empty-literal-string',
+                ],
+            ],
         ];
     }