refactored encoder handling to use the supports*() methods to determine which encoder handles what format

lsmith77 · lsmith77 · commit d021dc82a7a1 · 2011-12-11T20:03:00.000+01:00
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
@@ -40,6 +40,8 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz
     protected $encoders = array();
     protected $normalizerCache = array();
     protected $denormalizerCache = array();
+    protected $encoderByFormat = array();
+    protected $decoderByFormat = array();
 
     public function __construct(array $normalizers = array(), array $encoders = array())
     {
@@ -267,12 +269,42 @@ public function supportsDecoding($format)
     /**
      * {@inheritdoc}
      */
-    public function getEncoder($format)
+    private function getEncoder($format)
     {
-        if (!isset($this->encoders[$format])) {
-            throw new RuntimeException(sprintf('No encoder found for format "%s".', $format));
+        if (isset($this->encoderByFormat[$format])
+            && isset($this->encoderByFormat[$format])
+        ) {
+            return $this->encoders[$this->encoderByFormat[$format]];
         }
 
-        return $this->encoders[$format];
+        foreach ($this->encoders as $i => $encoder) {
+            if ($encoder->supportsEncoding($format)) {
+                $this->encoderByFormat[$format] = $i;
+                return $encoder;
+            }
+        }
+
+        throw new RuntimeException(sprintf('No encoder found for format "%s".', $format));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    private function getDecoder($format)
+    {
+        if (isset($this->decoderByFormat[$format])
+            && isset($this->decoderByFormat[$format])
+        ) {
+            return $this->encoders[$this->decoderByFormat[$format]];
+        }
+
+        foreach ($this->encoders as $i => $encoder) {
+            if ($encoder->supportsDecoding($format)) {
+                $this->decoderByFormat[$format] = $i;
+                return $encoder;
+            }
+        }
+
+        throw new RuntimeException(sprintf('No decoder found for format "%s".', $format));
     }
 }
