getReflectionProperty refactor

ivoba · ivoba · commit 880bebe3da84 · 2017-09-28T18:06:03.000+02:00
diff --git a/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
@@ -164,21 +164,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;
+        while (true) {
+            try {
+                return isset($reflectionClass) ? $reflectionClass->getProperty($attribute) : new \ReflectionProperty($class, $attribute);
+            } catch (\ReflectionException $e) {
+                $reflectionClass = new \ReflectionClass($class);
+                if (!$reflectionClass = $reflectionClass->getParentClass()) {
+                    throw $e;
                 }
             }
-
-            throw $e;
         }
     }
 }

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