Merge pull request #6 from gulaandrij/patch-1

Update BaseModel.php
zack6849 · Jan 9, 2020 · 0b3e09e · 0b3e09e
2 parents 3123f9d + c8e1bb0
commit 0b3e09e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Models/BaseModel.php b/src/Models/BaseModel.php
@@ -56,6 +56,12 @@ public function toArray()
             if (is_object($value) && $value instanceof Arrayable) {
                 $object[$key] = $value->toArray();
             }
+
+            if (is_array($value)) {
+                $object[$key] = array_map(static function ($item) {
+                    return is_object($item) && $item instanceof Arrayable ? $item->toArray() : $item;
+                }, $value);
+            }
         }
 
         return $object;
@@ -166,4 +172,4 @@ function jsonSerialize()
     {
         return $this;
     }
-}
+}