scientific and underscore notation should be quoted too, since they w…

…on't be type juggled
vimeo · Mar 23, 2024 · 1bfa684 · 1bfa684
1 parent cd302f0
commit 1bfa684
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/Psalm/Type/Atomic/TKeyedArray.php b/src/Psalm/Type/Atomic/TKeyedArray.php
@@ -720,11 +720,19 @@ private function escapeAndQuote($name)
                 $quote = true;
             }
 
+            if (preg_match('/^[1-9][0-9]*_([0-9]+_)*[0-9]+$/', $name)) {
+                $quote = true;
+            }
+
             // 08 should be quoted since it's numeric but it's handled as string and not cast to int
             if (preg_match('/^0[0-9]+$/', $name)) {
                 $quote = true;
             }
 
+            if (preg_match('/^[0-9]+e-?[0-9]+$/', $name)) {
+                $quote = true;
+            }
+
             if ($quote) {
                 $name = '\'' . str_replace("\n", '\n', addslashes($name)) . '\'';
             }

diff --git a/tests/ArrayKeysTest.php b/tests/ArrayKeysTest.php
@@ -193,6 +193,8 @@ public function test(bool $v): array {
                     // see https://github.com/php/php-src/issues/9029#issuecomment-1186226676
                     $e = ["+15" => "a"];
                     $f = ["015" => "a"];
+                    $g = ["1e2" => "a"];
+                    $h = ["1_0" => "a"];
                     ',
                 'assertions' => [
                     '$a===' => "array{15: 'a'}",
@@ -201,6 +203,8 @@ public function test(bool $v): array {
                     '$d===' => "array{-15: 'a'}",
                     '$e===' => "array{'+15': 'a'}",
                     '$f===' => "array{'015': 'a'}",
+                    '$g===' => "array{'1e2': 'a'}",
+                    '$h===' => "array{'1_0': 'a'}",
                 ],
             ],
         ];