auto handle Jsonable values passed to castAsJson() (#34392)

`Jsonable` objects can be passed in without having to manually call `toJson()`
laravel · Sep 17, 2020 · 58dc491 · 58dc491
1 parent 03e1373
commit 58dc491
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Illuminate/Foundation/Testing/Concerns/InteractsWithDatabase.php b/src/Illuminate/Foundation/Testing/Concerns/InteractsWithDatabase.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Foundation\Testing\Concerns;
 
+use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Arr;
@@ -127,7 +128,11 @@ protected function isSoftDeletableModel($model)
      */
     public function castAsJson($value)
     {
-        $value = is_array($value) ? json_encode($value) : $value;
+        if ($value instanceof Jsonable) {
+            $value = $value->toJson();
+        } elseif (is_array($value)) {
+            $value = json_encode($value);
+        }
 
         return DB::raw("CAST('$value' AS JSON)");
     }