Merge pull request #385 from martio/fix/laravel-data-model-normalizer

Add support for models without all columns
spatie · Mar 24, 2023 · b6b9d96 · b6b9d96
2 parents 869b876 + 5d34412
commit b6b9d96
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Normalizers/ModelNormalizer.php b/src/Normalizers/ModelNormalizer.php
@@ -16,19 +16,25 @@ public function normalize(mixed $value): ?array
         $properties = $value->toArray();
 
         foreach ($value->getDates() as $key) {
-            $properties[$key] = $value->getAttribute($key);
+            if (isset($properties[$key])) {
+                $properties[$key] = $value->getAttribute($key);
+            }
         }
 
         foreach ($value->getCasts() as $key => $cast) {
             if ($this->isDateCast($cast)) {
-                $properties[$key] = $value->getAttribute($key);
+                if (isset($properties[$key])) {
+                    $properties[$key] = $value->getAttribute($key);
+                }
             }
         }
 
         foreach ($value->getRelations() as $key => $relation) {
             $key = $value::$snakeAttributes ? Str::snake($key) : $key;
 
-            $properties[$key] = $relation;
+            if (isset($properties[$key])) {
+                $properties[$key] = $relation;
+            }
         }
 
         return $properties;