diff vendor/symfony/serializer/Encoder/ChainDecoder.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer

--- a/vendor/symfony/serializer/Encoder/ChainDecoder.php	Mon Apr 23 09:33:26 2018 +0100
+++ b/vendor/symfony/serializer/Encoder/ChainDecoder.php	Mon Apr 23 09:46:53 2018 +0100
@@ -19,8 +19,10 @@
  * @author Jordi Boggiano <[e-mail]>
  * @author Johannes M. Schmitt <[e-mail]>
  * @author Lukas Kahwe Smith <[e-mail]>
+ *
+ * @final since version 3.3.
  */
-class ChainDecoder implements DecoderInterface
+class ChainDecoder implements DecoderInterface /*, ContextAwareDecoderInterface*/
 {
     protected $decoders = array();
     protected $decoderByFormat = array();
@@ -35,16 +37,18 @@
      */
     final public function decode($data, $format, array $context = array())
     {
-        return $this->getDecoder($format)->decode($data, $format, $context);
+        return $this->getDecoder($format, $context)->decode($data, $format, $context);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function supportsDecoding($format)
+    public function supportsDecoding($format/*, array $context = array()*/)
     {
+        $context = func_num_args() > 1 ? func_get_arg(1) : array();
+
         try {
-            $this->getDecoder($format);
+            $this->getDecoder($format, $context);
         } catch (RuntimeException $e) {
             return false;
         }
@@ -56,12 +60,13 @@
      * Gets the decoder supporting the format.
      *
      * @param string $format
+     * @param array  $context
      *
      * @return DecoderInterface
      *
-     * @throws RuntimeException If no decoder is found.
+     * @throws RuntimeException if no decoder is found
      */
-    private function getDecoder($format)
+    private function getDecoder($format, array $context)
     {
         if (isset($this->decoderByFormat[$format])
             && isset($this->decoders[$this->decoderByFormat[$format]])
@@ -70,7 +75,7 @@
         }
 
         foreach ($this->decoders as $i => $decoder) {
-            if ($decoder->supportsDecoding($format)) {
+            if ($decoder->supportsDecoding($format, $context)) {
                 $this->decoderByFormat[$format] = $i;
 
                 return $decoder;