forward the context from the JsonEncoder to JsonEncode and JsonDecode

dbu · dbu · commit a5e75723a6dd · 2022-08-10T17:36:06.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/serializer.php
@@ -177,6 +177,7 @@
             ->tag('serializer.encoder')
 
         ->set('serializer.encoder.json', JsonEncoder::class)
+            ->args([null, null])
             ->tag('serializer.encoder')
 
         ->set('serializer.encoder.yaml', YamlEncoder::class)
diff --git a/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php b/src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
@@ -23,17 +23,22 @@ class JsonEncoder implements EncoderInterface, DecoderInterface
     protected $encodingImpl;
     protected $decodingImpl;
 
-    public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null)
+    private $defaultContext;
+
+    public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null, array $defaultContext = [])
     {
-        $this->encodingImpl = $encodingImpl ?? new JsonEncode();
-        $this->decodingImpl = $decodingImpl ?? new JsonDecode([JsonDecode::ASSOCIATIVE => true]);
+        $this->encodingImpl = $encodingImpl ?? new JsonEncode($defaultContext);
+        $this->decodingImpl = $decodingImpl ?? new JsonDecode(array_merge([JsonDecode::ASSOCIATIVE => true], $defaultContext));
+        $this->defaultContext = $defaultContext;
     }
 
     /**
      * {@inheritdoc}
      */
     public function encode(mixed $data, string $format, array $context = []): string
     {
+        $context = array_merge($this->defaultContext, $context);
+
         return $this->encodingImpl->encode($data, self::FORMAT, $context);
     }
 
@@ -42,6 +47,8 @@ public function encode(mixed $data, string $format, array $context = []): string
      */
     public function decode(string $data, string $format, array $context = []): mixed
     {
+        $context = array_merge($this->defaultContext, $context);
+
         return $this->decodingImpl->decode($data, self::FORMAT, $context);
     }
 
diff --git a/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php b/src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
@@ -28,7 +28,17 @@ class YamlEncoder implements EncoderInterface, DecoderInterface
 
     public const PRESERVE_EMPTY_OBJECTS = 'preserve_empty_objects';
 
+    /**
+     * Override the amount of spaces to use for indentation of nested nodes.
+     *
+     * This option only works in the constructor, not in calls to `encode`.
+     */
+    public const YAML_INDENTATION = 'yaml_indentation';
+
     public const YAML_INLINE = 'yaml_inline';
+    /**
+     * Initial indentation for root element.
+     */
     public const YAML_INDENT = 'yaml_indent';
     public const YAML_FLAGS = 'yaml_flags';
 
@@ -46,8 +56,12 @@ public function __construct(Dumper $dumper = null, Parser $parser = null, array
             throw new RuntimeException('The YamlEncoder class requires the "Yaml" component. Install "symfony/yaml" to use it.');
         }
 
-        $this->dumper = $dumper ?? new Dumper();
+        if (!$dumper) {
+            $dumper = \array_key_exists(self::YAML_INDENTATION, $defaultContext) ? new Dumper($defaultContext[self::YAML_INDENTATION]) : new Dumper();
+        }
+        $this->dumper = $dumper;
         $this->parser = $parser ?? new Parser();
+        unset($defaultContext[self::YAML_INDENTATION]);
         $this->defaultContext = array_merge($this->defaultContext, $defaultContext);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,22 @@ class JsonEncoder implements EncoderInterface, DecoderInterface`
`23`	`23`	`protected $encodingImpl;`
`24`	`24`	`protected $decodingImpl;`
`25`	`25`
`26`		`- public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null)`
	`26`	`+ private $defaultContext;`
	`27`	`+`
	`28`	`+ public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null, array $defaultContext = [])`
`27`	`29`	`{`
`28`		`- $this->encodingImpl = $encodingImpl ?? new JsonEncode();`
`29`		`- $this->decodingImpl = $decodingImpl ?? new JsonDecode([JsonDecode::ASSOCIATIVE => true]);`
	`30`	`+ $this->encodingImpl = $encodingImpl ?? new JsonEncode($defaultContext);`
	`31`	`+ $this->decodingImpl = $decodingImpl ?? new JsonDecode(array_merge([JsonDecode::ASSOCIATIVE => true], $defaultContext));`
	`32`	`+ $this->defaultContext = $defaultContext;`
`30`	`33`	`}`
`31`	`34`
`32`	`35`	`/**`
`33`	`36`	`* {@inheritdoc}`
`34`	`37`	`*/`
`35`	`38`	`public function encode(mixed $data, string $format, array $context = []): string`
`36`	`39`	`{`
	`40`	`+ $context = array_merge($this->defaultContext, $context);`
	`41`	`+`
`37`	`42`	`return $this->encodingImpl->encode($data, self::FORMAT, $context);`
`38`	`43`	`}`
`39`	`44`
`@@ -42,6 +47,8 @@ public function encode(mixed $data, string $format, array $context = []): string`
`42`	`47`	`*/`
`43`	`48`	`public function decode(string $data, string $format, array $context = []): mixed`
`44`	`49`	`{`
	`50`	`+ $context = array_merge($this->defaultContext, $context);`
	`51`	`+`
`45`	`52`	`return $this->decodingImpl->decode($data, self::FORMAT, $context);`
`46`	`53`	`}`
`47`	`54`