symfony
diff --git a/‎src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php
Lines changed: 3 additions & 2 deletions b/‎src/Symfony/Component/Serializer/Normalizer/ObjectToPopulateTrait.php
Lines changed: 3 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Serializer/Tests/Normalizer/ObjectToPopulateTraitTest.php
Lines changed: 7 additions & 7 deletions b/‎src/Symfony/Component/Serializer/Tests/Normalizer/ObjectToPopulateTraitTest.php
Lines changed: 7 additions & 7 deletions
@@ -319,8 +319,9 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref
             $format = null;
         }
 
-        if (null != $object = $this->extractObjectToPopulate($class, $context, static::OBJECT_TO_POPULATE)) {
+        if (null !== $object = $this->extractObjectToPopulate($class, $context, static::OBJECT_TO_POPULATE)) {
             unset($context[static::OBJECT_TO_POPULATE]);
+
             return $object;
         }
 
 
@@ -20,10 +20,11 @@ trait ObjectToPopulateTrait
      * @param string $class The class the object should be
      * @param $context The denormalization context
      * @param string $key They in which to look for the object to populate.
-     *        Keeps backwards compatability with `AbstractNormalizer.
+     *                    Keeps backwards compatability with `AbstractNormalizer.
+     *
      * @return object|null An object if things check out, null otherwise.
      */
-    protected function extractObjectToPopulate($class, array $context, $key=null)
+    protected function extractObjectToPopulate($class, array $context, $key = null)
     {
         $key = $key ?: 'object_to_populate';
 
 
@@ -59,9 +59,9 @@ public function testDeserialize()
     public function testDenormalizeWithObjectToPopulateUsesProvidedObject()
     {
         $expected = new ScalarDummy();
-        $obj = $this->normalizer->denormalize('foo', ScalarDummy::class, 'json', [
+        $obj = $this->normalizer->denormalize('foo', ScalarDummy::class, 'json', array(
             'object_to_populate' => $expected,
-        ]);
+        ));
 
         $this->assertSame($expected, $obj);
         $this->assertEquals('foo', $obj->foo);
 
@@ -12,35 +12,35 @@ class ObjectToPopulateTraitTest extends TestCase
 
     public function testExtractObjectToPopulateReturnsNullWhenKeyIsMissing()
     {
-        $object = $this->extractObjectToPopulate(ProxyDummy::class, []);
+        $object = $this->extractObjectToPopulate(ProxyDummy::class, array());
 
         $this->assertNull($object);
     }
 
     public function testExtractObjectToPopulateReturnsNullWhenNonObjectIsProvided()
     {
-        $object = $this->extractObjectToPopulate(ProxyDummy::class, [
+        $object = $this->extractObjectToPopulate(ProxyDummy::class, array(
             'object_to_populate' => 'not an object',
-        ]);
+        ));
 
         $this->assertNull($object);
     }
 
     public function testExtractObjectToPopulateReturnsNullWhenTheClassIsNotAnInstanceOfTheProvidedClass()
     {
-        $object = $this->extractObjectToPopulate(ProxyDummy::class, [
+        $object = $this->extractObjectToPopulate(ProxyDummy::class, array(
             'object_to_populate' => new \stdClass(),
-        ]);
+        ));
 
         $this->assertNull($object);
     }
 
     public function testExtractObjectToPopulateReturnsObjectWhenEverythingChecksOut()
     {
         $expected = new ProxyDummy();
-        $object = $this->extractObjectToPopulate(ProxyDummy::class, [
+        $object = $this->extractObjectToPopulate(ProxyDummy::class, array(
             'object_to_populate' => $expected,
-        ]);
+        ));
 
         $this->assertSame($expected, $object);
     }
Original file line number	Diff line number	Diff line change
`@@ -319,8 +319,9 @@ protected function instantiateObject(array &$data, $class, array &$context, \Ref`
`319`	`319`	`$format = null;`
`320`	`320`	`}`
`321`	`321`
`322`		`- if (null != $object = $this->extractObjectToPopulate($class, $context, static::OBJECT_TO_POPULATE)) {`
	`322`	`+ if (null !== $object = $this->extractObjectToPopulate($class, $context, static::OBJECT_TO_POPULATE)) {`
`323`	`323`	`unset($context[static::OBJECT_TO_POPULATE]);`
	`324`	`+`
`324`	`325`	`return $object;`
`325`	`326`	`}`
`326`	`327`
Original file line number	Diff line number	Diff line change
`@@ -12,35 +12,35 @@ class ObjectToPopulateTraitTest extends TestCase`
`12`	`12`
`13`	`13`	`public function testExtractObjectToPopulateReturnsNullWhenKeyIsMissing()`
`14`	`14`	`{`
`15`		`- $object = $this->extractObjectToPopulate(ProxyDummy::class, []);`
	`15`	`+ $object = $this->extractObjectToPopulate(ProxyDummy::class, array());`
`16`	`16`
`17`	`17`	`$this->assertNull($object);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public function testExtractObjectToPopulateReturnsNullWhenNonObjectIsProvided()`
`21`	`21`	`{`
`22`		`- $object = $this->extractObjectToPopulate(ProxyDummy::class, [`
	`22`	`+ $object = $this->extractObjectToPopulate(ProxyDummy::class, array(`
`23`	`23`	`'object_to_populate' => 'not an object',`
`24`		`- ]);`
	`24`	`+ ));`
`25`	`25`
`26`	`26`	`$this->assertNull($object);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public function testExtractObjectToPopulateReturnsNullWhenTheClassIsNotAnInstanceOfTheProvidedClass()`
`30`	`30`	`{`
`31`		`- $object = $this->extractObjectToPopulate(ProxyDummy::class, [`
	`31`	`+ $object = $this->extractObjectToPopulate(ProxyDummy::class, array(`
`32`	`32`	`'object_to_populate' => new \stdClass(),`
`33`		`- ]);`
	`33`	`+ ));`
`34`	`34`
`35`	`35`	`$this->assertNull($object);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public function testExtractObjectToPopulateReturnsObjectWhenEverythingChecksOut()`
`39`	`39`	`{`
`40`	`40`	`$expected = new ProxyDummy();`
`41`		`- $object = $this->extractObjectToPopulate(ProxyDummy::class, [`
	`41`	`+ $object = $this->extractObjectToPopulate(ProxyDummy::class, array(`
`42`	`42`	`'object_to_populate' => $expected,`
`43`		`- ]);`
	`43`	`+ ));`
`44`	`44`
`45`	`45`	`$this->assertSame($expected, $object);`
`46`	`46`	`}`