Merge pull request #7732 from orklah/simplelistinferer

allow SimpleTypeInferer to infer non empty lists
vimeo · Feb 24, 2022 · b09811c · b09811c
2 parents 3a85f49 + 26bfc95
commit b09811c
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/SimpleTypeInferer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/SimpleTypeInferer.php
@@ -26,6 +26,7 @@
 use Psalm\Type\Atomic\TLiteralString;
 use Psalm\Type\Atomic\TMixed;
 use Psalm\Type\Atomic\TNonEmptyArray;
+use Psalm\Type\Atomic\TNonEmptyList;
 use Psalm\Type\Atomic\TNonEmptyString;
 use Psalm\Type\Atomic\TString;
 use Psalm\Type\Union;
@@ -525,6 +526,12 @@ private static function inferArrayType(
             return null;
         }
 
+        if ($array_creation_info->all_list) {
+            return new Union([
+                new TNonEmptyList($item_value_type),
+            ]);
+        }
+
         return new Union([
             new TNonEmptyArray([
                 $item_key_type,

diff --git a/tests/ListTest.php b/tests/ListTest.php
@@ -84,6 +84,74 @@ function takesList($a): void {}
                     $a = [1, 1 => 2, 3];
                     takesList($a);',
             ],
+            'simpleTypeInfererNonEmptyList' => [
+                '<?php
+
+                    class Foo {
+                        public const VARS = [
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "x",
+                            "y",
+                        ];
+                    }
+
+                    /** @param list<string> $vars */
+                    function foo(array $vars): void {
+                        print_r($vars);
+                    }
+
+                    foo(Foo::VARS);
+                    ',
+            ],
         ];
     }