@@ -3,7 +3,7 @@ discard block |
||
3 | 3 | return array( |
4 | 4 | |
5 | 5 | |
6 | - /* |
|
6 | + /* |
|
7 | 7 | |-------------------------------------------------------------------------- |
8 | 8 | | Database settings |
9 | 9 | |-------------------------------------------------------------------------- |
@@ -11,6 +11,6 @@ discard block |
||
11 | 11 | | The name of the table to create in the database |
12 | 12 | | |
13 | 13 | */ |
14 | - 'table_name' => 'countries', |
|
14 | + 'table_name' => 'countries', |
|
15 | 15 | |
16 | 16 | ); |
@@ -4,46 +4,46 @@ |
||
4 | 4 | |
5 | 5 | class SetupCountriesTable extends Migration { |
6 | 6 | |
7 | - /** |
|
8 | - * Run the migrations. |
|
9 | - * |
|
10 | - * @return void |
|
11 | - */ |
|
12 | - public function up() |
|
13 | - { |
|
14 | - // Creates the users table |
|
15 | - Schema::create(\Config::get('countries.table_name'), function($table) |
|
16 | - { |
|
17 | - $table->integer('id')->unsigned()->index(); |
|
18 | - $table->string('capital', 255)->nullable(); |
|
19 | - $table->string('citizenship', 255)->nullable(); |
|
20 | - $table->string('country_code', 3)->default(''); |
|
21 | - $table->string('currency', 255)->nullable(); |
|
22 | - $table->string('currency_code', 255)->nullable(); |
|
23 | - $table->string('currency_sub_unit', 255)->nullable(); |
|
24 | - $table->string('currency_symbol', 3)->nullable(); |
|
25 | - $table->string('full_name', 255)->nullable(); |
|
26 | - $table->string('iso_3166_2', 2)->default(''); |
|
27 | - $table->string('iso_3166_3', 3)->default(''); |
|
28 | - $table->string('name', 255)->default(''); |
|
29 | - $table->string('region_code', 3)->default(''); |
|
30 | - $table->string('sub_region_code', 3)->default(''); |
|
31 | - $table->boolean('eea')->default(0); |
|
32 | - $table->string('calling_code', 3)->nullable(); |
|
33 | - $table->string('flag', 6)->nullable(); |
|
7 | + /** |
|
8 | + * Run the migrations. |
|
9 | + * |
|
10 | + * @return void |
|
11 | + */ |
|
12 | + public function up() |
|
13 | + { |
|
14 | + // Creates the users table |
|
15 | + Schema::create(\Config::get('countries.table_name'), function($table) |
|
16 | + { |
|
17 | + $table->integer('id')->unsigned()->index(); |
|
18 | + $table->string('capital', 255)->nullable(); |
|
19 | + $table->string('citizenship', 255)->nullable(); |
|
20 | + $table->string('country_code', 3)->default(''); |
|
21 | + $table->string('currency', 255)->nullable(); |
|
22 | + $table->string('currency_code', 255)->nullable(); |
|
23 | + $table->string('currency_sub_unit', 255)->nullable(); |
|
24 | + $table->string('currency_symbol', 3)->nullable(); |
|
25 | + $table->string('full_name', 255)->nullable(); |
|
26 | + $table->string('iso_3166_2', 2)->default(''); |
|
27 | + $table->string('iso_3166_3', 3)->default(''); |
|
28 | + $table->string('name', 255)->default(''); |
|
29 | + $table->string('region_code', 3)->default(''); |
|
30 | + $table->string('sub_region_code', 3)->default(''); |
|
31 | + $table->boolean('eea')->default(0); |
|
32 | + $table->string('calling_code', 3)->nullable(); |
|
33 | + $table->string('flag', 6)->nullable(); |
|
34 | 34 | |
35 | - $table->primary('id'); |
|
36 | - }); |
|
37 | - } |
|
35 | + $table->primary('id'); |
|
36 | + }); |
|
37 | + } |
|
38 | 38 | |
39 | - /** |
|
40 | - * Reverse the migrations. |
|
41 | - * |
|
42 | - * @return void |
|
43 | - */ |
|
44 | - public function down() |
|
45 | - { |
|
46 | - Schema::drop(\Config::get('countries.table_name')); |
|
47 | - } |
|
39 | + /** |
|
40 | + * Reverse the migrations. |
|
41 | + * |
|
42 | + * @return void |
|
43 | + */ |
|
44 | + public function down() |
|
45 | + { |
|
46 | + Schema::drop(\Config::get('countries.table_name')); |
|
47 | + } |
|
48 | 48 | |
49 | 49 | } |
@@ -67,7 +67,7 @@ |
||
67 | 67 | // be default give all users the client role (normal user) |
68 | 68 | $this->assignRoleTask->run($user, ['client']); |
69 | 69 | |
70 | - // add Client as role for normal users |
|
70 | + // add Client as role for normal users |
|
71 | 71 | $this->fireUserCreatedEventTask->run($user); |
72 | 72 | |
73 | 73 | return $user; |
@@ -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); |
@@ -13,16 +13,16 @@ |
||
13 | 13 | class AdminsCriteria extends Criteria |
14 | 14 | { |
15 | 15 | |
16 | - /** |
|
17 | - * @param $model |
|
18 | - * @param \Prettus\Repository\Contracts\RepositoryInterface $repository |
|
19 | - * |
|
20 | - * @return mixed |
|
21 | - */ |
|
22 | - public function apply($model, PrettusRepositoryInterface $repository) |
|
23 | - { |
|
16 | + /** |
|
17 | + * @param $model |
|
18 | + * @param \Prettus\Repository\Contracts\RepositoryInterface $repository |
|
19 | + * |
|
20 | + * @return mixed |
|
21 | + */ |
|
22 | + public function apply($model, PrettusRepositoryInterface $repository) |
|
23 | + { |
|
24 | 24 | return $model->whereHas('roles', function ($q) { |
25 | - $q->where('name', 'admin'); |
|
25 | + $q->where('name', 'admin'); |
|
26 | 26 | }); |
27 | - } |
|
27 | + } |
|
28 | 28 | } |
@@ -54,12 +54,12 @@ |
||
54 | 54 | return $this->response->paginator($users, new UserTransformer()); |
55 | 55 | } |
56 | 56 | |
57 | - /** |
|
58 | - * @param \App\Containers\User\UI\API\Requests\ListAllUsersRequest $request |
|
59 | - * @param \App\Containers\User\Actions\ListAndSearchUsersAction $action |
|
60 | - * |
|
61 | - * @return \Dingo\Api\Http\Response |
|
62 | - */ |
|
57 | + /** |
|
58 | + * @param \App\Containers\User\UI\API\Requests\ListAllUsersRequest $request |
|
59 | + * @param \App\Containers\User\Actions\ListAndSearchUsersAction $action |
|
60 | + * |
|
61 | + * @return \Dingo\Api\Http\Response |
|
62 | + */ |
|
63 | 63 | public function listAllAdmins(ListAllUsersRequest $request, ListAndSearchUsersAction $action) |
64 | 64 | { |
65 | 65 | $users = $action->run(true, true); |
@@ -61,13 +61,13 @@ |
||
61 | 61 | return $id; |
62 | 62 | } |
63 | 63 | |
64 | - /** |
|
65 | - * Will be used by the Eloquent Models (since it's used as trait there). |
|
66 | - * |
|
67 | - * @param null $key |
|
68 | - * |
|
69 | - * @return mixed |
|
70 | - */ |
|
64 | + /** |
|
65 | + * Will be used by the Eloquent Models (since it's used as trait there). |
|
66 | + * |
|
67 | + * @param null $key |
|
68 | + * |
|
69 | + * @return mixed |
|
70 | + */ |
|
71 | 71 | public function getHashedKey($key = null) |
72 | 72 | { |
73 | 73 | // hash the ID only if hash-id enabled in the config |
@@ -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 | ]); |