@@ -67,37 +67,37 @@ |
||
67 | 67 | { |
68 | 68 | $blade = $this->app['view']->getEngineResolver()->resolve('blade')->getCompiler(); |
69 | 69 | |
70 | - $blade->directive('role', function ($expression) { |
|
70 | + $blade->directive('role', function($expression) { |
|
71 | 71 | return "<?php if (Auth::check() && Auth::user()->hasRole({$expression})): ?>"; |
72 | 72 | }); |
73 | 73 | |
74 | - $blade->directive('endrole', function () { |
|
74 | + $blade->directive('endrole', function() { |
|
75 | 75 | return '<?php endif; ?>'; |
76 | 76 | }); |
77 | 77 | |
78 | - $blade->directive('permission', function ($expression) { |
|
78 | + $blade->directive('permission', function($expression) { |
|
79 | 79 | return "<?php if (Auth::check() && Auth::user()->hasPermission({$expression})): ?>"; |
80 | 80 | }); |
81 | 81 | |
82 | - $blade->directive('endpermission', function () { |
|
82 | + $blade->directive('endpermission', function() { |
|
83 | 83 | return '<?php endif; ?>'; |
84 | 84 | }); |
85 | 85 | |
86 | - $blade->directive('level', function ($expression) { |
|
86 | + $blade->directive('level', function($expression) { |
|
87 | 87 | $level = trim($expression, '()'); |
88 | 88 | |
89 | 89 | return "<?php if (Auth::check() && Auth::user()->level() >= {$level}): ?>"; |
90 | 90 | }); |
91 | 91 | |
92 | - $blade->directive('endlevel', function () { |
|
92 | + $blade->directive('endlevel', function() { |
|
93 | 93 | return '<?php endif; ?>'; |
94 | 94 | }); |
95 | 95 | |
96 | - $blade->directive('allowed', function ($expression) { |
|
96 | + $blade->directive('allowed', function($expression) { |
|
97 | 97 | return "<?php if (Auth::check() && Auth::user()->allowed({$expression})): ?>"; |
98 | 98 | }); |
99 | 99 | |
100 | - $blade->directive('endallowed', function () { |
|
100 | + $blade->directive('endallowed', function() { |
|
101 | 101 | return '<?php endif; ?>'; |
102 | 102 | }); |
103 | 103 | } |
@@ -18,7 +18,7 @@ |
||
18 | 18 | $tableCheck = Schema::connection($connection)->hasTable($table); |
19 | 19 | |
20 | 20 | if (!$tableCheck) { |
21 | - Schema::connection($connection)->create($table, function (Blueprint $table) { |
|
21 | + Schema::connection($connection)->create($table, function(Blueprint $table) { |
|
22 | 22 | $table->increments('id')->unsigned(); |
23 | 23 | $table->string('name'); |
24 | 24 | $table->string('slug')->unique(); |
@@ -18,7 +18,7 @@ |
||
18 | 18 | $tableCheck = Schema::connection($connection)->hasTable($table); |
19 | 19 | |
20 | 20 | if (!$tableCheck) { |
21 | - Schema::connection($connection)->create($table, function (Blueprint $table) { |
|
21 | + Schema::connection($connection)->create($table, function(Blueprint $table) { |
|
22 | 22 | $table->increments('id')->unsigned(); |
23 | 23 | $table->string('name'); |
24 | 24 | $table->string('slug')->unique(); |
@@ -12,6 +12,6 @@ |
||
12 | 12 | 'as' => 'laravelroles::', |
13 | 13 | 'namespace' => 'jeremykenedy\LaravelRoles\App\Http\Controllers\Api', |
14 | 14 | 'prefix' => 'api', |
15 | -], function () { |
|
15 | +], function() { |
|
16 | 16 | Route::apiResource('roles-api', 'LaravelRolesApiController'); |
17 | 17 | }); |
@@ -20,7 +20,7 @@ |
||
20 | 20 | $tableCheck = Schema::connection($connection)->hasTable($table); |
21 | 21 | |
22 | 22 | if (!$tableCheck) { |
23 | - Schema::connection($connection)->create($table, function (Blueprint $table) use ($permissionsTable, $rolesTable) { |
|
23 | + Schema::connection($connection)->create($table, function(Blueprint $table) use ($permissionsTable, $rolesTable) { |
|
24 | 24 | $table->increments('id')->unsigned(); |
25 | 25 | $table->integer('permission_id')->unsigned()->index(); |
26 | 26 | $table->foreign('permission_id')->references('id')->on($permissionsTable)->onDelete('cascade'); |
@@ -19,7 +19,7 @@ |
||
19 | 19 | $tableCheck = Schema::connection($connection)->hasTable($table); |
20 | 20 | |
21 | 21 | if (!$tableCheck) { |
22 | - Schema::connection($connection)->create($table, function (Blueprint $table) use ($rolesTable) { |
|
22 | + Schema::connection($connection)->create($table, function(Blueprint $table) use ($rolesTable) { |
|
23 | 23 | $table->increments('id')->unsigned(); |
24 | 24 | $table->integer('role_id')->unsigned()->index(); |
25 | 25 | $table->foreign('role_id')->references('id')->on($rolesTable)->onDelete('cascade'); |
@@ -20,7 +20,7 @@ |
||
20 | 20 | $userTable = app(config('auth.providers.users.model'))->getTable(); |
21 | 21 | |
22 | 22 | if (!$tableCheck) { |
23 | - Schema::connection($connection)->create($table, function (Blueprint $table) use ($permissionsTable, $userTable) { |
|
23 | + Schema::connection($connection)->create($table, function(Blueprint $table) use ($permissionsTable, $userTable) { |
|
24 | 24 | $table->increments('id')->unsigned(); |
25 | 25 | $table->integer('permission_id')->unsigned()->index(); |
26 | 26 | $table->foreign('permission_id')->references('id')->on($permissionsTable)->onDelete('cascade'); |
@@ -11,7 +11,7 @@ |
||
11 | 11 | 'as' => 'laravelroles::', |
12 | 12 | 'namespace' => 'jeremykenedy\LaravelRoles\App\Http\Controllers', |
13 | 13 | 'prefix' => config('roles.GUIRoutesPrefix'), |
14 | -], function () { |
|
14 | +], function() { |
|
15 | 15 | |
16 | 16 | // Dashboards and CRUD Routes |
17 | 17 | Route::resource('roles', 'LaravelRolesController'); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function checkRole($role) |
115 | 115 | { |
116 | - return $this->getRoles()->contains(function ($value) use ($role) { |
|
116 | + return $this->getRoles()->contains(function($value) use ($role) { |
|
117 | 117 | return $role == $value->id || Str::is($role, $value->slug); |
118 | 118 | }); |
119 | 119 | } |
@@ -202,19 +202,19 @@ discard block |
||
202 | 202 | |
203 | 203 | if (config('roles.inheritance')) { |
204 | 204 | return $permissionModel |
205 | - ::select([$permissionTable . '.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at']) |
|
206 | - ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable .'.id') |
|
205 | + ::select([$permissionTable.'.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at']) |
|
206 | + ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable.'.id') |
|
207 | 207 | ->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id') |
208 | 208 | ->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray()) |
209 | 209 | ->orWhere($roleTable.'.level', '<', $this->level()) |
210 | - ->groupBy([$permissionTable . '.id', $permissionTable .'.name', $permissionTable .'.slug', $permissionTable .'.description', $permissionTable .'.model', $permissionTable .'.created_at', 'permissions.updated_at', $permissionTable .'.deleted_at', 'pivot_created_at', 'pivot_updated_at']); |
|
210 | + ->groupBy([$permissionTable.'.id', $permissionTable.'.name', $permissionTable.'.slug', $permissionTable.'.description', $permissionTable.'.model', $permissionTable.'.created_at', 'permissions.updated_at', $permissionTable.'.deleted_at', 'pivot_created_at', 'pivot_updated_at']); |
|
211 | 211 | } else { |
212 | 212 | return $permissionModel |
213 | - ::select([$permissionTable .'.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at']) |
|
214 | - ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable .'.id') |
|
213 | + ::select([$permissionTable.'.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at']) |
|
214 | + ->join('permission_role', 'permission_role.permission_id', '=', $permissionTable.'.id') |
|
215 | 215 | ->join($roleTable, $roleTable.'.id', '=', 'permission_role.role_id') |
216 | 216 | ->whereIn($roleTable.'.id', $this->getRoles()->pluck('id')->toArray()) |
217 | - ->groupBy([$permissionTable . '.id', $permissionTable .'.name', $permissionTable .'.slug', $permissionTable .'.description', $permissionTable .'.model', $permissionTable .'.created_at', $permissionTable .'.updated_at', $permissionTable .'.deleted_at', 'pivot_created_at', 'pivot_updated_at']); |
|
217 | + ->groupBy([$permissionTable.'.id', $permissionTable.'.name', $permissionTable.'.slug', $permissionTable.'.description', $permissionTable.'.model', $permissionTable.'.created_at', $permissionTable.'.updated_at', $permissionTable.'.deleted_at', 'pivot_created_at', 'pivot_updated_at']); |
|
218 | 218 | } |
219 | 219 | } |
220 | 220 | |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | */ |
305 | 305 | public function checkPermission($permission) |
306 | 306 | { |
307 | - return $this->getPermissions()->contains(function ($value) use ($permission) { |
|
307 | + return $this->getPermissions()->contains(function($value) use ($permission) { |
|
308 | 308 | return $permission == $value->id || Str::is($permission, $value->slug); |
309 | 309 | }); |
310 | 310 | } |