getReflectionProperty refactor

ivoba · ivoba · commit ae7cb0501ef1 · 2017-10-11T08:20:00.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -163,22 +163,15 @@ protected function setAttributeValue($object, $attribute, $value, $format = null
      */
     private function getReflectionProperty($classOrObject, $attribute)
     {
-        $class = is_string($classOrObject) ? $classOrObject : get_class($classOrObject);
-
-        try {
-            return new \ReflectionProperty($class, $attribute);
-        } catch (\ReflectionException $e) {
-            $class = new \ReflectionClass($class);
-
-            while ($parent = $class->getParentClass()) {
-                try {
-                    return new \ReflectionProperty($parent->getName(), $attribute);
-                } catch (\ReflectionException $e) {
-                    $class = $parent;
+        $reflectionClass = new \ReflectionClass($classOrObject);
+        while (true) {
+            try {
+                return $reflectionClass->getProperty($attribute);
+            } catch (\ReflectionException $e) {
+                if (!$reflectionClass = $reflectionClass->getParentClass()) {
+                    throw $e;
                 }
             }
-
-            throw $e;
         }
     }
 }
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/GroupDummyChild.php b/src/Symfony/Component/Serializer/Tests/Fixtures/GroupDummyChild.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+class GroupDummyChild extends GroupDummy
+{
+    private $baz;
+
+    /**
+     * @return mixed
+     */
+    public function getBaz()
+    {
+        return $this->baz;
+    }
+
+    /**
+     * @param mixed $baz
+     */
+    public function setBaz($baz)
+    {
+        $this->baz = $baz;
+    }
+}
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
@@ -20,6 +20,7 @@
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\GroupDummy;
+use Symfony\Component\Serializer\Tests\Fixtures\GroupDummyChild;
 use Symfony\Component\Serializer\Tests\Fixtures\MaxDepthDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\PropertyCircularReferenceDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\PropertySiblingHolder;
@@ -67,28 +68,30 @@ public function testDenormalize()
 
     public function testNormalizeWithParentClass()
     {
-        $group = new GroupDummy();
+        $group = new GroupDummyChild();
+        $group->setBaz('baz');
         $group->setFoo('foo');
         $group->setBar('bar');
         $group->setKevin('Kevin');
         $group->setCoopTilleuls('coop');
         $this->assertEquals(
             array('foo' => 'foo', 'bar' => 'bar', 'kevin' => 'Kevin',
-                  'coopTilleuls' => 'coop', 'fooBar' => null, 'symfony' => null, ),
+                  'coopTilleuls' => 'coop', 'fooBar' => null, 'symfony' => null, 'baz' => 'baz', ),
             $this->normalizer->normalize($group, 'any')
         );
     }
 
     public function testDenormalizeWithParentClass()
     {
         $obj = $this->normalizer->denormalize(
-            array('foo' => 'foo', 'bar' => 'bar', 'kevin' => 'Kevin'),
-            GroupDummy::class,
+            array('foo' => 'foo', 'bar' => 'bar', 'kevin' => 'Kevin', 'baz' => 'baz'),
+            GroupDummyChild::class,
             'any'
         );
         $this->assertEquals('foo', $obj->getFoo());
         $this->assertEquals('bar', $obj->getBar());
         $this->assertEquals('Kevin', $obj->getKevin());
+        $this->assertEquals('baz', $obj->getBaz());
         $this->assertNull($obj->getSymfony());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -163,22 +163,15 @@ protected function setAttributeValue($object, $attribute, $value, $format = null`
`163`	`163`	`*/`
`164`	`164`	`private function getReflectionProperty($classOrObject, $attribute)`
`165`	`165`	`{`
`166`		`- $class = is_string($classOrObject) ? $classOrObject : get_class($classOrObject);`
`167`		`-`
`168`		`- try {`
`169`		`- return new \ReflectionProperty($class, $attribute);`
`170`		`- } catch (\ReflectionException $e) {`
`171`		`- $class = new \ReflectionClass($class);`
`172`		`-`
`173`		`- while ($parent = $class->getParentClass()) {`
`174`		`- try {`
`175`		`- return new \ReflectionProperty($parent->getName(), $attribute);`
`176`		`- } catch (\ReflectionException $e) {`
`177`		`- $class = $parent;`
	`166`	`+ $reflectionClass = new \ReflectionClass($classOrObject);`
	`167`	`+ while (true) {`
	`168`	`+ try {`
	`169`	`+ return $reflectionClass->getProperty($attribute);`
	`170`	`+ } catch (\ReflectionException $e) {`
	`171`	`+ if (!$reflectionClass = $reflectionClass->getParentClass()) {`
	`172`	`+ throw $e;`
`178`	`173`	`}`
`179`	`174`	`}`
`180`		`-`
`181`		`- throw $e;`
`182`	`175`	`}`
`183`	`176`	`}`
`184`	`177`	`}`