Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit d8cf930

Browse filesBrowse files
dbunicolas-grekas
authored andcommitted
[Serializer] forward the context from the JsonEncoder to JsonEncode and JsonDecode
1 parent fcc2174 commit d8cf930
Copy full SHA for d8cf930

File tree

2 files changed

+26
-3
lines changed
Filter options

2 files changed

+26
-3
lines changed

‎src/Symfony/Component/Serializer/Encoder/JsonEncoder.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
+11-2Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,24 @@ class JsonEncoder implements EncoderInterface, DecoderInterface
2323
protected $encodingImpl;
2424
protected $decodingImpl;
2525

26+
private $defaultContext = [
27+
JsonDecode::ASSOCIATIVE => true,
28+
];
29+
2630
public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null, array $defaultContext = [])
2731
{
28-
$this->encodingImpl = $encodingImpl ?? new JsonEncode($defaultContext);
29-
$this->decodingImpl = $decodingImpl ?? new JsonDecode(array_merge([JsonDecode::ASSOCIATIVE => true], $defaultContext));
32+
$this->defaultContext = array_merge($this->defaultContext, $defaultContext);
33+
$this->encodingImpl = $encodingImpl ?? new JsonEncode($this->defaultContext);
34+
$this->decodingImpl = $decodingImpl ?? new JsonDecode($this->defaultContext);
3035
}
3136

3237
/**
3338
* {@inheritdoc}
3439
*/
3540
public function encode($data, string $format, array $context = [])
3641
{
42+
$context = array_merge($this->defaultContext, $context);
43+
3744
return $this->encodingImpl->encode($data, self::FORMAT, $context);
3845
}
3946

@@ -42,6 +49,8 @@ public function encode($data, string $format, array $context = [])
4249
*/
4350
public function decode(string $data, string $format, array $context = [])
4451
{
52+
$context = array_merge($this->defaultContext, $context);
53+
4554
return $this->decodingImpl->decode($data, self::FORMAT, $context);
4655
}
4756

‎src/Symfony/Component/Serializer/Encoder/YamlEncoder.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Encoder/YamlEncoder.php
+15-1Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,17 @@ class YamlEncoder implements EncoderInterface, DecoderInterface
2828

2929
public const PRESERVE_EMPTY_OBJECTS = 'preserve_empty_objects';
3030

31+
/**
32+
* Override the amount of spaces to use for indentation of nested nodes.
33+
*
34+
* This option only works in the constructor, not in calls to `encode`.
35+
*/
36+
public const YAML_INDENTATION = 'yaml_indentation';
37+
3138
public const YAML_INLINE = 'yaml_inline';
39+
/**
40+
* Initial indentation for root element.
41+
*/
3242
public const YAML_INDENT = 'yaml_indent';
3343
public const YAML_FLAGS = 'yaml_flags';
3444

@@ -46,8 +56,12 @@ public function __construct(Dumper $dumper = null, Parser $parser = null, array
4656
throw new RuntimeException('The YamlEncoder class requires the "Yaml" component. Install "symfony/yaml" to use it.');
4757
}
4858

49-
$this->dumper = $dumper ?? new Dumper();
59+
if (!$dumper) {
60+
$dumper = \array_key_exists(self::YAML_INDENTATION, $defaultContext) ? new Dumper($defaultContext[self::YAML_INDENTATION]) : new Dumper();
61+
}
62+
$this->dumper = $dumper;
5063
$this->parser = $parser ?? new Parser();
64+
unset($defaultContext[self::YAML_INDENTATION]);
5165
$this->defaultContext = array_merge($this->defaultContext, $defaultContext);
5266
}
5367

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.