removing need for additional conditional block

sebastianbergmann · Jul 6, 2018 · a3992cb · a3992cb
1 parent 57c4368
commit a3992cb
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/src/Framework/Assert.php b/src/Framework/Assert.php
@@ -2351,30 +2351,23 @@ public static function getObjectAttribute($object, string $attributeName)
         }
 
         try {
-            $attribute = new ReflectionProperty($object, $attributeName);
-        } catch (ReflectionException $e) {
             $reflector = new ReflectionObject($object);
-
-            while ($reflector = $reflector->getParentClass()) {
+            do {
                 try {
                     $attribute = $reflector->getProperty($attributeName);
+                    if (!$attribute || $attribute->isPublic()) {
+                        return $object->$attributeName;
+                    }
+
+                    $attribute->setAccessible(true);
+                    $value = $attribute->getValue($object);
+                    $attribute->setAccessible(false);
 
-                    break;
+                    return $value;
                 } catch (ReflectionException $e) {
                 }
-            }
-        }
-
-        if (isset($attribute)) {
-            if (!$attribute || $attribute->isPublic()) {
-                return $object->$attributeName;
-            }
-
-            $attribute->setAccessible(true);
-            $value = $attribute->getValue($object);
-            $attribute->setAccessible(false);
-
-            return $value;
+            } while ($reflector = $reflector->getParentClass());
+        } catch (ReflectionException $e) {
         }
 
         throw new Exception(