lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor validator stuff and fix variable names in views

Browse Source
This commit is contained in:
Graham Campbell
2015-08-03 22:32:36 +01:00
parent 5d958bac81
commit fcbbfdd84e
56 changed files with 514 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Component.php
View File

@@ -11,12 +11,12 @@
namespace CachetHQ\Cachet\Models;
use AltThree\Validator\ValidatingTrait;
use CachetHQ\Cachet\Presenters\ComponentPresenter;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use McCool\LaravelAutoPresenter\HasPresenter;
use Watson\Validating\ValidatingTrait;
class Component extends Model implements HasPresenter
{
@@ -27,7 +27,7 @@ class Component extends Model implements HasPresenter
*
* @var string[]
*/
protected $rules = [
public $rules = [
'name' => 'required|string',
'status' => 'integer|required',
'link' => 'url',

6
app/Models/ComponentGroup.php
View File

@@ -11,8 +11,8 @@
namespace CachetHQ\Cachet\Models;
use AltThree\Validator\ValidatingTrait;
use Illuminate\Database\Eloquent\Model;
use Watson\Validating\ValidatingTrait;
class ComponentGroup extends Model
{
@@ -23,8 +23,8 @@ class ComponentGroup extends Model
*
* @var string[]
*/
protected $rules = [
'name' => 'required|unique:component_groups',
public $rules = [
'name' => 'required',
];
/**

4
app/Models/Incident.php
View File

@@ -11,12 +11,12 @@
namespace CachetHQ\Cachet\Models;
use AltThree\Validator\ValidatingTrait;
use CachetHQ\Cachet\Presenters\IncidentPresenter;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use McCool\LaravelAutoPresenter\HasPresenter;
use Watson\Validating\ValidatingTrait;
class Incident extends Model implements HasPresenter
{
@@ -27,7 +27,7 @@ class Incident extends Model implements HasPresenter
*
* @var string[]
*/
protected $rules = [
public $rules = [
'component_id' => 'integer',
'name' => 'required',
'status' => 'required|integer',

4
app/Models/IncidentTemplate.php
View File

@@ -11,9 +11,9 @@
namespace CachetHQ\Cachet\Models;
use AltThree\Validator\ValidatingTrait;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
use Watson\Validating\ValidatingTrait;
class IncidentTemplate extends Model
{
@@ -24,7 +24,7 @@ class IncidentTemplate extends Model
*
* @var string[]
*/
protected $rules = [
public $rules = [
'name' => 'required',
'template' => 'required',
];

4
app/Models/Metric.php
View File

@@ -11,6 +11,7 @@
namespace CachetHQ\Cachet\Models;
use AltThree\Validator\ValidatingTrait;
use CachetHQ\Cachet\Facades\Setting as SettingFacade;
use CachetHQ\Cachet\Presenters\MetricPresenter;
use DateInterval;
@@ -19,7 +20,6 @@ use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\DB;
use Jenssegers\Date\Date;
use McCool\LaravelAutoPresenter\HasPresenter;
use Watson\Validating\ValidatingTrait;
class Metric extends Model implements HasPresenter
{
@@ -45,7 +45,7 @@ class Metric extends Model implements HasPresenter
*
* @var string[]
*/
protected $rules = [
public $rules = [
'name' => 'required',
'suffix' => 'required',
'display_chart' => 'boolean',

4
app/Models/MetricPoint.php
View File

@@ -11,10 +11,10 @@
namespace CachetHQ\Cachet\Models;
use AltThree\Validator\ValidatingTrait;
use CachetHQ\Cachet\Presenters\MetricPointPresenter;
use Illuminate\Database\Eloquent\Model;
use McCool\LaravelAutoPresenter\HasPresenter;
use Watson\Validating\ValidatingTrait;
class MetricPoint extends Model implements HasPresenter
{
@@ -32,7 +32,7 @@ class MetricPoint extends Model implements HasPresenter
*
* @var string[]
*/
protected $rules = [
public $rules = [
'value' => 'numeric|required',
];

6
app/Models/Subscriber.php
View File

@@ -11,10 +11,10 @@
namespace CachetHQ\Cachet\Models;
use AltThree\Validator\ValidatingTrait;
use CachetHQ\Cachet\Presenters\SubscriberPresenter;
use Illuminate\Database\Eloquent\Model;
use McCool\LaravelAutoPresenter\HasPresenter;
use Watson\Validating\ValidatingTrait;
class Subscriber extends Model implements HasPresenter
{
@@ -25,8 +25,8 @@ class Subscriber extends Model implements HasPresenter
*
* @var string[]
*/
protected $rules = [
'email' => 'required|email|unique:subscribers',
public $rules = [
'email' => 'required|email',
];
/**

8
app/Models/User.php
View File

@@ -11,6 +11,7 @@
namespace CachetHQ\Cachet\Models;
use AltThree\Validator\ValidatingTrait;
use Illuminate\Auth\Authenticatable;
use Illuminate\Auth\Passwords\CanResetPassword;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
@@ -18,7 +19,6 @@ use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Support\Facades\Hash;
use Watson\Validating\ValidatingTrait;
class User extends Model implements AuthenticatableContract, CanResetPasswordContract
{
@@ -29,9 +29,9 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
*
* @var string[]
*/
protected $rules = [
'username' => ['required', 'regex:/\A(?!.*[:;]-\))[ -~]+\z/', 'unique:users'],
'email' => 'required|email|unique:users',
public $rules = [
'username' => ['required', 'regex:/\A(?!.*[:;]-\))[ -~]+\z/'],
'email' => 'required|email',
'password' => 'required',
];