Merge pull request #9418 from ptomulik/issue-9401

Fix #9401
vimeo · Feb 27, 2023 · 5083e18 · 5083e18
2 parents 1a2909e + 69c5fd6
commit 5083e18
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/Psalm/Internal/TypeVisitor/TypeChecker.php b/src/Psalm/Internal/TypeVisitor/TypeChecker.php
@@ -348,6 +348,7 @@ public function checkTemplateParam(TTemplateParam $atomic): void
     {
         if ($this->prevent_template_covariance
             && strpos($atomic->defining_class, 'fn-') !== 0
+            && $atomic->defining_class !== 'class-string-map'
         ) {
             $codebase = $this->source->getCodebase();
 

diff --git a/tests/Template/ClassStringMapTest.php b/tests/Template/ClassStringMapTest.php
@@ -83,6 +83,28 @@ function foo(array $arr) : void {
                         takesVariadic(...$arr);
                     }',
             ],
+            'assignClassStringMapInConstruct' => [
+                'code' => '<?php
+                    class A {
+                        /** @var class-string-map<T,T> */
+                        private array $map;
+                        /** @param class-string-map<T,T> $map */
+                        public function __construct(array $map) {
+                            $this->map = $map;
+                        }
+                    }',
+            ],
+            'assignClassStringMapInMethod' => [
+                'code' => '<?php
+                    class A {
+                        /** @var class-string-map<T,T> */
+                        private array $map = [];
+                        /** @param class-string-map<T,T> $map */
+                        public function set(array $map): void {
+                            $this->map = $map;
+                        }
+                    }',
+            ],
         ];
     }