Remove jsonable feature in favor of Laravel casts

src/Auth/Models/Preferences.php

@@ -27,9 +27,11 @@ class Preferences extends Model
     protected static $cache = [];
 
     /**
-     * @var array jsonable attribute names that are json encoded and decoded from the database
+     * @var array casts attribute types to convert automatically
      */
-    protected $jsonable = ['value'];
+    protected $casts = [
+        'value' => 'array'
+    ];
 
     /**
      * @var \October\Rain\Auth\Models\User userContext is the user that owns the preferences

src/Auth/Models/Role.php

@@ -30,9 +30,11 @@ class Role extends Model
     ];
 
     /**
-     * @var array jsonable attribute names that are json encoded and decoded from the database
+     * @var array casts attribute types to convert automatically
      */
-    protected $jsonable = ['permissions'];
+    protected $casts = [
+        'permissions' => 'array'
+    ];
 
     /**
      * @var array allowedPermissionsValues

src/Auth/Models/User.php

@@ -87,9 +87,11 @@ class User extends Model implements Authenticatable
     public $customMessages = [];
 
     /**
-     * @var array jsonable attribute names that are json encoded and decoded from the database
+     * @var array casts attribute types to convert automatically
      */
-    protected $jsonable = ['permissions'];
+    protected $casts = [
+        'permissions' => 'array'
+    ];
 
     /**
      * allowedPermissionsValues

src/Database/ExpandoModel.php

@@ -33,7 +33,7 @@ public function __construct(array $attributes = [])
         // Process attributes last for traits with attribute modifiers
         $this->bindEvent('model.beforeSaveDone', [$this, 'expandoBeforeSaveDone'], -1);
 
-        $this->addJsonable($this->expandoColumn);
+        $this->addCasts([$this->expandoColumn => 'array']);
     }
 
     /**

src/Database/Model.php

@@ -19,7 +19,6 @@
 class Model extends EloquentModel
 {
     use Concerns\HasEvents;
-    use Concerns\HasJsonable;
     use Concerns\HasAttributes;
     use Concerns\HasReplication;
     use Concerns\HasRelationships;

src/Database/Models/DeferredBinding.php

@@ -21,9 +21,11 @@ class DeferredBinding extends Model
     public $table = 'deferred_bindings';
 
     /**
-     * @var array jsonable attribute names that are json encoded and decoded from the database
+     * @var array casts attribute types to convert automatically
      */
-    protected $jsonable = ['pivot_data'];
+    protected $casts = [
+        'pivot_data' => 'array'
+    ];
 
     /**
      * @var array nullable attribute names which should be set to null when empty

src/Database/Traits/Validation.php

@@ -337,11 +337,6 @@ public function validate($rules = null, $customMessages = null, $attributeNames
         if (!empty($rules)) {
             $data = $this->getValidationAttributes();
 
-            // Decode jsonable attribute values
-            foreach ($this->getJsonable() as $jsonable) {
-                $data[$jsonable] = $this->getAttribute($jsonable);
-            }
-
             // Add relation values, if specified.
             foreach ($rules as $attribute => $rule) {
                 if (!$this->hasRelation($attribute) || array_key_exists($attribute, $data)) {

src/Scaffold/Console/contentfield/contentfield.stub

@@ -41,7 +41,7 @@ class {{studly_name}} extends ContentFieldBase
      */
     public function extendModelObject($model)
     {
-        $model->addJsonable($this->fieldName);
+        $model->addCasts([$this->fieldName => 'array']);
     }
 
     /**