Return null instead of empty array object or collection for non-array

laravel · Apr 4, 2022 · 156773c · 156773c
1 parent e5646d9
commit 156773c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Casts/AsArrayObject.php b/src/Illuminate/Database/Eloquent/Casts/AsArrayObject.php
@@ -21,7 +21,7 @@ public function get($model, $key, $value, $attributes)
             {
                 $data = json_decode($attributes[$key], true);
 
-                return is_array($data) ? new ArrayObject($data) : new ArrayObject();
+                return is_array($data) ? new ArrayObject($data) : 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
@@ -22,7 +22,7 @@ public function get($model, $key, $value, $attributes)
             {
                 $data = json_decode($attributes[$key], true);
 
-                return is_array($data) ? new Collection($data) : new Collection();
+                return is_array($data) ? new Collection($data) : null;
             }
 
             public function set($model, $key, $value, $attributes)

diff --git a/tests/Integration/Database/DatabaseCustomCastsTest.php b/tests/Integration/Database/DatabaseCustomCastsTest.php
@@ -98,9 +98,11 @@ public function test_custom_casting_nullable_values()
         $this->assertEmpty($model->collection);
         $this->assertSame('', (string) $model->stringable);
 
+        $model->array_object = ['name' => 'John'];
         $model->array_object['name'] = 'Taylor';
         $model->array_object['meta']['title'] = 'Developer';
 
+        $model->array_object_json = ['name' => 'John'];
         $model->array_object_json['name'] = 'Taylor';
         $model->array_object_json['meta']['title'] = 'Developer';