symfony · chalasr · Aug 21, 2022 · Aug 2, 2022
diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
@@ -899,11 +899,11 @@ index f38069e471..0966eb3e89 100644
 +    public function decode(string $data, string $format, array $context = []): mixed;
 
      /**
-@@ -45,4 +45,4 @@ interface DecoderInterface
+@@ -44,4 +44,4 @@ interface DecoderInterface
       * @return bool
       */
--    public function supportsDecoding(string $format /* , array $context = [] */);
-+    public function supportsDecoding(string $format /* , array $context = [] */): bool;
+-    public function supportsDecoding(string $format);
++    public function supportsDecoding(string $format): bool;
  }
 diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
 index 44ba45f581..3398115497 100644

@@ -9,8 +9,6 @@ CHANGELOG
  * Set `Context` annotation as not final
  * Deprecate `ContextAwareNormalizerInterface`, use `NormalizerInterface` instead
  * Deprecate `ContextAwareDenormalizerInterface`, use `DenormalizerInterface` instead
- * Deprecate `ContextAwareEncoderInterface`, use `EncoderInterface` instead
- * Deprecate `ContextAwareDecoderInterface`, use `DecoderInterface` instead
  * Deprecate supporting denormalization for `AbstractUid` in `UidNormalizer`, use one of `AbstractUid` child class instead
  * Deprecate denormalizing to an abstract class in `UidNormalizer`
  * Add support for `can*()` methods to `ObjectNormalizer`

@@ -67,9 +67,13 @@ private function getDecoder(string $format, array $context): DecoderInterface
             return $this->decoders[$this->decoderByFormat[$format]];
         }
 
+        $cache = true;
         foreach ($this->decoders as $i => $decoder) {
+            $cache = $cache && !$decoder instanceof ContextAwareDecoderInterface;
             if ($decoder->supportsDecoding($format, $context)) {
-                $this->decoderByFormat[$format] = $i;
+                if ($cache) {
+                    $this->decoderByFormat[$format] = $i;
+                }
 
                 return $decoder;
             }

@@ -90,9 +90,13 @@ private function getEncoder(string $format, array $context): EncoderInterface
             return $this->encoders[$this->encoderByFormat[$format]];
         }
 
+        $cache = true;
         foreach ($this->encoders as $i => $encoder) {
+            $cache = $cache && !$encoder instanceof ContextAwareEncoderInterface;
             if ($encoder->supportsEncoding($format, $context)) {
-                $this->encoderByFormat[$format] = $i;
+                if ($cache) {
+                    $this->encoderByFormat[$format] = $i;
+                }
 
                 return $encoder;
             }

@@ -15,8 +15,6 @@
  * Adds the support of an extra $context parameter for the supportsDecoding method.
  *
  * @author Kévin Dunglas <[email protected]>
- *
- * @deprecated since symfony/serializer 6.1, use DecoderInterface instead
  */
 interface ContextAwareDecoderInterface extends DecoderInterface
 {

@@ -15,8 +15,6 @@
  * Adds the support of an extra $context parameter for the supportsEncoding method.
  *
  * @author Kévin Dunglas <[email protected]>
- *
- * @deprecated since symfony/serializer 6.1, use EncoderInterface instead
  */
 interface ContextAwareEncoderInterface extends EncoderInterface
 {

@@ -124,10 +124,8 @@ public function encode(mixed $data, string $format, array $context = []): string
 
     /**
      * {@inheritdoc}
-     *
-     * @param array $context
      */
-    public function supportsEncoding(string $format /* , array $context = [] */): bool
+    public function supportsEncoding(string $format): bool
     {
         return self::FORMAT === $format;
     }
@@ -212,10 +210,8 @@ public function decode(string $data, string $format, array $context = []): mixed
 
     /**
      * {@inheritdoc}
-     *
-     * @param array $context
      */
-    public function supportsDecoding(string $format /* , array $context = [] */): bool
+    public function supportsDecoding(string $format): bool
     {
         return self::FORMAT === $format;
     }

@@ -39,10 +39,9 @@ public function decode(string $data, string $format, array $context = []);
     /**
      * Checks whether the deserializer can decode from given format.
      *
-     * @param string $format  Format name
-     * @param array  $context Options that decoders have access to
+     * @param string $format Format name
      *
      * @return bool
      */
-    public function supportsDecoding(string $format /* , array $context = [] */);
+    public function supportsDecoding(string $format);
 }
@@ -32,8 +32,7 @@ public function encode(mixed $data, string $format, array $context = []): string
     /**
      * Checks whether the serializer can encode to given format.
      *
-     * @param string $format  Format name
-     * @param array  $context Options that normalizers/encoders have access to
+     * @param string $format Format name
      */
-    public function supportsEncoding(string $format /* , array $context = [] */): bool;
+    public function supportsEncoding(string $format): bool;
 }
@@ -95,10 +95,8 @@ public function decode(string $data, string $format, array $context = []): mixed
 
     /**
      * {@inheritdoc}
-     *
-     * @param array $context
      */
-    public function supportsDecoding(string $format /* , array $context = [] */): bool
+    public function supportsDecoding(string $format): bool
     {
         return JsonEncoder::FORMAT === $format;
     }

@@ -57,10 +57,8 @@ public function encode(mixed $data, string $format, array $context = []): string
 
     /**
      * {@inheritdoc}
-     *
-     * @param array $context
      */
-    public function supportsEncoding(string $format /* , array $context = [] */): bool
+    public function supportsEncoding(string $format): bool
     {
         return JsonEncoder::FORMAT === $format;
     }

@@ -47,20 +47,16 @@ public function decode(string $data, string $format, array $context = []): mixed
 
     /**
      * {@inheritdoc}
-     *
-     * @param array $context
      */
-    public function supportsEncoding(string $format /* , array $context = [] */): bool
+    public function supportsEncoding(string $format): bool
     {
         return self::FORMAT === $format;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @param array $context
      */
-    public function supportsDecoding(string $format /* , array $context = [] */): bool
+    public function supportsDecoding(string $format): bool
     {
         return self::FORMAT === $format;
     }

@@ -166,20 +166,16 @@ public function decode(string $data, string $format, array $context = []): mixed
 
     /**
      * {@inheritdoc}
-     *
-     * @param array $context
      */
-    public function supportsEncoding(string $format /* , array $context = [] */): bool
+    public function supportsEncoding(string $format): bool
     {
         return self::FORMAT === $format;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @param array $context
      */
-    public function supportsDecoding(string $format /* , array $context = [] */): bool
+    public function supportsDecoding(string $format): bool
     {
         return self::FORMAT === $format;
     }

@@ -67,10 +67,8 @@ public function encode(mixed $data, string $format, array $context = []): string
 
     /**
      * {@inheritdoc}
-     *
-     * @param array $context
      */
-    public function supportsEncoding(string $format /* , array $context = [] */): bool
+    public function supportsEncoding(string $format): bool
     {
         return self::FORMAT === $format || self::ALTERNATIVE_FORMAT === $format;
     }
@@ -87,10 +85,8 @@ public function decode(string $data, string $format, array $context = []): mixed
 
     /**
      * {@inheritdoc}
-     *
-     * @param array $context
      */
-    public function supportsDecoding(string $format /* , array $context = [] */): bool
+    public function supportsDecoding(string $format): bool
     {
         return self::FORMAT === $format || self::ALTERNATIVE_FORMAT === $format;
     }

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Serializer\Encoder\ChainDecoder;
+use Symfony\Component\Serializer\Encoder\ContextAwareDecoderInterface;
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Exception\RuntimeException;
 
@@ -28,7 +29,7 @@ class ChainDecoderTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->decoder1 = $this->createMock(DecoderInterface::class);
+        $this->decoder1 = $this->createMock(ContextAwareDecoderInterface::class);
         $this->decoder1
             ->method('supportsDecoding')
             ->willReturnMap([

@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Serializer\Debug\TraceableEncoder;
 use Symfony\Component\Serializer\Encoder\ChainEncoder;
+use Symfony\Component\Serializer\Encoder\ContextAwareEncoderInterface;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
 use Symfony\Component\Serializer\Encoder\NormalizationAwareInterface;
 use Symfony\Component\Serializer\Exception\RuntimeException;
@@ -30,7 +31,7 @@ class ChainEncoderTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->encoder1 = $this->createMock(EncoderInterface::class);
+        $this->encoder1 = $this->createMock(ContextAwareEncoderInterface::class);
         $this->encoder1
             ->method('supportsEncoding')
             ->willReturnMap([
@@ -106,7 +107,7 @@ public function testNeedsNormalizationTraceableEncoder()
 
 class NormalizationAwareEncoder implements EncoderInterface, NormalizationAwareInterface
 {
-    public function supportsEncoding(string $format, array $context = []): bool
+    public function supportsEncoding(string $format): bool
     {
         return true;
     }