improve array handling in getObjectWrapperAsArray once more (#4)

* Saves originalData and introduces method `getOriginalData` to access it; Adds method `getDataAsArray` to get data in array form

* remove clone

* improve array handling in getObjectWrapperAsArray

* improve array handling in getObjectWrapperAsArray once more

Author: vbartusevicius

src/ObjectWrapper.php

@@ -184,10 +184,23 @@ private function getObjectWrapperAsArray(ObjectWrapper $objectWrapper)
                 $data[$key] = $this->getObjectWrapperAsArray($item);
                 continue;
             } elseif (is_array($item)) {
-                $data[$key] = [];
-                foreach ($item as $arrayKey => $arrayItem) {
-                    $data[$key][$arrayKey] = $this->getObjectWrapperAsArray($arrayItem);
-                }
+                $data[$key] = $this->getObjectWrapperFromArray($item);
+            } else {
+                $data[$key] = $item;
+            }
+        }
+
+        return $data;
+    }
+
+    private function getObjectWrapperFromArray(array $list)
+    {
+        $data = [];
+        foreach ($list as $key => $item) {
+            if ($item instanceof ObjectWrapper) {
+                $data[$key] = $this->getObjectWrapperAsArray($item);
+            } elseif (is_array($item)) {
+                $data[$key] = $this->getObjectWrapperFromArray($item);
             } else {
                 $data[$key] = $item;
             }

tests/ObjectWrapperTest.php

@@ -411,7 +411,7 @@ public function testGetOriginalDataAsArray()
         $secondArrayItem->b = 2;
         $thirdArrayItem = new stdClass();
         $thirdArrayItem->c = 3;
-        $data->b = [$firstArrayItem, $secondArrayItem, $thirdArrayItem];
+        $data->b = [$firstArrayItem, $secondArrayItem, $thirdArrayItem, 4];
 
         $object = new ObjectWrapper($data);
         $originalData = $object->getDataAsArray();
@@ -422,6 +422,7 @@ public function testGetOriginalDataAsArray()
                 ['a' => 1],
                 ['b' => 2],
                 ['c' => 3],
+                4,
             ],
         ];
         $this->assertDeepEquals($expectedArray, $originalData);