@@ -39,6 +39,7 @@ |
||
| 39 | 39 | |
| 40 | 40 | /** |
| 41 | 41 | * @param $consoleClass |
| 42 | + * @param string $directory |
|
| 42 | 43 | */ |
| 43 | 44 | private function loadTheConsoles($directory) |
| 44 | 45 | { |
@@ -70,8 +70,8 @@ discard block |
||
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | /** |
| 73 | - * @param array $directories |
|
| 74 | - * @param $seedersClasses |
|
| 73 | + * @param string[] $directories |
|
| 74 | + * @param Collection $seedersClasses |
|
| 75 | 75 | * |
| 76 | 76 | * @return mixed |
| 77 | 77 | */ |
@@ -103,7 +103,7 @@ discard block |
||
| 103 | 103 | /** |
| 104 | 104 | * @param $seedersClasses |
| 105 | 105 | * |
| 106 | - * @return \Illuminate\Support\Collection|static |
|
| 106 | + * @return Collection|null |
|
| 107 | 107 | */ |
| 108 | 108 | private function sortSeeders($seedersClasses) |
| 109 | 109 | { |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | } |
| 141 | 141 | |
| 142 | 142 | /** |
| 143 | - * @param $seedersClasses |
|
| 143 | + * @param Collection|null $seedersClasses |
|
| 144 | 144 | */ |
| 145 | 145 | private function loadSeeders($seedersClasses) |
| 146 | 146 | { |
@@ -122,7 +122,7 @@ |
||
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | // sort the classes that needed to be ordered |
| 125 | - $orderedSeederClasses = $orderedSeederClasses->sortBy(function ($seederFullClassName) { |
|
| 125 | + $orderedSeederClasses = $orderedSeederClasses->sortBy(function($seederFullClassName) { |
|
| 126 | 126 | // get the order number form the end of each class name |
| 127 | 127 | $orderNumber = substr($seederFullClassName, strpos($seederFullClassName, "_") + 1); |
| 128 | 128 | |
@@ -44,6 +44,6 @@ |
||
| 44 | 44 | $router->post('admins/create', [ |
| 45 | 45 | 'uses' => 'Controller@createAdmin', |
| 46 | 46 | 'middleware' => [ |
| 47 | - 'api.auth', |
|
| 47 | + 'api.auth', |
|
| 48 | 48 | ], |
| 49 | 49 | ]); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | public function hasAccess(User $user = null) |
| 48 | 48 | { |
| 49 | 49 | // if not in parameters, take from the request object {$this} |
| 50 | - $user = $user ? : $this->user(); |
|
| 50 | + $user = $user ?: $this->user(); |
|
| 51 | 51 | |
| 52 | 52 | $hasAccess = array_merge( |
| 53 | 53 | $this->hasAnyPermissionAccess($user), |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | |
| 72 | 72 | $permissions = explode('|', $this->access['permissions']); |
| 73 | 73 | |
| 74 | - $hasAccess = array_map(function ($permission) use ($user) { |
|
| 74 | + $hasAccess = array_map(function($permission) use ($user) { |
|
| 75 | 75 | // Note: internal return |
| 76 | 76 | return $user->hasPermissionTo($permission); |
| 77 | 77 | }, $permissions); |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | |
| 93 | 93 | $roles = explode('|', $this->access['roles']); |
| 94 | 94 | |
| 95 | - $hasAccess = array_map(function ($role) use ($user) { |
|
| 95 | + $hasAccess = array_map(function($role) use ($user) { |
|
| 96 | 96 | // Note: internal return |
| 97 | 97 | return $user->hasRole($role); |
| 98 | 98 | }, $roles); |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | { |
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | - * @return \App\Containers\User\Models\User|null |
|
| 16 | + * @return \Illuminate\Contracts\Auth\Authenticatable|null |
|
| 17 | 17 | */ |
| 18 | 18 | public function getUser() |
| 19 | 19 | { |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | public function runQueryDebugger($log = true, $terminal = false) |
| 25 | 25 | { |
| 26 | 26 | if (Config::get('hello.query_debugger')) { |
| 27 | - DB::listen(function ($event) use ($terminal, $log) { |
|
| 27 | + DB::listen(function($event) use ($terminal, $log) { |
|
| 28 | 28 | $fullQuery = vsprintf(str_replace(['%', '?'], ['%%', '%s'], $event->sql), $event->bindings); |
| 29 | 29 | |
| 30 | 30 | $text = $event->connectionName . ' (' . $event->time . '): ' . $fullQuery; |
@@ -26,7 +26,6 @@ |
||
| 26 | 26 | use App\Containers\Authorization\UI\API\Requests\RevokeUserFromRoleRequest; |
| 27 | 27 | use App\Containers\Authorization\UI\API\Transformers\PermissionTransformer; |
| 28 | 28 | use App\Containers\Authorization\UI\API\Transformers\RoleTransformer; |
| 29 | -use App\Containers\User\Models\User; |
|
| 30 | 29 | use App\Containers\User\UI\API\Transformers\UserTransformer; |
| 31 | 30 | use App\Port\Controller\Abstracts\PortApiController; |
| 32 | 31 | |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | // User |
| 4 | 4 | use App\Containers\Authorization\Models\Role; |
| 5 | 5 | |
| 6 | -$factory->define(Role::class, function (Faker\Generator $faker) { |
|
| 6 | +$factory->define(Role::class, function(Faker\Generator $faker) { |
|
| 7 | 7 | |
| 8 | 8 | return [ |
| 9 | 9 | 'name' => $faker->slug, |
@@ -97,8 +97,8 @@ |
||
| 97 | 97 | * |
| 98 | 98 | * Extend the default Laravel validation rules. |
| 99 | 99 | */ |
| 100 | - private function extendValidationRules(){ |
|
| 101 | - \Validator::extend('no_spaces', function($attr, $value){ |
|
| 100 | + private function extendValidationRules() { |
|
| 101 | + \Validator::extend('no_spaces', function($attr, $value) { |
|
| 102 | 102 | return preg_match('/^\S*$/u', $value); |
| 103 | 103 | }, ['String should not contain space.']); |
| 104 | 104 | } |
@@ -66,12 +66,12 @@ |
||
| 66 | 66 | return $this->response->paginator($users, new UserTransformer()); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * @param \App\Containers\User\UI\API\Requests\ListAllUsersRequest $request |
|
| 71 | - * @param \App\Containers\User\Actions\ListAndSearchUsersAction $action |
|
| 72 | - * |
|
| 73 | - * @return \Dingo\Api\Http\Response |
|
| 74 | - */ |
|
| 69 | + /** |
|
| 70 | + * @param \App\Containers\User\UI\API\Requests\ListAllUsersRequest $request |
|
| 71 | + * @param \App\Containers\User\Actions\ListAndSearchUsersAction $action |
|
| 72 | + * |
|
| 73 | + * @return \Dingo\Api\Http\Response |
|
| 74 | + */ |
|
| 75 | 75 | public function listAllAdmins(ListAllUsersRequest $request, ListAndSearchUsersAction $action) |
| 76 | 76 | { |
| 77 | 77 | $users = $action->run(['admin']); |
@@ -82,7 +82,7 @@ |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | /** |
| 85 | - * @param \Dingo\Api\Http\Request $request |
|
| 85 | + * @param RefreshUserRequest $request |
|
| 86 | 86 | * @param \App\Containers\User\Actions\GetUserAction $action |
| 87 | 87 | * |
| 88 | 88 | * @return \Dingo\Api\Http\Response |