From a56b325307c4007790c26bf5b2dcbcc405229861 Mon Sep 17 00:00:00 2001
From: Meritoo <github@meritoo.pl>
Date: Sat, 13 Apr 2019 18:32:44 +0200
Subject: [PATCH] Minor refactoring

---
 src/Utilities/Reflection.php       |  4 ++--
 tests/Utilities/Reflection/F.php   |  4 ++--
 tests/Utilities/ReflectionTest.php | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/Utilities/Reflection.php b/src/Utilities/Reflection.php
index 3336cf2..66d5e28 100644
--- a/src/Utilities/Reflection.php
+++ b/src/Utilities/Reflection.php
@@ -322,8 +322,8 @@ class Reflection
         $values = [];
         $objects = Arrays::makeArray($objects);
 
-        foreach ($objects as $entity) {
-            $value = self::getPropertyValue($entity, $property, $force);
+        foreach ($objects as $object) {
+            $value = self::getPropertyValue($object, $property, $force);
 
             if (null !== $value) {
                 $values[] = $value;
diff --git a/tests/Utilities/Reflection/F.php b/tests/Utilities/Reflection/F.php
index 574a4d2..de53f7b 100644
--- a/tests/Utilities/Reflection/F.php
+++ b/tests/Utilities/Reflection/F.php
@@ -21,7 +21,7 @@ class F
     private $accountBalance;
     private $city;
     private $country;
-    private $gInstance;
+    private $g;
 
     public function __construct($accountBalance, $city, $country, $username, $firstName = 'John', $lastName = 'Scott')
     {
@@ -29,7 +29,7 @@ class F
         $this->city = $city;
         $this->country = $country;
         $this->username = $username;
-        $this->gInstance = new G($firstName, $lastName);
+        $this->g = new G($firstName, $lastName);
 
         // Called to avoid "Unused private method getAccountBalance" warning only
         $this->getAccountBalance();
diff --git a/tests/Utilities/ReflectionTest.php b/tests/Utilities/ReflectionTest.php
index 2d1770c..86810d2 100644
--- a/tests/Utilities/ReflectionTest.php
+++ b/tests/Utilities/ReflectionTest.php
@@ -35,7 +35,7 @@ use ReflectionProperty;
  * @copyright Meritoo <http://www.meritoo.pl>
  *
  * @internal
- * @covers \Meritoo\Common\Utilities\Reflection
+ * @covers    \Meritoo\Common\Utilities\Reflection
  */
 class ReflectionTest extends BaseTestCase
 {
@@ -274,7 +274,7 @@ class ReflectionTest extends BaseTestCase
     public function testGetPropertyValueFromChain()
     {
         $f = new F(1000, 'New York', 'USA', 'john.scott');
-        self::assertEquals('John', Reflection::getPropertyValue($f, 'gInstance.firstName'));
+        self::assertEquals('John', Reflection::getPropertyValue($f, 'g.firstName'));
     }
 
     public function testGetPropertyValueWithPublicGetter()
@@ -381,8 +381,8 @@ class ReflectionTest extends BaseTestCase
     {
         $f = new F(1000, 'New York', 'USA', 'john.scott');
 
-        self::assertEquals(['John'], Reflection::getPropertyValues($f, 'gInstance.firstName'));
-        self::assertEquals(['John'], Reflection::getPropertyValues($f, 'gInstance.firstName', true));
+        self::assertEquals(['John'], Reflection::getPropertyValues($f, 'g.firstName'));
+        self::assertEquals(['John'], Reflection::getPropertyValues($f, 'g.firstName', true));
     }
 
     public function testGetPropertyValuesFromChainAndMultipleObjects()
@@ -399,13 +399,13 @@ class ReflectionTest extends BaseTestCase
             new F(3000, 'Tokyo', 'Japan', 'john.scott', 'Peter', 'Brown'),
         ];
 
-        self::assertEquals($expected, Reflection::getPropertyValues($objects, 'gInstance.firstName'));
-        self::assertEquals($expected, Reflection::getPropertyValues($objects, 'gInstance.firstName', true));
+        self::assertEquals($expected, Reflection::getPropertyValues($objects, 'g.firstName'));
+        self::assertEquals($expected, Reflection::getPropertyValues($objects, 'g.firstName', true));
 
         $collection = new Collection($objects);
 
-        self::assertEquals($expected, Reflection::getPropertyValues($collection, 'gInstance.firstName'));
-        self::assertEquals($expected, Reflection::getPropertyValues($collection, 'gInstance.firstName', true));
+        self::assertEquals($expected, Reflection::getPropertyValues($collection, 'g.firstName'));
+        self::assertEquals($expected, Reflection::getPropertyValues($collection, 'g.firstName', true));
     }
 
     public function testGetMaxNumberConstantUsingClassWithoutConstants()
@@ -730,7 +730,7 @@ class ReflectionTest extends BaseTestCase
                 'UnKnown'
             ),
             [
-                'gInstance' => new G(),
+                'g' => new G(),
             ],
         ];