@@ -16,7 +16,7 @@ |
||
| 16 | 16 | * LEVEL |
| 17 | 17 | * A Level has many users |
| 18 | 18 | * |
| 19 | - * @return mixed |
|
| 19 | + * @return \Illuminate\Database\Eloquent\Relations\HasMany |
|
| 20 | 20 | */ |
| 21 | 21 | public function users() |
| 22 | 22 | { |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | { |
| 49 | 49 | parent::boot(); |
| 50 | 50 | |
| 51 | - static::deleting(function ($level) { |
|
| 51 | + static::deleting(function($level) { |
|
| 52 | 52 | $level->permissions()->where('level_id', $level->id)->update(['level_id' => null]); |
| 53 | 53 | foreach ($level->users as $user) { |
| 54 | 54 | $user->level()->dissociate()->save(); |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * PERMISSION |
| 29 | 29 | * A permission belongs to many users |
| 30 | 30 | * |
| 31 | - * @return mixed |
|
| 31 | + * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany |
|
| 32 | 32 | */ |
| 33 | 33 | public function users() |
| 34 | 34 | { |
@@ -134,7 +134,7 @@ |
||
| 134 | 134 | { |
| 135 | 135 | parent::boot(); |
| 136 | 136 | |
| 137 | - static::deleting(function ($permission) { |
|
| 137 | + static::deleting(function($permission) { |
|
| 138 | 138 | $permission->users()->detach(); |
| 139 | 139 | $permission->level()->dissociate()->save(); |
| 140 | 140 | }); |
@@ -262,7 +262,7 @@ discard block |
||
| 262 | 262 | * associated to a user by direct or |
| 263 | 263 | * inheritance |
| 264 | 264 | * |
| 265 | - * @return mixed |
|
| 265 | + * @return Collection |
|
| 266 | 266 | */ |
| 267 | 267 | protected function cacheGetAllPermissions() |
| 268 | 268 | { |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | * USER & LEVEL |
| 286 | 286 | * Return a collection of permissions that |
| 287 | 287 | * are inherited from a higher level |
| 288 | - * @return mixed |
|
| 288 | + * @return Collection |
|
| 289 | 289 | */ |
| 290 | 290 | protected function cacheGetInheritedPermissions() |
| 291 | 291 | { |
@@ -347,7 +347,7 @@ discard block |
||
| 347 | 347 | * Modify a given set of permissions, given the action to be taken |
| 348 | 348 | * |
| 349 | 349 | * @param $permissions |
| 350 | - * @param $action |
|
| 350 | + * @param string $action |
|
| 351 | 351 | * @return mixed |
| 352 | 352 | */ |
| 353 | 353 | protected function modifyPermissions($permissions, $action) |
@@ -380,7 +380,7 @@ discard block |
||
| 380 | 380 | * |
| 381 | 381 | * @param $permissions |
| 382 | 382 | * @param $action |
| 383 | - * @param $model |
|
| 383 | + * @param string $model |
|
| 384 | 384 | * @return mixed |
| 385 | 385 | * @throws PermissionNotFoundException |
| 386 | 386 | */ |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | * USER & LEVEL |
| 409 | 409 | * Helper function to handle adding or negating permissions |
| 410 | 410 | * |
| 411 | - * @param $model |
|
| 411 | + * @param string $model |
|
| 412 | 412 | * @param $permissionObjects |
| 413 | 413 | */ |
| 414 | 414 | protected function addOrNegate($model, $permissionObjects, $action) |
@@ -424,7 +424,7 @@ discard block |
||
| 424 | 424 | * USER & LEVEL |
| 425 | 425 | * Helper function to handle removing permissions |
| 426 | 426 | * |
| 427 | - * @param $model |
|
| 427 | + * @param string $model |
|
| 428 | 428 | * @param $permissionObjects |
| 429 | 429 | */ |
| 430 | 430 | protected function remove($model, $permissionObjects) |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | * USER & LEVEL |
| 444 | 444 | * Help function to handle syncing permissions |
| 445 | 445 | * |
| 446 | - * @param $model |
|
| 446 | + * @param string $model |
|
| 447 | 447 | * @param $permissionObjects |
| 448 | 448 | */ |
| 449 | 449 | protected function sync($model, $permissionObjects) |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | return \Cache::remember( |
| 134 | 134 | 'laravel-acl.getAllPermissionsFor' . $model . '_' . $this->id, |
| 135 | 135 | config('laravel-acl.cacheMinutes'), |
| 136 | - function () { |
|
| 136 | + function() { |
|
| 137 | 137 | return $this->cacheGetAllPermissions(); |
| 138 | 138 | } |
| 139 | 139 | ); |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | return \Cache::remember( |
| 156 | 156 | 'laravel-acl.getInheritedPermissionsFor' . $model . '_' . $this->id, |
| 157 | 157 | config('laravel-acl.cacheMinutes'), |
| 158 | - function () { |
|
| 158 | + function() { |
|
| 159 | 159 | return $this->cacheGetInheritedPermissions(); |
| 160 | 160 | } |
| 161 | 161 | ); |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | return \Cache::remember( |
| 178 | 178 | 'laravel-acl.getAvailablePermissionsFor' . $model . '_' . $this->id, |
| 179 | 179 | config('laravel-acl.cacheMinutes'), |
| 180 | - function () { |
|
| 180 | + function() { |
|
| 181 | 181 | return $this->cacheGetAvailablePermissions(); |
| 182 | 182 | } |
| 183 | 183 | ); |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | return \Cache::remember( |
| 201 | 201 | 'laravel-acl.hasPermissionTo_' . $model . '_' . $this->id . '_Permission_' . $permission, |
| 202 | 202 | config('laravel-acl.cacheMinutes'), |
| 203 | - function () use ($permission) { |
|
| 203 | + function() use ($permission) { |
|
| 204 | 204 | return $this->cacheHasPermissionTo($permission); |
| 205 | 205 | } |
| 206 | 206 | ); |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | |
| 267 | 267 | $allPerms = new Collection(); |
| 268 | 268 | |
| 269 | - $levels->each(function ($level, $key) use (&$allPerms) { |
|
| 269 | + $levels->each(function($level, $key) use (&$allPerms) { |
|
| 270 | 270 | $allPerms = $allPerms->merge($level->permissions); |
| 271 | 271 | }); |
| 272 | 272 | |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | |
| 288 | 288 | $inheritedPerms = new Collection(); |
| 289 | 289 | |
| 290 | - $levels->each(function ($level, $key) use (&$inheritedPerms) { |
|
| 290 | + $levels->each(function($level, $key) use (&$inheritedPerms) { |
|
| 291 | 291 | $inheritedPerms = $inheritedPerms->merge($level->permissions->load('level')); |
| 292 | 292 | }); |
| 293 | 293 | |
@@ -384,8 +384,7 @@ discard block |
||
| 384 | 384 | $permissionsObjects[$permission->id] = ['negated' => true]; |
| 385 | 385 | } else { |
| 386 | 386 | $model == 'User' ? |
| 387 | - array_push($permissionsObjects, $permission->id) : |
|
| 388 | - array_push($permissionsObjects, $permission); |
|
| 387 | + array_push($permissionsObjects, $permission->id) : array_push($permissionsObjects, $permission); |
|
| 389 | 388 | } |
| 390 | 389 | } |
| 391 | 390 | |
@@ -421,7 +420,7 @@ discard block |
||
| 421 | 420 | $this->permissions()->detach($permissionObjects); |
| 422 | 421 | |
| 423 | 422 | if ($model == 'Level') { |
| 424 | - config('laravel-acl.permission', Permission::class)::whereIn('id', array_map(function ($permission) { |
|
| 423 | + config('laravel-acl.permission', Permission::class)::whereIn('id', array_map(function($permission) { |
|
| 425 | 424 | return $permission->id; |
| 426 | 425 | }, $permissionObjects))->update(['level_id' => null]); |
| 427 | 426 | } |
@@ -442,7 +441,7 @@ discard block |
||
| 442 | 441 | if ($model == 'Level') { |
| 443 | 442 | $this->clearPermissions(); |
| 444 | 443 | |
| 445 | - config('laravel-acl.permission', Permission::class)::whereIn('id', array_map(function ($permission) { |
|
| 444 | + config('laravel-acl.permission', Permission::class)::whereIn('id', array_map(function($permission) { |
|
| 446 | 445 | return $permission->id; |
| 447 | 446 | }, $permissionObjects)) |
| 448 | 447 | ->update(['level_id' => $this->id]); |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | return \Cache::remember( |
| 50 | 50 | 'laravel-acl.getNegatedPermissionsForUser_' . $this->id, |
| 51 | 51 | config('laravel-acl.cacheMinutes'), |
| 52 | - function () { |
|
| 52 | + function() { |
|
| 53 | 53 | return $this->cacheGetNegatedPermissions(); |
| 54 | 54 | } |
| 55 | 55 | ); |
@@ -12,9 +12,9 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function boot() |
| 14 | 14 | { |
| 15 | - if($this->app->runningInConsole()) { |
|
| 15 | + if ($this->app->runningInConsole()) { |
|
| 16 | 16 | $this->publishFiles(); |
| 17 | - $this->loadMigrationsFrom(__DIR__.'/../../../migrations'); |
|
| 17 | + $this->loadMigrationsFrom(__DIR__ . '/../../../migrations'); |
|
| 18 | 18 | } |
| 19 | 19 | } |
| 20 | 20 | |