more typo fixes

lsmith77 · lsmith77 · commit 078f7f3ecd13 · 2011-12-11T20:03:01.000+01:00
diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php
@@ -244,12 +244,12 @@ public function supportsDeserialization($format)
     public function supportsEncoding($format)
     {
         try {
-            $encoder = $this->getEncoder($format);
+            $this->getEncoder($format);
         } catch (\RuntimeException $e) {
             return false;
         }
 
-        return $encoder instanceof EncoderInterface;
+        return true;
     }
 
     /**
@@ -258,12 +258,12 @@ public function supportsEncoding($format)
     public function supportsDecoding($format)
     {
         try {
-            $encoder = $this->getEncoder($format);
+            $this->getDecoder($format);
         } catch (\RuntimeException $e) {
             return false;
         }
 
-        return $encoder instanceof DecoderInterface;
+        return true;
     }
 
     /**
@@ -278,7 +278,9 @@ private function getEncoder($format)
         }
 
         foreach ($this->encoders as $i => $encoder) {
-            if ($encoder->supportsEncoding($format)) {
+            if ($encoder instanceof EncoderInterface
+                && $encoder->supportsEncoding($format)
+            ) {
                 $this->encoderByFormat[$format] = $i;
                 return $encoder;
             }
@@ -299,7 +301,9 @@ private function getDecoder($format)
         }
 
         foreach ($this->encoders as $i => $encoder) {
-            if ($encoder->supportsDecoding($format)) {
+            if ($encoder instanceof DecoderInterface
+                && $encoder->supportsDecoding($format)
+            ) {
                 $this->decoderByFormat[$format] = $i;
                 return $encoder;
             }

Original file line number	Diff line number	Diff line change
`@@ -244,12 +244,12 @@ public function supportsDeserialization($format)`
`244`	`244`	`public function supportsEncoding($format)`
`245`	`245`	`{`
`246`	`246`	`try {`
`247`		`- $encoder = $this->getEncoder($format);`
	`247`	`+ $this->getEncoder($format);`
`248`	`248`	`} catch (\RuntimeException $e) {`
`249`	`249`	`return false;`
`250`	`250`	`}`
`251`	`251`
`252`		`- return $encoder instanceof EncoderInterface;`
	`252`	`+ return true;`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`/**`
`@@ -258,12 +258,12 @@ public function supportsEncoding($format)`
`258`	`258`	`public function supportsDecoding($format)`
`259`	`259`	`{`
`260`	`260`	`try {`
`261`		`- $encoder = $this->getEncoder($format);`
	`261`	`+ $this->getDecoder($format);`
`262`	`262`	`} catch (\RuntimeException $e) {`
`263`	`263`	`return false;`
`264`	`264`	`}`
`265`	`265`
`266`		`- return $encoder instanceof DecoderInterface;`
	`266`	`+ return true;`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`/**`
`@@ -278,7 +278,9 @@ private function getEncoder($format)`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`foreach ($this->encoders as $i => $encoder) {`
`281`		`- if ($encoder->supportsEncoding($format)) {`
	`281`	`+ if ($encoder instanceof EncoderInterface`
	`282`	`+ && $encoder->supportsEncoding($format)`
	`283`	`+ ) {`
`282`	`284`	`$this->encoderByFormat[$format] = $i;`
`283`	`285`	`return $encoder;`
`284`	`286`	`}`
`@@ -299,7 +301,9 @@ private function getDecoder($format)`
`299`	`301`	`}`
`300`	`302`
`301`	`303`	`foreach ($this->encoders as $i => $encoder) {`
`302`		`- if ($encoder->supportsDecoding($format)) {`
	`304`	`+ if ($encoder instanceof DecoderInterface`
	`305`	`+ && $encoder->supportsDecoding($format)`
	`306`	`+ ) {`
`303`	`307`	`$this->decoderByFormat[$format] = $i;`
`304`	`308`	`return $encoder;`
`305`	`309`	`}`