Fix Relation Array Handling

marcreichel · Jan 16, 2019 · 1d3b8ba · 1d3b8ba
1 parent d0a2adb
commit 1d3b8ba
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/Models/Model.php b/src/Models/Model.php
@@ -272,6 +272,11 @@ public function toArray(): array
     {
         $attributes = collect($this->attributes);
         $relations = collect($this->relations)->map(function($relation) {
+            if (is_array($relation)) {
+                return collect($relation)->map(function($single) {
+                    return $single->toArray();
+                });
+            }
             return $relation->toArray();
         });
         return $attributes->merge($relations)->sortKeys()->toArray();
@@ -284,6 +289,11 @@ public function toJson(): string
     {
         $attributes = collect($this->attributes);
         $relations = collect($this->relations)->map(function($relation) {
+            if (is_array($relation)) {
+                return collect($relation)->map(function($single) {
+                    return $single->toJson();
+                });
+            }
             return $relation->toJson();
         });
         return $attributes->merge($relations)->sortKeys()->toJson();