@@ -12,7 +12,7 @@ |
||
| 12 | 12 | trait AuthorizationTrait |
| 13 | 13 | { |
| 14 | 14 | /** |
| 15 | - * @return \App\Containers\User\Models\User|null |
|
| 15 | + * @return \Illuminate\Contracts\Auth\Authenticatable|null |
|
| 16 | 16 | */ |
| 17 | 17 | public function getUser() |
| 18 | 18 | { |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Ship\Parents\Requests; |
| 4 | 4 | |
| 5 | -use App\Containers\Authorization\Traits\AuthorizationTrait; |
|
| 6 | 5 | use App\Ship\Engine\Traits\HashIdTrait; |
| 7 | 6 | use Illuminate\Foundation\Http\FormRequest as LaravelFormRequest; |
| 8 | 7 | |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | public function hasAccess(User $user = null) |
| 29 | 29 | { |
| 30 | 30 | // if not in parameters, take from the request object {$this} |
| 31 | - $user = $user ? : $this->user(); |
|
| 31 | + $user = $user ?: $this->user(); |
|
| 32 | 32 | |
| 33 | 33 | $hasAccess = array_merge( |
| 34 | 34 | $this->hasAnyPermissionAccess($user), |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | * To call functions and compare their bool responses to determine |
| 53 | 53 | * if the user can proceed with the request or not. |
| 54 | 54 | * |
| 55 | - * @param array $functions |
|
| 55 | + * @param string[] $functions |
|
| 56 | 56 | * |
| 57 | 57 | * @return bool |
| 58 | 58 | */ |
@@ -2,11 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Ship\Parents\Requests; |
| 4 | 4 | |
| 5 | -use App\Containers\Authorization\Traits\AuthorizationTrait; |
|
| 6 | -use App\Ship\Engine\Traits\HashIdTrait; |
|
| 7 | 5 | use App\Ship\Features\Exceptions\ValidationFailedException; |
| 8 | 6 | use Illuminate\Contracts\Validation\Validator; |
| 9 | -use Illuminate\Foundation\Http\FormRequest as LaravelFormRequest; |
|
| 10 | 7 | |
| 11 | 8 | /** |
| 12 | 9 | * Class RequestTrait |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | |
| 126 | 126 | $permissions = explode('|', $this->access['permissions']); |
| 127 | 127 | |
| 128 | - $hasAccess = array_map(function ($permission) use ($user) { |
|
| 128 | + $hasAccess = array_map(function($permission) use ($user) { |
|
| 129 | 129 | // Note: internal return |
| 130 | 130 | return $user->hasPermissionTo($permission); |
| 131 | 131 | }, $permissions); |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | $roles = explode('|', $this->access['roles']); |
| 148 | 148 | |
| 149 | - $hasAccess = array_map(function ($role) use ($user) { |
|
| 149 | + $hasAccess = array_map(function($role) use ($user) { |
|
| 150 | 150 | // Note: internal return |
| 151 | 151 | return $user->hasRole($role); |
| 152 | 152 | }, $roles); |