From 5252d3aef0b10d10c069080e179dd0521de08d57 Mon Sep 17 00:00:00 2001 From: Bulat Shakirzyanov Date: Tue, 25 Jan 2011 22:19:02 -0500 Subject: [PATCH] [Serializer] switched to setEncoder, to be consistent with getEncoder --- src/Symfony/Component/Serializer/Serializer.php | 2 +- src/Symfony/Component/Serializer/SerializerInterface.php | 2 +- .../Tests/Component/Serializer/Encoder/XmlEncoderTest.php | 2 +- .../Symfony/Tests/Component/Serializer/SerializerTest.php | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php index 0147d8755b..d79119f060 100644 --- a/src/Symfony/Component/Serializer/Serializer.php +++ b/src/Symfony/Component/Serializer/Serializer.php @@ -141,7 +141,7 @@ class Serializer implements SerializerInterface /** * {@inheritdoc} */ - public function addEncoder($format, EncoderInterface $encoder) + public function setEncoder($format, EncoderInterface $encoder) { $this->encoders[$format] = $encoder; $encoder->setSerializer($this); diff --git a/src/Symfony/Component/Serializer/SerializerInterface.php b/src/Symfony/Component/Serializer/SerializerInterface.php index df6f3617d7..38c0a2d92c 100644 --- a/src/Symfony/Component/Serializer/SerializerInterface.php +++ b/src/Symfony/Component/Serializer/SerializerInterface.php @@ -80,7 +80,7 @@ interface SerializerInterface * @param string $format format name * @param EncoderInterface $encoder */ - function addEncoder($format, EncoderInterface $encoder); + function setEncoder($format, EncoderInterface $encoder); /** * @param string $format format name diff --git a/tests/Symfony/Tests/Component/Serializer/Encoder/XmlEncoderTest.php b/tests/Symfony/Tests/Component/Serializer/Encoder/XmlEncoderTest.php index 6044df317d..f2615b7e2a 100644 --- a/tests/Symfony/Tests/Component/Serializer/Encoder/XmlEncoderTest.php +++ b/tests/Symfony/Tests/Component/Serializer/Encoder/XmlEncoderTest.php @@ -26,7 +26,7 @@ class XmlEncoderTest extends \PHPUnit_Framework_TestCase { $serializer = new Serializer; $this->encoder = new XmlEncoder; - $serializer->addEncoder('xml', $this->encoder); + $serializer->setEncoder('xml', $this->encoder); $serializer->addNormalizer(new CustomNormalizer); } diff --git a/tests/Symfony/Tests/Component/Serializer/SerializerTest.php b/tests/Symfony/Tests/Component/Serializer/SerializerTest.php index 20aaf1c408..5e6d294523 100644 --- a/tests/Symfony/Tests/Component/Serializer/SerializerTest.php +++ b/tests/Symfony/Tests/Component/Serializer/SerializerTest.php @@ -42,14 +42,14 @@ class SerializerTest extends \PHPUnit_Framework_TestCase public function testSerializeScalar() { - $this->serializer->addEncoder('json', new JsonEncoder()); + $this->serializer->setEncoder('json', new JsonEncoder()); $result = $this->serializer->serialize('foo', 'json'); $this->assertEquals('"foo"', $result); } public function testSerializeArrayOfScalars() { - $this->serializer->addEncoder('json', new JsonEncoder()); + $this->serializer->setEncoder('json', new JsonEncoder()); $data = array('foo', array(5, 3)); $result = $this->serializer->serialize($data, 'json'); $this->assertEquals(json_encode($data), $result); @@ -57,7 +57,7 @@ class SerializerTest extends \PHPUnit_Framework_TestCase public function testEncode() { - $this->serializer->addEncoder('json', new JsonEncoder()); + $this->serializer->setEncoder('json', new JsonEncoder()); $data = array('foo', array(5, 3)); $result = $this->serializer->encode($data, 'json'); $this->assertEquals(json_encode($data), $result); @@ -65,7 +65,7 @@ class SerializerTest extends \PHPUnit_Framework_TestCase public function testDecode() { - $this->serializer->addEncoder('json', new JsonEncoder()); + $this->serializer->setEncoder('json', new JsonEncoder()); $data = array('foo', array(5, 3)); $result = $this->serializer->decode(json_encode($data), 'json'); $this->assertEquals($data, $result);