Added casts properties to all models, re-ordered model properties. Fixes #916

app/Models/Component.php

@@ -23,16 +23,37 @@ class Component extends Model implements HasPresenter
     use SoftDeletes, ValidatingTrait;
 
     /**
-     * The validation rules.
+     * List of attributes that have default values.
+     *
+     * @var mixed[]
+     */
+    protected $attributes = [
+        'order'       => 0,
+        'group_id'    => 0,
+        'description' => '',
+        'link'        => '',
+    ];
+
+    /**
+     * The attributes that should be casted to native types.
      *
      * @var string[]
      */
-    public $rules = [
+    protected $casts = [
-        'name'   => 'required|string',
+        'id'          => 'int',
-        'status' => 'integer|required',
+        'order'       => 'int',
-        'link'   => 'url',
+        'group_id'    => 'int',
+        'description' => 'string',
+        'link'        => 'string',
     ];
 
+    /**
+     * The attributes that should be mutated to dates.
+     *
+     * @var array
+     */
+    protected $dates = ['deleted_at'];
+
     /**
      * The fillable properties.
      *
@@ -49,24 +70,16 @@ class Component extends Model implements HasPresenter
     ];
 
     /**
-     * List of attributes that have default values.
+     * The validation rules.
      *
-     * @var mixed[]
+     * @var string[]
      */
-    protected $attributes = [
+    public $rules = [
-        'order'       => 0,
+        'name'   => 'required|string',
-        'group_id'    => 0,
+        'status' => 'integer|required',
-        'description' => '',
+        'link'   => 'url',
-        'link'        => '',
     ];
 
-    /**
-     * The attributes that should be mutated to dates.
-     *
-     * @var array
-     */
-    protected $dates = ['deleted_at'];
-
     /**
      * Components can belong to a group.
      *

app/Models/ComponentGroup.php

@@ -24,8 +24,9 @@ class ComponentGroup extends Model
      * @var string[]
      */
     protected $casts = [
+        'id'    => 'int',
         'name'  => 'string',
-        'order' => 'integer',
+        'order' => 'int',
     ];
 
     /**

app/Models/Incident.php

@@ -23,18 +23,29 @@ class Incident extends Model implements HasPresenter
     use SoftDeletes, ValidatingTrait;
 
     /**
-     * The validation rules.
+     * The accessors to append to the model's serialized form.
      *
      * @var string[]
      */
-    public $rules = [
+    protected $appends = ['human_status'];
-        'component_id' => 'integer',
+
-        'name'         => 'required',
+    /**
-        'status'       => 'required|integer',
+     * The attributes that should be casted to native types.
-        'visible'      => 'required|boolean',
+     *
-        'message'      => 'required',
+     * @var string[]
+     */
+    protected $casts = [
+        'id'      => 'int',
+        'visible' => 'integer',
     ];
 
+    /**
+     * The attributes that should be mutated to dates.
+     *
+     * @var string[]
+     */
+    protected $dates = ['scheduled_at', 'deleted_at'];
+
     /**
      * The fillable properties.
      *
@@ -52,26 +63,16 @@ class Incident extends Model implements HasPresenter
     ];
 
     /**
-     * The accessors to append to the model's serialized form.
+     * The validation rules.
      *
      * @var string[]
      */
-    protected $appends = ['human_status'];
+    public $rules = [
-
+        'component_id' => 'integer',
-    /**
+        'name'         => 'required',
-     * The attributes that should be mutated to dates.
+        'status'       => 'required|integer',
-     *
+        'visible'      => 'required|boolean',
-     * @var string[]
+        'message'      => 'required',
-     */
-    protected $dates = ['scheduled_at', 'deleted_at'];
-
-    /**
-     * The attributes that should be casted to native types.
-     *
-     * @var string[]
-     */
-    protected $casts = [
-        'visible' => 'integer',
     ];
 
     /**

app/Models/IncidentTemplate.php

@@ -20,13 +20,14 @@ class IncidentTemplate extends Model
     use ValidatingTrait;
 
     /**
-     * The validation rules.
+     * The attributes that should be casted to native types.
      *
      * @var string[]
      */
-    public $rules = [
+    protected $casts = [
-        'name'     => 'required',
+        'id'       => 'int',
-        'template' => 'required',
+        'name'     => 'string',
+        'template' => 'string',
     ];
 
     /**
@@ -36,6 +37,16 @@ class IncidentTemplate extends Model
      */
     protected $fillable = ['name', 'template'];
 
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'     => 'required',
+        'template' => 'required',
+    ];
+
     /**
      * Overrides the models boot method.
      */

app/Models/Metric.php

@@ -37,16 +37,17 @@ class Metric extends Model implements HasPresenter
     ];
 
     /**
-     * The validation rules.
+     * The attributes that should be casted to native types.
      *
      * @var string[]
      */
-    public $rules = [
+    protected $casts = [
-        'name'          => 'required',
+        'id'            => 'int',
-        'suffix'        => 'required',
+        'name'          => 'string',
-        'display_chart' => 'boolean',
+        'display_chart' => 'bool',
-        'default_value' => 'numeric',
+        'default_value' => 'int',
-        'places'        => 'numeric|min:0|max:4',
+        'calc_type'     => 'int',
+        'places'        => 'int',
     ];
 
     /**
@@ -64,6 +65,19 @@ class Metric extends Model implements HasPresenter
         'places',
     ];
 
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'name'          => 'required',
+        'suffix'        => 'required',
+        'display_chart' => 'boolean',
+        'default_value' => 'numeric',
+        'places'        => 'numeric|min:0|max:4',
+    ];
+
     /**
      * The relations to eager load on every query.
      *

app/Models/MetricPoint.php

@@ -20,6 +20,17 @@ class MetricPoint extends Model implements HasPresenter
 {
     use ValidatingTrait;
 
+    /**
+     * The attributes that should be casted to native types.
+     *
+     * @var string[]
+     */
+    protected $casts = [
+        'id'        => 'int',
+        'metric_id' => 'int',
+        'value'     => 'int',
+    ];
+
     /**
      * The attributes that are mass assignable.
      *

app/Models/Setting.php

@@ -15,6 +15,17 @@ use Illuminate\Database\Eloquent\Model;
 
 class Setting extends Model
 {
+    /**
+     * The attributes that should be casted to native types.
+     *
+     * @var string[]
+     */
+    protected $casts = [
+        'id'    => 'int',
+        'name'  => 'string',
+        'value' => 'string',
+    ];
+
     /**
      * The fillable properties.
      *

app/Models/Subscriber.php

@@ -21,21 +21,16 @@ class Subscriber extends Model implements HasPresenter
     use ValidatingTrait;
 
     /**
-     * The validation rules.
+     * The attributes that should be casted to native types.
      *
      * @var string[]
      */
-    public $rules = [
+    protected $casts = [
-        'email' => 'required|email',
+        'id'          => 'int',
+        'email'       => 'string',
+        'verify_code' => 'string',
     ];
 
-    /**
-     * The fillable properties.
-     *
-     * @var string[]
-     */
-    protected $fillable = ['email'];
-
     /**
      * The attributes that should be mutated to dates.
      *
@@ -44,13 +39,19 @@ class Subscriber extends Model implements HasPresenter
     protected $dates = ['verified_at'];
 
     /**
-     * The attributes that should be casted to native types.
+     * The fillable properties.
      *
      * @var string[]
      */
-    protected $casts = [
+    protected $fillable = ['email'];
-        'email'       => 'string',
+
-        'verify_code' => 'string',
+    /**
+     * The validation rules.
+     *
+     * @var string[]
+     */
+    public $rules = [
+        'email' => 'required|email',
     ];
 
     /**

app/Models/Tag.php

@@ -16,6 +16,16 @@ use Illuminate\Support\Str;
 
 class Tag extends Model
 {
+    /**
+     * The attributes that should be casted to native types.
+     *
+     * @var string[]
+     */
+    protected $casts = [
+        'id'   => 'int',
+        'name' => 'string',
+    ];
+
     /**
      * The fillable properties.
      *

app/Models/User.php

@@ -25,16 +25,27 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     use Authenticatable, CanResetPassword, ValidatingTrait;
 
     /**
-     * The validation rules.
+     * The attributes that should be casted to native types.
      *
      * @var string[]
      */
-    public $rules = [
+    protected $casts = [
-        'username' => ['required', 'regex:/\A(?!.*[:;]-\))[ -~]+\z/'],
+        'id'                => 'int',
-        'email'    => 'required|email',
+        'username'          => 'string',
-        'password' => 'required',
+        'email'             => 'string',
+        'google_2fa_secret' => 'string',
+        'api_key'           => 'string',
+        'active'            => 'bool',
+        'level'             => 'int',
     ];
 
+    /**
+     * The properties that cannot be mass assigned.
+     *
+     * @var string[]
+     */
+    protected $guarded = [];
+
     /**
      * The hidden properties.
      *
@@ -45,11 +56,15 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     protected $hidden = ['password', 'remember_token', 'google_2fa_secret'];
 
     /**
-     * The properties that cannot be mass assigned.
+     * The validation rules.
      *
      * @var string[]
      */
-    protected $guarded = [];
+    public $rules = [
+        'username' => ['required', 'regex:/\A(?!.*[:;]-\))[ -~]+\z/'],
+        'email'    => 'required|email',
+        'password' => 'required',
+    ];
 
     /**
      * Overrides the models boot method.

tests/Api/ComponentGroupTest.php

@@ -23,9 +23,9 @@ class ComponentGroupTest extends AbstractTestCase
         $groups = factory('CachetHQ\Cachet\Models\ComponentGroup', 3)->create();
 
         $this->get('/api/v1/components/groups');
-        $this->seeJson(['id' => (string) $groups[0]->id]);
+        $this->seeJson(['id' => $groups[0]->id]);
-        $this->seeJson(['id' => (string) $groups[1]->id]);
+        $this->seeJson(['id' => $groups[1]->id]);
-        $this->seeJson(['id' => (string) $groups[2]->id]);
+        $this->seeJson(['id' => $groups[2]->id]);
         $this->assertResponseOk();
     }
 

tests/Api/ComponentTest.php

@@ -23,9 +23,9 @@ class ComponentTest extends AbstractTestCase
         $components = factory('CachetHQ\Cachet\Models\Component', 3)->create();
 
         $this->get('/api/v1/components');
-        $this->seeJson(['id' => (string) $components[0]->id]);
+        $this->seeJson(['id' => $components[0]->id]);
-        $this->seeJson(['id' => (string) $components[1]->id]);
+        $this->seeJson(['id' => $components[1]->id]);
-        $this->seeJson(['id' => (string) $components[2]->id]);
+        $this->seeJson(['id' => $components[2]->id]);
         $this->assertResponseOk();
     }
 

tests/Api/IncidentTest.php

@@ -23,9 +23,9 @@ class IncidentTest extends AbstractTestCase
         $incidents = factory('CachetHQ\Cachet\Models\Incident', 3)->create();
 
         $this->get('/api/v1/incidents');
-        $this->seeJson(['id' => (string) $incidents[0]->id]);
+        $this->seeJson(['id' => $incidents[0]->id]);
-        $this->seeJson(['id' => (string) $incidents[1]->id]);
+        $this->seeJson(['id' => $incidents[1]->id]);
-        $this->seeJson(['id' => (string) $incidents[2]->id]);
+        $this->seeJson(['id' => $incidents[2]->id]);
         $this->assertResponseOk();
     }
 

tests/Api/MetricPointTest.php

@@ -26,9 +26,9 @@ class MetricPointTest extends AbstractTestCase
         ]);
 
         $this->get("/api/v1/metrics/{$metric->id}/points");
-        $this->seeJson(['id' => (string) $metricPoint[0]->id]);
+        $this->seeJson(['id' => $metricPoint[0]->id]);
-        $this->seeJson(['id' => (string) $metricPoint[1]->id]);
+        $this->seeJson(['id' => $metricPoint[1]->id]);
-        $this->seeJson(['id' => (string) $metricPoint[2]->id]);
+        $this->seeJson(['id' => $metricPoint[2]->id]);
     }
 
     public function testPostMetricPointUnauthorized()
@@ -52,7 +52,7 @@ class MetricPointTest extends AbstractTestCase
         ]);
 
         $this->post("/api/v1/metrics/{$metric->id}/points", $metricPoint->toArray());
-        $this->seeJson(['value' => (string) $metricPoint->value]);
+        $this->seeJson(['value' => $metricPoint->value]);
     }
 
     public function testPostMetricPointTimestamp()
@@ -69,7 +69,7 @@ class MetricPointTest extends AbstractTestCase
         $postData['timestamp'] = $timestamp;
 
         $this->post("/api/v1/metrics/{$metric->id}/points", $postData);
-        $this->seeJson(['value' => (string) $metricPoint->value, 'created_at' => $datetime]);
+        $this->seeJson(['value' => $metricPoint->value, 'created_at' => $datetime]);
     }
 
     public function testPutMetricPoint()
@@ -82,7 +82,7 @@ class MetricPointTest extends AbstractTestCase
         $this->put("/api/v1/metrics/{$metric->id}/points/{$metricPoint->id}", [
             'value' => 999,
         ]);
-        $this->seeJson(['value' => '999']);
+        $this->seeJson(['value' => 999]);
     }
 
     public function testDeleteMetricPoint()

tests/Api/MetricTest.php

@@ -23,9 +23,9 @@ class MetricTest extends AbstractTestCase
         $metrics = factory('CachetHQ\Cachet\Models\Metric', 3)->create();
 
         $this->get('/api/v1/metrics');
-        $this->seeJson(['id' => (string) $metrics[0]->id]);
+        $this->seeJson(['id' => $metrics[0]->id]);
-        $this->seeJson(['id' => (string) $metrics[1]->id]);
+        $this->seeJson(['id' => $metrics[1]->id]);
-        $this->seeJson(['id' => (string) $metrics[2]->id]);
+        $this->seeJson(['id' => $metrics[2]->id]);
         $this->assertResponseOk();
     }