Skip to content

Commit 10aede5

Browse files
committed
Clean up models
1 parent 910976a commit 10aede5

6 files changed

+1
-72
lines changed

src/Action.php

-15
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,12 @@
22

33
use Illuminate\Database\Eloquent\Model;
44

5-
/**
6-
* Class Action
7-
* @package GeneaLabs\LaravelGovernor\Models
8-
*/
95
class Action extends Model
106
{
11-
/**
12-
* @var string
13-
*/
147
protected $primaryKey = 'name';
15-
/**
16-
* @var array
17-
*/
188
protected $rules = [
19-
// 'name' => 'required|min:3|unique:actions,name',
209
'name' => 'required|min:3',
2110
];
22-
23-
/**
24-
* @var array
25-
*/
2611
protected $fillable = [
2712
'name',
2813
];

src/Assignment.php

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?php namespace GeneaLabs\LaravelGovernor;
22

33
use Illuminate\Database\Eloquent\Model;
4-
use Illuminate\Support\Facades\Config;
54

65
class Assignment extends Model
76
{

src/Entity.php

-14
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,12 @@
22

33
use Illuminate\Database\Eloquent\Model;
44

5-
/**
6-
* Class Entity
7-
* @package GeneaLabs\LaravelGovernor\Entities
8-
*/
95
class Entity extends Model
106
{
11-
/**
12-
* @var string
13-
*/
147
protected $primaryKey = 'name';
15-
/**
16-
* @var array
17-
*/
188
protected $rules = [
199
'name' => 'required|min:3|unique:entities,name',
2010
];
21-
22-
/**
23-
* @var array
24-
*/
2511
protected $fillable = [
2612
'name',
2713
];

src/Ownership.php

-15
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,12 @@
22

33
use Illuminate\Database\Eloquent\Model;
44

5-
/**
6-
* Class Ownership
7-
* @package GeneaLabs\LaravelGovernor\Models
8-
*/
95
class Ownership extends Model
106
{
11-
/**
12-
* @var string
13-
*/
147
protected $primaryKey = 'name';
15-
/**
16-
* @var array
17-
*/
188
protected $rules = [
19-
// 'name' => 'required|min:3|unique:roles,name',
209
'name' => 'required|min:3',
2110
];
22-
23-
/**
24-
* @var array
25-
*/
2611
protected $fillable = [
2712
'name',
2813
];

src/Permission.php

-11
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,14 @@
22

33
use Illuminate\Database\Eloquent\Model;
44

5-
/**
6-
* Class Permission
7-
* @package GeneaLabs\LaravelGovernor\Models
8-
*/
95
class Permission extends Model
106
{
11-
/**
12-
* @var array
13-
*/
147
protected $rules = [
158
'role_key' => 'required',
169
'entity_key' => 'required',
1710
'action_key' => 'required',
1811
'ownership_key' => 'required',
1912
];
20-
21-
/**
22-
* @var array
23-
*/
2413
protected $fillable = [
2514
'role_key',
2615
'entity_key',

src/Role.php

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,14 @@
11
<?php namespace GeneaLabs\LaravelGovernor;
22

33
use Illuminate\Database\Eloquent\Model;
4-
use Illuminate\Support\Facades\Config;
54

6-
/**
7-
* Class Role
8-
* @package GeneaLabs\LaravelGovernor\Models
9-
*/
105
class Role extends Model
116
{
12-
/**
13-
* @var string
14-
*/
157
protected $primaryKey = 'name';
16-
/**
17-
* @var array
18-
*/
198
protected $rules = [
209
'name' => 'required|min:3|unique:roles,name',
2110
'description' => 'required|min:25',
2211
];
23-
24-
/**
25-
* @var array
26-
*/
2712
protected $fillable = [
2813
'name',
2914
'description',
@@ -34,7 +19,7 @@ class Role extends Model
3419
*/
3520
public function users()
3621
{
37-
return $this->belongsToMany(Config::get('auth.model'), 'role_user', 'role_key', 'user_id');
22+
return $this->belongsToMany(config('auth.model'), 'role_user', 'role_key', 'user_id');
3823
}
3924

4025
/**

0 commit comments

Comments
 (0)