Merge pull request #7309 from orklah/emptyStringKeyedArray

fix empty string not quoted in keyed array offset
vimeo · Jan 6, 2022 · 18ab5a0 · 18ab5a0
2 parents 513b263 + 72216f9
commit 18ab5a0
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/src/Psalm/Type/Atomic/TKeyedArray.php b/src/Psalm/Type/Atomic/TKeyedArray.php
@@ -430,7 +430,7 @@ public function getList(): TNonEmptyList
      */
     private function escapeAndQuote($name)
     {
-        if (is_string($name) && preg_match('/[^a-zA-Z0-9_]/', $name)) {
+        if (is_string($name) && ($name === '' || preg_match('/[^a-zA-Z0-9_]/', $name))) {
             $name = '\'' . str_replace("\n", '\n', addslashes($name)) . '\'';
         }
 

diff --git a/tests/AssertAnnotationTest.php b/tests/AssertAnnotationTest.php
@@ -1944,6 +1944,33 @@ function assertString(A $arg): bool {return $arg->b !== null;}
                     function requiresString(string $_str): void {}
                 ',
             ],
+            'assertWithEmptyStringOnKeyedArray' => [
+                '<?php
+                    class A
+                    {
+                        function test(): void
+                        {
+                            $a = ["" => ""];
+
+                            /** @var array<string, mixed> $b */
+                            $b = [];
+
+                            $this->assertSame($a, $b);
+                        }
+
+                        /**
+                         * @template T
+                         * @param T      $expected
+                         * @param mixed $actual
+                         * @psalm-assert =T $actual
+                         */
+                        public function assertSame($expected, $actual): void
+                        {
+                            return;
+                        }
+                    }
+                ',
+            ],
         ];
     }