Merge branch '6.1' into 6.2

* 6.1:
  [LokaliseBridge] Fix push command --delete-missing options when there are no missing messages
  fix bad help message in cache warmup command
  [Console] Fix OutputFormatterStyleStack::getCurrent return type
  Count cookie parts before accessing the second
  Fix RequestStack state if throwable is thrown
  [Serializer] Fix caching context-aware encoders/decoders in ChainEncoder/ChainDecoder
  [Serializer] Revert deprecation of `ContextAwareEncoderInterface` and `ContextAwareDecoderInterface`

Author: fabpot

CHANGELOG.md

@@ -16,8 +16,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`

Encoder/ChainDecoder.php

@@ -61,9 +61,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;
             }

Encoder/ChainEncoder.php

@@ -84,9 +84,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;
             }

Encoder/ContextAwareDecoderInterface.php

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

Encoder/ContextAwareEncoderInterface.php

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

Encoder/CsvEncoder.php

@@ -119,10 +119,7 @@ public function encode(mixed $data, string $format, array $context = []): string
         return $value;
     }
 
-    /**
-     * @param array $context
-     */
-    public function supportsEncoding(string $format /* , array $context = [] */): bool
+    public function supportsEncoding(string $format): bool
     {
         return self::FORMAT === $format;
     }
@@ -202,10 +199,7 @@ public function decode(string $data, string $format, array $context = []): mixed
         return $result[0];
     }
 
-    /**
-     * @param array $context
-     */
-    public function supportsDecoding(string $format /* , array $context = [] */): bool
+    public function supportsDecoding(string $format): bool
     {
         return self::FORMAT === $format;
     }

Encoder/DecoderInterface.php

@@ -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);
 }

Encoder/EncoderInterface.php

@@ -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;
 }

Encoder/JsonDecode.php

@@ -93,10 +93,7 @@ public function decode(string $data, string $format, array $context = []): mixed
         return $decodedData;
     }
 
-    /**
-     * @param array $context
-     */
-    public function supportsDecoding(string $format /* , array $context = [] */): bool
+    public function supportsDecoding(string $format): bool
     {
         return JsonEncoder::FORMAT === $format;
     }

Encoder/JsonEncode.php

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