diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Serializer] switched to setEncoder, to be consistent with getEncoder

Browse Source
This commit is contained in:
Bulat Shakirzyanov 2011-01-25 22:19:02 -05:00 committed by Fabien Potencier
parent 62d52d8015
commit 5252d3aef0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Serializer/Serializer.php
View File

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

2
src/Symfony/Component/Serializer/SerializerInterface.php
View File

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

2
tests/Symfony/Tests/Component/Serializer/Encoder/XmlEncoderTest.php
View File

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

8
tests/Symfony/Tests/Component/Serializer/SerializerTest.php
View File

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