[8.x] Allow nullable columns for AsArrayObject/AsCollection casts (#36526)

tomirons · web-flow · commit b7ceae1761de · 2021-03-10T09:18:48.000-06:00
* Update AsArrayObject.php

* Update AsCollection.php

* return null

* return null

* formatting
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)

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static function castUsing(array $arguments)`
`18`	`18`	`return new class implements CastsAttributes {`
`19`	`19`	`public function get($model, $key, $value, $attributes)`
`20`	`20`	`{`
`21`		`- return new ArrayObject(json_decode($attributes[$key], true));`
	`21`	`+ return isset($attributes[$key]) ? new ArrayObject(json_decode($attributes[$key], true)) : null;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public function set($model, $key, $value, $attributes)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static function castUsing(array $arguments)`
`19`	`19`	`return new class implements CastsAttributes {`
`20`	`20`	`public function get($model, $key, $value, $attributes)`
`21`	`21`	`{`
`22`		`- return new Collection(json_decode($attributes[$key], true));`
	`22`	`+ return isset($attributes[$key]) ? new Collection(json_decode($attributes[$key], true)) : null;`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function set($model, $key, $value, $attributes)`