fixed various inconsistencies

fabpot · fabpot · commit 06b6ad007369 · 2014-02-11T11:29:24.000+01:00
diff --git a/Normalizer/CustomNormalizer.php b/Normalizer/CustomNormalizer.php
@@ -29,7 +29,7 @@ public function normalize($object, $format = null, array $context = array())
      */
     public function denormalize($data, $class, $format = null, array $context = array())
     {
-        $object = new $class;
+        $object = new $class();
         $object->denormalize($this->serializer, $data, $format, $context);
 
         return $object;
diff --git a/Tests/Encoder/JsonEncoderTest.php b/Tests/Encoder/JsonEncoderTest.php
@@ -19,13 +19,13 @@ class JsonEncoderTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        $this->encoder = new JsonEncoder;
+        $this->encoder = new JsonEncoder();
         $this->serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));
     }
 
     public function testEncodeScalar()
     {
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $obj->foo = "foo";
 
         $expected = '{"foo":"foo"}';
@@ -68,7 +68,7 @@ protected function getJsonSource()
 
     protected function getObject()
     {
-        $obj = new \stdClass;
+        $obj = new \stdClass();
         $obj->foo = 'foo';
         $obj->bar = array('a', 'b');
         $obj->baz = array('key' => 'val', 'key2' => 'val', 'A B' => 'bar', 'item' => array(array('title' => 'title1'), array('title' => 'title2')), 'Barry' => array('FooBar' => array('Baz' => 'Ed', '@id' => 1)));
diff --git a/Tests/Encoder/XmlEncoderTest.php b/Tests/Encoder/XmlEncoderTest.php
@@ -24,14 +24,14 @@ class XmlEncoderTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->encoder = new XmlEncoder;
+        $this->encoder = new XmlEncoder();
         $serializer = new Serializer(array(new CustomNormalizer()), array('xml' => new XmlEncoder()));
         $this->encoder->setSerializer($serializer);
     }
 
     public function testEncodeScalar()
     {
-        $obj = new ScalarDummy;
+        $obj = new ScalarDummy();
         $obj->xmlFoo = "foo";
 
         $expected = '<?xml version="1.0"?>'."\n".
@@ -42,7 +42,7 @@ public function testEncodeScalar()
 
     public function testSetRootNodeName()
     {
-        $obj = new ScalarDummy;
+        $obj = new ScalarDummy();
         $obj->xmlFoo = "foo";
 
         $this->encoder->setRootNodeName('test');
@@ -63,7 +63,7 @@ public function testDocTypeIsNotAllowed()
 
     public function testAttributes()
     {
-        $obj = new ScalarDummy;
+        $obj = new ScalarDummy();
         $obj->xmlFoo = array(
             'foo-bar' => array(
                 '@id' => 1,
@@ -92,7 +92,7 @@ public function testAttributes()
 
     public function testElementNameValid()
     {
-        $obj = new ScalarDummy;
+        $obj = new ScalarDummy();
         $obj->xmlFoo = array(
             'foo-bar' => 'a',
             'foo_bar' => 'a',
@@ -345,7 +345,7 @@ protected function getXmlSource()
 
     protected function getObject()
     {
-        $obj = new Dummy;
+        $obj = new Dummy();
         $obj->foo = 'foo';
         $obj->bar = array('a', 'b');
         $obj->baz = array('key' => 'val', 'key2' => 'val', 'A B' => 'bar', 'item' => array(array('title' => 'title1'), array('title' => 'title2')), 'Barry' => array('FooBar' => array('Baz' => 'Ed', '@id' => 1)));
diff --git a/Tests/Normalizer/CustomNormalizerTest.php b/Tests/Normalizer/CustomNormalizerTest.php
@@ -19,13 +19,13 @@ class CustomNormalizerTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        $this->normalizer = new CustomNormalizer;
-        $this->normalizer->setSerializer(new Serializer);
+        $this->normalizer = new CustomNormalizer();
+        $this->normalizer->setSerializer(new Serializer());
     }
 
     public function testSerialize()
     {
-        $obj = new ScalarDummy;
+        $obj = new ScalarDummy();
         $obj->foo = 'foo';
         $obj->xmlFoo = 'xml';
         $this->assertEquals('foo', $this->normalizer->normalize($obj, 'json'));
@@ -34,19 +34,19 @@ public function testSerialize()
 
     public function testDeserialize()
     {
-        $obj = $this->normalizer->denormalize('foo', get_class(new ScalarDummy), 'xml');
+        $obj = $this->normalizer->denormalize('foo', get_class(new ScalarDummy()), 'xml');
         $this->assertEquals('foo', $obj->xmlFoo);
         $this->assertNull($obj->foo);
 
-        $obj = $this->normalizer->denormalize('foo', get_class(new ScalarDummy), 'json');
+        $obj = $this->normalizer->denormalize('foo', get_class(new ScalarDummy()), 'json');
         $this->assertEquals('foo', $obj->foo);
         $this->assertNull($obj->xmlFoo);
     }
 
     public function testSupportsNormalization()
     {
-        $this->assertTrue($this->normalizer->supportsNormalization(new ScalarDummy));
-        $this->assertFalse($this->normalizer->supportsNormalization(new \stdClass));
+        $this->assertTrue($this->normalizer->supportsNormalization(new ScalarDummy()));
+        $this->assertFalse($this->normalizer->supportsNormalization(new \stdClass()));
     }
 
     public function testSupportsDenormalization()
diff --git a/Tests/Normalizer/GetSetMethodNormalizerTest.php b/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -17,13 +17,13 @@ class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase
 {
     protected function setUp()
     {
-        $this->normalizer = new GetSetMethodNormalizer;
+        $this->normalizer = new GetSetMethodNormalizer();
         $this->normalizer->setSerializer($this->getMock('Symfony\Component\Serializer\Serializer'));
     }
 
     public function testNormalize()
     {
-        $obj = new GetSetDummy;
+        $obj = new GetSetDummy();
         $obj->setFoo('foo');
         $obj->setBar('bar');
         $obj->setCamelCase('camelcase');
@@ -118,7 +118,7 @@ public function testIgnoredAttributes()
     {
         $this->normalizer->setIgnoredAttributes(array('foo', 'bar', 'camelCase'));
 
-        $obj = new GetSetDummy;
+        $obj = new GetSetDummy();
         $obj->setFoo('foo');
         $obj->setBar('bar');
 
diff --git a/Tests/SerializerTest.php b/Tests/SerializerTest.php
@@ -28,20 +28,20 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
     public function testNormalizeNoMatch()
     {
         $this->serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));
-        $this->serializer->normalize(new \stdClass, 'xml');
+        $this->serializer->normalize(new \stdClass(), 'xml');
     }
 
     public function testNormalizeTraversable()
     {
         $this->serializer = new Serializer(array(), array('json' => new JsonEncoder()));
-        $result = $this->serializer->serialize(new TraversableDummy, 'json');
+        $result = $this->serializer->serialize(new TraversableDummy(), 'json');
         $this->assertEquals('{"foo":"foo","bar":"bar"}', $result);
     }
 
     public function testNormalizeGivesPriorityToInterfaceOverTraversable()
     {
-        $this->serializer = new Serializer(array(new CustomNormalizer), array('json' => new JsonEncoder()));
-        $result = $this->serializer->serialize(new NormalizableTraversableDummy, 'json');
+        $this->serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));
+        $result = $this->serializer->serialize(new NormalizableTraversableDummy(), 'json');
         $this->assertEquals('{"foo":"normalizedFoo","bar":"normalizedBar"}', $result);
     }
 
@@ -51,7 +51,7 @@ public function testNormalizeGivesPriorityToInterfaceOverTraversable()
     public function testNormalizeOnDenormalizer()
     {
         $this->serializer = new Serializer(array(new TestDenormalizer()), array());
-        $this->assertTrue($this->serializer->normalize(new \stdClass, 'json'));
+        $this->assertTrue($this->serializer->normalize(new \stdClass(), 'json'));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function normalize($object, $format = null, array $context = array())`
`29`	`29`	`*/`
`30`	`30`	`public function denormalize($data, $class, $format = null, array $context = array())`
`31`	`31`	`{`
`32`		`- $object = new $class;`
	`32`	`+ $object = new $class();`
`33`	`33`	`$object->denormalize($this->serializer, $data, $format, $context);`
`34`	`34`
`35`	`35`	`return $object;`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@ class JsonEncoderTest extends \PHPUnit_Framework_TestCase`
`19`	`19`	`{`
`20`	`20`	`protected function setUp()`
`21`	`21`	`{`
`22`		`- $this->encoder = new JsonEncoder;`
	`22`	`+ $this->encoder = new JsonEncoder();`
`23`	`23`	`$this->serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function testEncodeScalar()`
`27`	`27`	`{`
`28`		`- $obj = new \stdClass;`
	`28`	`+ $obj = new \stdClass();`
`29`	`29`	`$obj->foo = "foo";`
`30`	`30`
`31`	`31`	`$expected = '{"foo":"foo"}';`
`@@ -68,7 +68,7 @@ protected function getJsonSource()`
`68`	`68`
`69`	`69`	`protected function getObject()`
`70`	`70`	`{`
`71`		`- $obj = new \stdClass;`
	`71`	`+ $obj = new \stdClass();`
`72`	`72`	`$obj->foo = 'foo';`
`73`	`73`	`$obj->bar = array('a', 'b');`
`74`	`74`	`$obj->baz = array('key' => 'val', 'key2' => 'val', 'A B' => 'bar', 'item' => array(array('title' => 'title1'), array('title' => 'title2')), 'Barry' => array('FooBar' => array('Baz' => 'Ed', '@id' => 1)));`
Original file line number	Diff line number	Diff line change
`@@ -19,13 +19,13 @@ class CustomNormalizerTest extends \PHPUnit_Framework_TestCase`
`19`	`19`	`{`
`20`	`20`	`protected function setUp()`
`21`	`21`	`{`
`22`		`- $this->normalizer = new CustomNormalizer;`
`23`		`- $this->normalizer->setSerializer(new Serializer);`
	`22`	`+ $this->normalizer = new CustomNormalizer();`
	`23`	`+ $this->normalizer->setSerializer(new Serializer());`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public function testSerialize()`
`27`	`27`	`{`
`28`		`- $obj = new ScalarDummy;`
	`28`	`+ $obj = new ScalarDummy();`
`29`	`29`	`$obj->foo = 'foo';`
`30`	`30`	`$obj->xmlFoo = 'xml';`
`31`	`31`	`$this->assertEquals('foo', $this->normalizer->normalize($obj, 'json'));`
`@@ -34,19 +34,19 @@ public function testSerialize()`
`34`	`34`
`35`	`35`	`public function testDeserialize()`
`36`	`36`	`{`
`37`		`- $obj = $this->normalizer->denormalize('foo', get_class(new ScalarDummy), 'xml');`
	`37`	`+ $obj = $this->normalizer->denormalize('foo', get_class(new ScalarDummy()), 'xml');`
`38`	`38`	`$this->assertEquals('foo', $obj->xmlFoo);`
`39`	`39`	`$this->assertNull($obj->foo);`
`40`	`40`
`41`		`- $obj = $this->normalizer->denormalize('foo', get_class(new ScalarDummy), 'json');`
	`41`	`+ $obj = $this->normalizer->denormalize('foo', get_class(new ScalarDummy()), 'json');`
`42`	`42`	`$this->assertEquals('foo', $obj->foo);`
`43`	`43`	`$this->assertNull($obj->xmlFoo);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public function testSupportsNormalization()`
`47`	`47`	`{`
`48`		`- $this->assertTrue($this->normalizer->supportsNormalization(new ScalarDummy));`
`49`		`- $this->assertFalse($this->normalizer->supportsNormalization(new \stdClass));`
	`48`	`+ $this->assertTrue($this->normalizer->supportsNormalization(new ScalarDummy()));`
	`49`	`+ $this->assertFalse($this->normalizer->supportsNormalization(new \stdClass()));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`public function testSupportsDenormalization()`
Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,13 @@ class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase`
`17`	`17`	`{`
`18`	`18`	`protected function setUp()`
`19`	`19`	`{`
`20`		`- $this->normalizer = new GetSetMethodNormalizer;`
	`20`	`+ $this->normalizer = new GetSetMethodNormalizer();`
`21`	`21`	`$this->normalizer->setSerializer($this->getMock('Symfony\Component\Serializer\Serializer'));`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public function testNormalize()`
`25`	`25`	`{`
`26`		`- $obj = new GetSetDummy;`
	`26`	`+ $obj = new GetSetDummy();`
`27`	`27`	`$obj->setFoo('foo');`
`28`	`28`	`$obj->setBar('bar');`
`29`	`29`	`$obj->setCamelCase('camelcase');`
`@@ -118,7 +118,7 @@ public function testIgnoredAttributes()`
`118`	`118`	`{`
`119`	`119`	`$this->normalizer->setIgnoredAttributes(array('foo', 'bar', 'camelCase'));`
`120`	`120`
`121`		`- $obj = new GetSetDummy;`
	`121`	`+ $obj = new GetSetDummy();`
`122`	`122`	`$obj->setFoo('foo');`
`123`	`123`	`$obj->setBar('bar');`
`124`	`124`
Original file line number	Diff line number	Diff line change
`@@ -28,20 +28,20 @@ class SerializerTest extends \PHPUnit_Framework_TestCase`
`28`	`28`	`public function testNormalizeNoMatch()`
`29`	`29`	`{`
`30`	`30`	`$this->serializer = new Serializer(array($this->getMock('Symfony\Component\Serializer\Normalizer\CustomNormalizer')));`
`31`		`- $this->serializer->normalize(new \stdClass, 'xml');`
	`31`	`+ $this->serializer->normalize(new \stdClass(), 'xml');`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public function testNormalizeTraversable()`
`35`	`35`	`{`
`36`	`36`	`$this->serializer = new Serializer(array(), array('json' => new JsonEncoder()));`
`37`		`- $result = $this->serializer->serialize(new TraversableDummy, 'json');`
	`37`	`+ $result = $this->serializer->serialize(new TraversableDummy(), 'json');`
`38`	`38`	`$this->assertEquals('{"foo":"foo","bar":"bar"}', $result);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function testNormalizeGivesPriorityToInterfaceOverTraversable()`
`42`	`42`	`{`
`43`		`- $this->serializer = new Serializer(array(new CustomNormalizer), array('json' => new JsonEncoder()));`
`44`		`- $result = $this->serializer->serialize(new NormalizableTraversableDummy, 'json');`
	`43`	`+ $this->serializer = new Serializer(array(new CustomNormalizer()), array('json' => new JsonEncoder()));`
	`44`	`+ $result = $this->serializer->serialize(new NormalizableTraversableDummy(), 'json');`
`45`	`45`	`$this->assertEquals('{"foo":"normalizedFoo","bar":"normalizedBar"}', $result);`
`46`	`46`	`}`
`47`	`47`
`@@ -51,7 +51,7 @@ public function testNormalizeGivesPriorityToInterfaceOverTraversable()`
`51`	`51`	`public function testNormalizeOnDenormalizer()`
`52`	`52`	`{`
`53`	`53`	`$this->serializer = new Serializer(array(new TestDenormalizer()), array());`
`54`		`- $this->assertTrue($this->serializer->normalize(new \stdClass, 'json'));`
	`54`	`+ $this->assertTrue($this->serializer->normalize(new \stdClass(), 'json'));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`