fix: apply JSON options on keys

CuyZ · Apr 2, 2024 · fbc89ad · fbc89ad
1 parent 64fe0ed
commit fbc89ad
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Normalizer/Formatter/JsonFormatter.php b/src/Normalizer/Formatter/JsonFormatter.php
@@ -66,7 +66,9 @@ public function format(mixed $value): void
                 $isFirst = false;
 
                 if (! $isList) {
-                    $this->write('"' . $key . '":');
+                    $key = json_encode($key, $this->jsonEncodingOptions);
+
+                    $this->write($key . ':');
                 }
 
                 $this->format($val);

diff --git a/tests/Integration/Normalizer/NormalizerTest.php b/tests/Integration/Normalizer/NormalizerTest.php
@@ -660,6 +660,15 @@ public function __construct(
             'transformerAttributes' => [],
             'jsonEncodingOptions' => JSON_PRESERVE_ZERO_FRACTION,
         ];
+
+        yield 'array with key and value containing ampersand' => [
+            'input' => ['foo&bar' => 'bar&baz'],
+            'expected array' => ['foo&bar' => 'bar&baz'],
+            'expected_json' => '{"foo\u0026bar":"bar\u0026baz"}',
+            'transformers' => [],
+            'transformerAttributes' => [],
+            'jsonEncodingOptions' => JSON_HEX_AMP,
+        ];
     }
 
     public function test_generator_of_scalar_yields_expected_array(): void