🐛 Fix relations bug

marcreichel · Sep 3, 2023 · 5b9ebd8 · 5b9ebd8
1 parent 385feec
commit 5b9ebd8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
   "type": "library",
   "minimum-stability": "dev",
   "require": {
-    "php": "^8.0.2",
+    "php": "^8.1",
     "laravel/framework": "^8.40.0|^9.0|^10.0",
     "guzzlehttp/guzzle": "~6.0|~7.0",
     "nesbot/carbon": "^2.53.1",

diff --git a/src/Models/Model.php b/src/Models/Model.php
@@ -248,14 +248,16 @@ protected function setAttributes(array $attributes): void
     protected function setRelations(array $attributes): void
     {
         $this->relations = collect($attributes)
-            ->diffKeys($this->attributes)->map(function ($value, $key) {
-                if (is_array($value)) {
+            ->filter(fn ($value, $key) => array_key_exists($key, $this->casts))
+            ->map(function ($value, $key) {
+                if (is_array($value) && array_is_list($value)) {
                     return collect($value)->map(function ($value) use ($key) {
                         return $this->mapToModel($key, $value);
-                    });
+                    })->filter();
                 }
                 return $this->mapToModel($key, $value);
-            });
+            })
+            ->filter(fn (mixed $value): bool => $value instanceof Model || ($value instanceof \Illuminate\Support\Collection && !$value->isEmpty()));
     }
 
     /**
@@ -317,7 +319,7 @@ private function mapToModel(string $property, mixed $value): mixed
             return $value;
         }
 
-        if (is_object($value)) {
+        if (is_array($value) && !array_is_list($value)) {
             $properties = $this->getProperties($value);
 
             return new $class($properties);
@@ -335,7 +337,7 @@ private function mapToModel(string $property, mixed $value): mixed
             })->toArray();
         }
 
-        return [];
+        return null;
     }
 
     /**