Cleanup models

This commit is contained in:
Graham Campbell
2015-01-01 12:23:17 +00:00
parent a14c28b287
commit a442708062
11 changed files with 79 additions and 84 deletions
+16 -21
View File
@@ -1,11 +1,14 @@
<?php
use CachetHQ\Cachet\Transformers\ComponentTransformer;
use Dingo\Api\Transformer\TransformableInterface;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletingTrait;
use Watson\Validating\ValidatingTrait;
class Component extends Eloquent implements \Dingo\Api\Transformer\TransformableInterface
class Component extends Model implements TransformableInterface
{
use ValidatingTrait;
use Illuminate\Database\Eloquent\SoftDeletingTrait;
use SoftDeletingTrait, ValidatingTrait;
protected $rules = [
'user_id' => 'integer|required',
@@ -14,20 +17,12 @@ class Component extends Eloquent implements \Dingo\Api\Transformer\Transformable
'link' => 'url',
];
protected $fillable = [
'name',
'description',
'status',
'user_id',
'tags',
'link',
'order',
];
protected $fillable = ['name', 'description', 'status', 'user_id', 'tags', 'link', 'order'];
/**
* Lookup all of the incidents reported on the component.
*
* @return Illuminate\Database\Eloquent\Relations
* @return \Illuminate\Database\Eloquent\Relations
*/
public function incidents()
{
@@ -37,10 +32,10 @@ class Component extends Eloquent implements \Dingo\Api\Transformer\Transformable
/**
* Finds all components by status.
*
* @param Illuminate\Database\Eloquent\Builder $query
* @param int $status
* @param \Illuminate\Database\Eloquent\Builder $query
* @param int $status
*
* @return Illuminate\Database\Eloquent\Builder
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeStatus($query, $status)
{
@@ -50,10 +45,10 @@ class Component extends Eloquent implements \Dingo\Api\Transformer\Transformable
/**
* Finds all components which don't have the given status.
*
* @param Illuminate\Database\Eloquent\Builder $query
* @param int $status
* @param \Illuminate\Database\Eloquent\Builder $query
* @param int $status
*
* @return Illuminate\Database\Eloquent\Builder
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeNotStatus($query, $status)
{
@@ -73,10 +68,10 @@ class Component extends Eloquent implements \Dingo\Api\Transformer\Transformable
/**
* Get the transformer instance.
*
* @return ComponentTransformer
* @return \CachetHQ\Cachet\Transformers\ComponentTransformer
*/
public function getTransformer()
{
return new CachetHQ\Cachet\Transformers\ComponentTransformer();
return new ComponentTransformer();
}
}