Merge pull request #9787 from robchett/remove_non-empty-list_status_w…

…hen_combining_with_empty Incorrectly asserting non-empty-list after combining with empty list
vimeo · Nov 3, 2023 · b9c82d3 · b9c82d3
2 parents 65f7d7f + 6044cc7
commit b9c82d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/TypeCombiner.php b/src/Psalm/Internal/Type/TypeCombiner.php
@@ -1516,7 +1516,7 @@ private static function getArrayTypeFromGenericParams(
                     $generic_type_params[1],
                     $objectlike_generic_type,
                     $codebase,
-                    $overwrite_empty_array,
+                    false,
                     $allow_mixed_union,
                 );
             }

diff --git a/tests/ArrayAssignmentTest.php b/tests/ArrayAssignmentTest.php
@@ -2048,6 +2048,15 @@ function getQueryParams(): array
                         return $queryParams;
                     }',
             ],
+            'AssignListToNonEmptyList' => [
+                'code' => '<?php
+                    /** @var array<int, non-empty-list<string>> $l*/
+                    $l = [];
+                    $l[] = [];',
+                'assertions' => [
+                    '$l===' => 'non-empty-array<int, list<string>>',
+                ],
+            ],
         ];
     }