[8.x] Allow nullable columns for AsArrayObject/AsCollection casts (#3…

…6526) * Update AsArrayObject.php * Update AsCollection.php * return null * return null * formatting
laravel · Mar 10, 2021 · b7ceae1 · b7ceae1
1 parent 12b3d57
commit b7ceae1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Casts/AsArrayObject.php b/src/Illuminate/Database/Eloquent/Casts/AsArrayObject.php
@@ -18,7 +18,7 @@ public static function castUsing(array $arguments)
         return new class implements CastsAttributes {
             public function get($model, $key, $value, $attributes)
             {
-                return new ArrayObject(json_decode($attributes[$key], true));
+                return isset($attributes[$key]) ? new ArrayObject(json_decode($attributes[$key], true)) : null;
             }
 
             public function set($model, $key, $value, $attributes)

diff --git a/src/Illuminate/Database/Eloquent/Casts/AsCollection.php b/src/Illuminate/Database/Eloquent/Casts/AsCollection.php
@@ -19,7 +19,7 @@ public static function castUsing(array $arguments)
         return new class implements CastsAttributes {
             public function get($model, $key, $value, $attributes)
             {
-                return new Collection(json_decode($attributes[$key], true));
+                return isset($attributes[$key]) ? new Collection(json_decode($attributes[$key], true)) : null;
             }
 
             public function set($model, $key, $value, $attributes)