Fix #2852 - no duplicatearraykey warning for non string-keyed arrays

vimeo · Feb 21, 2020 · d8b6467 · d8b6467
1 parent 9bdca3c
commit d8b6467
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/Psalm/Type/Union.php b/src/Psalm/Type/Union.php
@@ -784,7 +784,6 @@ public function hasString()
             || isset($this->types['class-string'])
             || isset($this->types['trait-string'])
             || isset($this->types['numeric-string'])
-            || isset($this->types['array-key'])
             || $this->literal_string_types
             || $this->typed_class_strings;
     }

diff --git a/tests/ArrayFunctionCallTest.php b/tests/ArrayFunctionCallTest.php
@@ -1297,6 +1297,22 @@ function takesString(string $string): void {}
 
                     return array_map(fn ($a, $b) => [$a => $b], $as, $bs);'
             ],
+            'allowUnpackWithArrayKey' => [
+                '<?php
+                    class Foo {
+                        protected function one(): array {
+                            return [];
+                        }
+
+                        protected function two(): array {
+                            return [];
+                        }
+
+                        public function three(): array {
+                            return [...$this->one(), ...$this->two()];
+                        }
+                    }'
+            ],
         ];
     }