Merge pull request #9953 from boesing/bugfix/issue-9917

`non-empty-list` assertion for iterable
vimeo · Jun 23, 2023 · 81946bb · 81946bb
2 parents 01e2ac7 + f482a5c
commit 81946bb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -2441,7 +2441,9 @@ private static function reconcileList(
 
                 $redundant = false;
             } elseif ($type instanceof TIterable) {
-                $array_types[] = Type::getListAtomic($type->type_params[1]);
+                $array_types[] = $is_non_empty
+                    ? Type::getNonEmptyListAtomic($type->type_params[1])
+                    : Type::getListAtomic($type->type_params[1]);
 
                 $redundant = false;
             } else {

diff --git a/tests/AssertAnnotationTest.php b/tests/AssertAnnotationTest.php
@@ -2853,6 +2853,26 @@ function takesAnArrayB($arg) {}
                         takesAnArrayB($foo);
                     }',
             ],
+            'iterableToNonEmptyList' => [
+                'code' => '<?php
+                final class WhateverAssert
+                {
+                    /**
+                     * @param mixed $value
+                     * @psalm-assert non-empty-list $value
+                     */
+                    public static function doAssert($value): void
+                    {}
+                }
+
+                /** @var iterable<mixed,string> $iterable */
+                $iterable = [];
+
+                WhateverAssert::doAssert($iterable);',
+                'assertions' => [
+                    '$iterable===' => 'non-empty-list<string>',
+                ],
+            ],
         ];
     }