Skip to content

[Serializer] Fixed framework.serializer.default_context is not working for JsonEncoder #45554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
Sep 28, 2022
Merged

[Serializer] Fixed framework.serializer.default_context is not working for JsonEncoder #45554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ class JsonEncoder implements EncoderInterface, DecoderInterface
protected $encodingImpl;
protected $decodingImpl;

public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null)
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));
}

/**
Expand Down
16 changes: 16 additions & 0 deletions src/Symfony/Component/Serializer/Tests/Encoder/JsonEncoderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,22 @@ public function testOptions()
$this->assertEquals($expected, $this->serializer->serialize($arr, 'json'), 'Context should not be persistent');
}

public function testWithDefaultContext()
{
$defaultContext = [
'json_encode_options' => \JSON_UNESCAPED_UNICODE,
'json_decode_associative' => false,
];

$encoder = new JsonEncoder(null, null, $defaultContext);

$data = new \stdClass();
$data->msg = '你好';

$this->assertEquals('{"msg":"你好"}', $json = $encoder->encode($data, 'json'));
$this->assertEquals($data, $encoder->decode($json, 'json'));
}

public function testEncodeNotUtf8WithoutPartialOnError()
{
$this->expectException(UnexpectedValueException::class);
Expand Down