Merge pull request #9415 from ptomulik/issue-4460

An attempt to fix #4460
vimeo · Feb 28, 2023 · 381a23b · 381a23b
2 parents e212b06 + 78e6545
commit 381a23b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/ArrayAssignmentAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/ArrayAssignmentAnalyzer.php
@@ -514,11 +514,8 @@ private static function updateArrayAssignmentChildType(
                 $array_atomic_key_type = Type::getArrayKey();
             }
 
-            if ($offset_already_existed
-                && $parent_var_id
-                && ($parent_type = $context->vars_in_scope[$parent_var_id] ?? null)
-            ) {
-                if ($parent_type->hasList() && strpos($parent_var_id, '[') === false) {
+            if ($parent_var_id && ($parent_type = $context->vars_in_scope[$parent_var_id] ?? null)) {
+                if ($offset_already_existed && $parent_type->hasList() && strpos($parent_var_id, '[') === false) {
                     $array_atomic_type_list = $value_type;
                 } elseif ($parent_type->hasClassStringMap()
                     && $key_type

diff --git a/tests/Template/ClassStringMapTest.php b/tests/Template/ClassStringMapTest.php
@@ -105,6 +105,22 @@ public function set(array $map): void {
                         }
                     }',
             ],
+            'simpleSetter' => [
+                'code' => '<?php
+                    class Container {
+                        /** @var class-string-map<T, T> */
+                        public array $map = [];
+                        /**
+                         * @template U of object
+                         * @param class-string<U> $key
+                         * @param U $obj
+                         */
+                        public function set(string $key, object $obj): void {
+                            $this->map[$key] = $obj;
+                        }
+                    }'
+                    ,
+            ],
         ];
     }