Merge pull request #10464 from danog/fix_10460

Fix #10460
vimeo · Dec 7, 2023 · bc71da4 · bc71da4
2 parents c620f6e + 576ecd6
commit bc71da4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Codebase/ConstantTypeResolver.php b/src/Psalm/Internal/Codebase/ConstantTypeResolver.php
@@ -216,8 +216,8 @@ public static function resolve(
                         return new TArray([Type::getArrayKey(), Type::getMixed()]);
                     }
 
-                    foreach ($spread_array->properties as $spread_array_type) {
-                        $properties[$auto_key++] = $spread_array_type;
+                    foreach ($spread_array->properties as $k => $spread_array_type) {
+                        $properties[is_string($k) ? $k : $auto_key++] = $spread_array_type;
                     }
                     continue;
                 }

diff --git a/tests/ArrayAssignmentTest.php b/tests/ArrayAssignmentTest.php
@@ -1280,6 +1280,29 @@ function foo(array $arr) : string {
                 'ignored_issues' => [],
                 'php_version' => '8.1',
             ],
+            'constantArraySpreadWithString' => [
+                'code' => '<?php
+                    class BaseClass {
+                        public const KEYS = [
+                            "a" => "a",
+                            "b" => "b",
+                        ];
+                    }
+
+                    class ChildClass extends BaseClass {
+                        public const A = [
+                            ...parent::KEYS,
+                            "c" => "c",
+                        ];
+                    }
+
+                    $a = ChildClass::A;',
+                'assertions' => [
+                    '$a===' => "array{a: 'a', b: 'b', c: 'c'}",
+                ],
+                'ignored_issues' => [],
+                'php_version' => '8.1',
+            ],
             'listPropertyAssignmentAfterIsset' => [
                 'code' => '<?php
                     class Collection {