@@ -11,7 +11,7 @@ |
||
| 11 | 11 | */ |
| 12 | 12 | public function up() |
| 13 | 13 | { |
| 14 | - Schema::create('users', function (Blueprint $table) { |
|
| 14 | + Schema::create('users', function(Blueprint $table) { |
|
| 15 | 15 | $table->increments('id'); |
| 16 | 16 | |
| 17 | 17 | $table->string('name')->nullable(); |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | */ |
| 12 | 12 | public function up() |
| 13 | 13 | { |
| 14 | - Schema::create('password_resets', function (Blueprint $table) { |
|
| 14 | + Schema::create('password_resets', function(Blueprint $table) { |
|
| 15 | 15 | $table->string('email')->index(); |
| 16 | 16 | $table->string('token')->index(); |
| 17 | 17 | $table->timestamp('created_at')->nullable(); |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | */ |
| 44 | 44 | public function run($userId = null) |
| 45 | 45 | { |
| 46 | - if(!$userId){ |
|
| 46 | + if (!$userId) { |
|
| 47 | 47 | $userId = $this->getAuthenticatedUserTask->run()->id; |
| 48 | 48 | } |
| 49 | 49 | |
@@ -33,10 +33,10 @@ |
||
| 33 | 33 | 'name' => $data['name'], |
| 34 | 34 | ], $response); |
| 35 | 35 | |
| 36 | - // assert response contain the token |
|
| 36 | + // assert response contain the token |
|
| 37 | 37 | $this->assertResponseContainKeys(['id', 'token'], $response); |
| 38 | 38 | |
| 39 | - // assert the data is stored in the database |
|
| 39 | + // assert the data is stored in the database |
|
| 40 | 40 | $this->seeInDatabase('users', ['email' => $data['email']]); |
| 41 | 41 | } |
| 42 | 42 | |
@@ -36,10 +36,10 @@ |
||
| 36 | 36 | 'name' => $data['name'], |
| 37 | 37 | ], $response); |
| 38 | 38 | |
| 39 | - // assert response contain the token |
|
| 39 | + // assert response contain the token |
|
| 40 | 40 | $this->assertResponseContainKeys(['id', 'token'], $response); |
| 41 | 41 | |
| 42 | - // assert the data is stored in the database |
|
| 42 | + // assert the data is stored in the database |
|
| 43 | 43 | $this->seeInDatabase('users', ['email' => $data['email']]); |
| 44 | 44 | |
| 45 | 45 | $responseObject = $this->getResponseObject($response); |
@@ -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 | { |
@@ -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, |
@@ -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 |