Merge pull request #9903 from ygottschalk/fix/9827-union-empty-array-…

…and-false Fixes #9827
vimeo · Jun 15, 2023 · eb64a47 · eb64a47
2 parents 70795bc + d11bb90
commit eb64a47
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/TypeCombiner.php b/src/Psalm/Internal/Type/TypeCombiner.php
@@ -130,7 +130,9 @@ public static function combine(
         if (count($combination->value_types) === 1
             && !count($combination->objectlike_entries)
             && (!$combination->array_type_params
-                || $combination->array_type_params[1]->isNever()
+                || ( $overwrite_empty_array
+                    && $combination->array_type_params[1]->isNever()
+                )
             )
             && !$combination->builtin_type_params
             && !$combination->object_type_params

diff --git a/tests/TypeCombinationTest.php b/tests/TypeCombinationTest.php
@@ -338,6 +338,28 @@ public function providerTestValidTypeCombination(): array
                     'ArrayObject<int, string>',
                 ],
             ],
+            'emptyArrayAndFalse' => [
+                'array<never, never>|false',
+                [
+                    'array<never, never>',
+                    'false',
+                ],
+            ],
+            'emptyArrayAndTrue' => [
+                'array<never, never>|true',
+                [
+                    'array<never, never>',
+                    'true',
+                ],
+            ],
+            'emptyArrayWithTrueAndFalse' => [
+                'array<never, never>|bool',
+                [
+                    'array<never, never>',
+                    'true',
+                    'false',
+                ],
+            ],
             'falseDestruction' => [
                 'bool',
                 [