diff --git a/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php b/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
index 2a55d93a6066f..747c70dfb4fa0 100644
--- a/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/ChainDecoder.php
@@ -61,7 +61,10 @@ public function supportsDecoding($format, array $context = []): bool
*/
private function getDecoder(string $format, array $context): DecoderInterface
{
- if (isset($this->decoderByFormat[$format])
+ $hasContext = 0 < \count($context);
+ if (
+ !$hasContext
+ && isset($this->decoderByFormat[$format])
&& isset($this->decoders[$this->decoderByFormat[$format]])
) {
return $this->decoders[$this->decoderByFormat[$format]];
@@ -69,7 +72,10 @@ private function getDecoder(string $format, array $context): DecoderInterface
foreach ($this->decoders as $i => $decoder) {
if ($decoder->supportsDecoding($format, $context)) {
- $this->decoderByFormat[$format] = $i;
+ if (!$hasContext) {
+ // cache decoder if no dynamic context is given
+ $this->decoderByFormat[$format] = $i;
+ }
return $decoder;
}
diff --git a/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php b/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
index b13333e88aabb..23c159ce65777 100644
--- a/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
+++ b/src/Symfony/Component/Serializer/Encoder/ChainEncoder.php
@@ -79,7 +79,10 @@ public function needsNormalization(string $format, array $context = []): bool
*/
private function getEncoder(string $format, array $context): EncoderInterface
{
- if (isset($this->encoderByFormat[$format])
+ $hasContext = 0 < \count($context);
+ if (
+ !$hasContext
+ && isset($this->encoderByFormat[$format])
&& isset($this->encoders[$this->encoderByFormat[$format]])
) {
return $this->encoders[$this->encoderByFormat[$format]];
@@ -87,7 +90,10 @@ private function getEncoder(string $format, array $context): EncoderInterface
foreach ($this->encoders as $i => $encoder) {
if ($encoder->supportsEncoding($format, $context)) {
- $this->encoderByFormat[$format] = $i;
+ if (!$hasContext) {
+ // cache encoder if no dynamic context is given
+ $this->encoderByFormat[$format] = $i;
+ }
return $encoder;
}
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php
index 5cac8d99a5270..847526990ebb3 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/ChainDecoderTest.php
@@ -36,6 +36,7 @@ protected function setUp(): void
[self::FORMAT_2, [], false],
[self::FORMAT_3, [], false],
[self::FORMAT_3, ['foo' => 'bar'], true],
+ [self::FORMAT_3, ['foo' => 'bar2'], false],
]);
$this->decoder2 = $this->createMock(DecoderInterface::class);
@@ -45,6 +46,8 @@ protected function setUp(): void
[self::FORMAT_1, [], false],
[self::FORMAT_2, [], true],
[self::FORMAT_3, [], false],
+ [self::FORMAT_3, ['foo' => 'bar'], false],
+ [self::FORMAT_3, ['foo' => 'bar2'], true],
]);
$this->chainDecoder = new ChainDecoder([$this->decoder1, $this->decoder2]);
@@ -52,10 +55,26 @@ protected function setUp(): void
public function testSupportsDecoding()
{
+ $this->decoder1
+ ->method('decode')
+ ->willReturn('result1');
+ $this->decoder2
+ ->method('decode')
+ ->willReturn('result2');
+
$this->assertTrue($this->chainDecoder->supportsDecoding(self::FORMAT_1));
+ $this->assertEquals('result1', $this->chainDecoder->decode('', self::FORMAT_1, []));
+
$this->assertTrue($this->chainDecoder->supportsDecoding(self::FORMAT_2));
+ $this->assertEquals('result2', $this->chainDecoder->decode('', self::FORMAT_2, []));
+
$this->assertFalse($this->chainDecoder->supportsDecoding(self::FORMAT_3));
+
$this->assertTrue($this->chainDecoder->supportsDecoding(self::FORMAT_3, ['foo' => 'bar']));
+ $this->assertEquals('result1', $this->chainDecoder->decode('', self::FORMAT_3, ['foo' => 'bar']));
+
+ $this->assertTrue($this->chainDecoder->supportsDecoding(self::FORMAT_3, ['foo' => 'bar2']));
+ $this->assertEquals('result2', $this->chainDecoder->decode('', self::FORMAT_3, ['foo' => 'bar2']));
}
public function testDecode()
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php
index e80dc4f1843a6..612397b54d9be 100644
--- a/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/ChainEncoderTest.php
@@ -37,6 +37,7 @@ protected function setUp(): void
[self::FORMAT_2, [], false],
[self::FORMAT_3, [], false],
[self::FORMAT_3, ['foo' => 'bar'], true],
+ [self::FORMAT_3, ['foo' => 'bar2'], false],
]);
$this->encoder2 = $this->createMock(EncoderInterface::class);
@@ -46,6 +47,8 @@ protected function setUp(): void
[self::FORMAT_1, [], false],
[self::FORMAT_2, [], true],
[self::FORMAT_3, [], false],
+ [self::FORMAT_3, ['foo' => 'bar'], false],
+ [self::FORMAT_3, ['foo' => 'bar2'], true],
]);
$this->chainEncoder = new ChainEncoder([$this->encoder1, $this->encoder2]);
@@ -53,10 +56,26 @@ protected function setUp(): void
public function testSupportsEncoding()
{
+ $this->encoder1
+ ->method('encode')
+ ->willReturn('result1');
+ $this->encoder2
+ ->method('encode')
+ ->willReturn('result2');
+
$this->assertTrue($this->chainEncoder->supportsEncoding(self::FORMAT_1));
+ $this->assertEquals('result1', $this->chainEncoder->encode('', self::FORMAT_1, []));
+
$this->assertTrue($this->chainEncoder->supportsEncoding(self::FORMAT_2));
+ $this->assertEquals('result2', $this->chainEncoder->encode('', self::FORMAT_2, []));
+
$this->assertFalse($this->chainEncoder->supportsEncoding(self::FORMAT_3));
+
$this->assertTrue($this->chainEncoder->supportsEncoding(self::FORMAT_3, ['foo' => 'bar']));
+ $this->assertEquals('result1', $this->chainEncoder->encode('', self::FORMAT_3, ['foo' => 'bar']));
+
+ $this->assertTrue($this->chainEncoder->supportsEncoding(self::FORMAT_3, ['foo' => 'bar2']));
+ $this->assertEquals('result2', $this->chainEncoder->encode('', self::FORMAT_3, ['foo' => 'bar2']));
}
public function testEncode()
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy