Fix #2281 - allow lists to accept list types

vimeo · Nov 1, 2019 · bab7e46 · bab7e46
1 parent 050eb82
commit bab7e46
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/src/Psalm/Type/Atomic/TList.php b/src/Psalm/Type/Atomic/TList.php
@@ -144,6 +144,12 @@ public function replaceTemplateTypesWithStandins(
                 } else {
                     $input_type_param = $input_type->getGenericValueType();
                 }
+            } elseif ($input_type instanceof Atomic\TList) {
+                if ($offset === 0) {
+                    continue;
+                }
+
+                $input_type_param = clone $input_type->type_param;
             }
 
             $type_param->replaceTemplateTypesWithStandins(

diff --git a/tests/Template/ClassTemplateTest.php b/tests/Template/ClassTemplateTest.php
@@ -1864,6 +1864,33 @@ public function __construct()
                     /** @param Foo<array> $_ */
                     function takesFooArray($_): void {}',
             ],
+            'allowListAcceptance' => [
+                '<?php
+                    /** @template T */
+                    class Collection
+                    {
+                        /** @var list<T> */
+                        public $values;
+
+                        /** @param list<T> $values */
+                        function __construct(array $values)
+                        {
+                            $this->values = $values;
+                        }
+                    }
+
+                    /** @return Collection<string> */
+                    function makeStringCollection()
+                    {
+                        return new Collection(getStringList()); // gets typed as Collection<mixed> for some reason
+                    }
+
+                    /** @return list<string> */
+                    function getStringList(): array
+                    {
+                        return ["foo", "baz"];
+                    }'
+            ],
         ];
     }