From e3187590c0d3d90a01f5d92c80a7347b984ef73e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 8 May 2013 10:39:40 +0200 Subject: [PATCH] [Serializer] fixed CS (refs #7971) --- .../Component/Serializer/Serializer.php | 8 ++---- .../Tests/Normalizer/TestDenormalizer.php | 27 +++++++++---------- .../Tests/Normalizer/TestNormalizer.php | 27 +++++++++---------- .../Serializer/Tests/SerializerTest.php | 11 ++++---- 4 files changed, 33 insertions(+), 40 deletions(-) diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php index c19951a9bd..23a8a0795b 100644 --- a/src/Symfony/Component/Serializer/Serializer.php +++ b/src/Symfony/Component/Serializer/Serializer.php @@ -173,9 +173,7 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz private function getNormalizer($data, $format = null) { foreach ($this->normalizers as $normalizer) { - if ($normalizer instanceof NormalizerInterface - && $normalizer->supportsNormalization($data, $format) - ) { + if ($normalizer instanceof NormalizerInterface && $normalizer->supportsNormalization($data, $format)) { return $normalizer; } } @@ -189,9 +187,7 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz private function getDenormalizer($data, $type, $format = null) { foreach ($this->normalizers as $normalizer) { - if ($normalizer instanceof DenormalizerInterface - && $normalizer->supportsDenormalization($data, $type, $format) - ) { + if ($normalizer instanceof DenormalizerInterface && $normalizer->supportsDenormalization($data, $type, $format)) { return $normalizer; } } diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php b/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php index ce1c7d2f7f..e881ad1397 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/TestDenormalizer.php @@ -20,19 +20,18 @@ use Symfony\Component\Serializer\Normalizer\DenormalizerInterface; */ class TestDenormalizer implements DenormalizerInterface { - /** - * {@inheritdoc} - */ - public function denormalize($data, $class, $format = null, array $context = array()) - { + /** + * {@inheritdoc} + */ + public function denormalize($data, $class, $format = null, array $context = array()) + { + } - } - - /** - * {@inheritdoc} - */ - public function supportsDenormalization($data, $type, $format = null) - { - return TRUE; - } + /** + * {@inheritdoc} + */ + public function supportsDenormalization($data, $type, $format = null) + { + return true; + } } diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php b/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php index 149c402110..4c000b3eb4 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/TestNormalizer.php @@ -20,19 +20,18 @@ use Symfony\Component\Serializer\Normalizer\NormalizerInterface; */ class TestNormalizer implements NormalizerInterface { - /** - * {@inheritdoc} - */ - public function normalize($object, $format = null, array $context = array()) - { - - } + /** + * {@inheritdoc} + */ + public function normalize($object, $format = null, array $context = array()) + { + } - /** - * {@inheritdoc} - */ - public function supportsNormalization($data, $format = null) - { - return TRUE; - } + /** + * {@inheritdoc} + */ + public function supportsNormalization($data, $format = null) + { + return true; + } } diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php index 99ec90cfe3..3c189461f2 100644 --- a/src/Symfony/Component/Serializer/Tests/SerializerTest.php +++ b/src/Symfony/Component/Serializer/Tests/SerializerTest.php @@ -50,8 +50,8 @@ class SerializerTest extends \PHPUnit_Framework_TestCase */ public function testNormalizeOnDenormalizer() { - $this->serializer = new Serializer(array(new TestDenormalizer()), array()); - $this->assertTrue($this->serializer->normalize(new \stdClass, 'json')); + $this->serializer = new Serializer(array(new TestDenormalizer()), array()); + $this->assertTrue($this->serializer->normalize(new \stdClass, 'json')); } /** @@ -68,9 +68,9 @@ class SerializerTest extends \PHPUnit_Framework_TestCase */ public function testDenormalizeOnNormalizer() { - $this->serializer = new Serializer(array(new TestNormalizer()), array()); - $data = array('title' => 'foo', 'numbers' => array(5, 3)); - $this->assertTrue($this->serializer->denormalize(json_encode($data), 'stdClass', 'json')); + $this->serializer = new Serializer(array(new TestNormalizer()), array()); + $data = array('title' => 'foo', 'numbers' => array(5, 3)); + $this->assertTrue($this->serializer->denormalize(json_encode($data), 'stdClass', 'json')); } public function testSerialize() @@ -244,5 +244,4 @@ class Model { return array('title' => $this->title, 'numbers' => $this->numbers); } - }