@@ -33,12 +33,12 @@ |
||
| 33 | 33 | /** |
| 34 | 34 | * @param $userId |
| 35 | 35 | * @param null $token |
| 36 | - * @param null $expiresIn |
|
| 37 | - * @param null $refreshToken |
|
| 38 | - * @param null $tokenSecret |
|
| 36 | + * @param boolean|null $expiresIn |
|
| 37 | + * @param boolean|null $refreshToken |
|
| 38 | + * @param boolean|null $tokenSecret |
|
| 39 | 39 | * @param null $provider |
| 40 | 40 | * @param null $avatar |
| 41 | - * @param null $avatar_original |
|
| 41 | + * @param boolean|null $avatar_original |
|
| 42 | 42 | * @param null $socialId |
| 43 | 43 | * @param null $nickname |
| 44 | 44 | * @param null $name |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | $this->baseUrl = env('API_FULL_URL'); // this reads the value from `phpunit.xml` during testing |
| 58 | 58 | |
| 59 | 59 | // override the default subDomain of the base URL when subDomain property is defined inside a test |
| 60 | - if(property_exists($this, 'subDomain')){ |
|
| 60 | + if (property_exists($this, 'subDomain')) { |
|
| 61 | 61 | $this->overrideSubDomain($this->subDomain); |
| 62 | 62 | } |
| 63 | 63 | |
@@ -418,7 +418,7 @@ |
||
| 418 | 418 | */ |
| 419 | 419 | public function overrideSubDomain($subDomain, $url = null) |
| 420 | 420 | { |
| 421 | - $url = ($url) ? : $this->baseUrl; |
|
| 421 | + $url = ($url) ?: $this->baseUrl; |
|
| 422 | 422 | |
| 423 | 423 | $info = parse_url($url); |
| 424 | 424 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | public $loggedInTestingUser; |
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | - * @param $endpoint |
|
| 40 | + * @param string $endpoint |
|
| 41 | 41 | * @param string $verb |
| 42 | 42 | * @param array $data |
| 43 | 43 | * @param bool $protected |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | /** |
| 136 | - * @return App\Containers\User\Models\User|mixed |
|
| 136 | + * @return User |
|
| 137 | 137 | */ |
| 138 | 138 | public function getLoggedInTestingAdmin() |
| 139 | 139 | { |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | /** |
| 172 | 172 | * @param null $userDetails |
| 173 | 173 | * |
| 174 | - * @return mixed |
|
| 174 | + * @return User |
|
| 175 | 175 | */ |
| 176 | 176 | public function registerAndLoginTestingUser($userDetails = null) |
| 177 | 177 | { |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | /** |
| 203 | 203 | * @param null $userDetails |
| 204 | 204 | * |
| 205 | - * @return mixed |
|
| 205 | + * @return User |
|
| 206 | 206 | */ |
| 207 | 207 | public function registerAndLoginTestingAdmin($userDetails = null) |
| 208 | 208 | { |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | * |
| 219 | 219 | * @param null $userDetails |
| 220 | 220 | * |
| 221 | - * @return mixed |
|
| 221 | + * @return User |
|
| 222 | 222 | */ |
| 223 | 223 | public function registerAndLoginTestingDeveloper($userDetails = null) |
| 224 | 224 | { |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | } |
| 234 | 234 | |
| 235 | 235 | /** |
| 236 | - * @param $keys |
|
| 236 | + * @param string[] $keys |
|
| 237 | 237 | * @param $response |
| 238 | 238 | */ |
| 239 | 239 | public function assertResponseContainKeys($keys, $response) |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace App\Port\Tests\PHPUnit\Traits; |
| 4 | 4 | |
| 5 | 5 | use App; |
| 6 | -use App\Containers\Application\Actions\CreateApplicationWithTokenAction; |
|
| 7 | 6 | use App\Containers\Authorization\Models\Role; |
| 8 | 7 | use App\Containers\Authorization\Tasks\AssignRoleTask; |
| 9 | 8 | use App\Containers\User\Actions\CreateUserAction; |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | { |
| 15 | 15 | $config = config('laravel-permission.table_names'); |
| 16 | 16 | |
| 17 | - Schema::create($config['roles'], function (Blueprint $table) { |
|
| 17 | + Schema::create($config['roles'], function(Blueprint $table) { |
|
| 18 | 18 | $table->increments('id'); |
| 19 | 19 | $table->string('name')->unique(); |
| 20 | 20 | $table->string('display_name')->nullable(); |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | $table->timestamps(); |
| 23 | 23 | }); |
| 24 | 24 | |
| 25 | - Schema::create($config['permissions'], function (Blueprint $table) { |
|
| 25 | + Schema::create($config['permissions'], function(Blueprint $table) { |
|
| 26 | 26 | $table->increments('id'); |
| 27 | 27 | $table->string('name')->unique(); |
| 28 | 28 | $table->string('display_name')->nullable(); |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | $table->timestamps(); |
| 31 | 31 | }); |
| 32 | 32 | |
| 33 | - Schema::create($config['user_has_permissions'], function (Blueprint $table) use ($config) { |
|
| 33 | + Schema::create($config['user_has_permissions'], function(Blueprint $table) use ($config) { |
|
| 34 | 34 | $table->integer('user_id')->unsigned(); |
| 35 | 35 | $table->integer('permission_id')->unsigned(); |
| 36 | 36 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | $table->primary(['user_id', 'permission_id']); |
| 48 | 48 | }); |
| 49 | 49 | |
| 50 | - Schema::create($config['user_has_roles'], function (Blueprint $table) use ($config) { |
|
| 50 | + Schema::create($config['user_has_roles'], function(Blueprint $table) use ($config) { |
|
| 51 | 51 | $table->integer('role_id')->unsigned(); |
| 52 | 52 | $table->integer('user_id')->unsigned(); |
| 53 | 53 | |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $table->primary(['role_id', 'user_id']); |
| 65 | 65 | }); |
| 66 | 66 | |
| 67 | - Schema::create($config['role_has_permissions'], function (Blueprint $table) use ($config) { |
|
| 67 | + Schema::create($config['role_has_permissions'], function(Blueprint $table) use ($config) { |
|
| 68 | 68 | $table->integer('permission_id')->unsigned(); |
| 69 | 69 | $table->integer('role_id')->unsigned(); |
| 70 | 70 | |
@@ -3,10 +3,7 @@ |
||
| 3 | 3 | namespace App\Containers\Order\UI\API\Tests\Functional; |
| 4 | 4 | |
| 5 | 5 | use App\Containers\Order\Models\Order; |
| 6 | -use App\Containers\Invoice\Models\Invoice; |
|
| 7 | -use App\Containers\User\Models\User; |
|
| 8 | 6 | use App\Port\Tests\PHPUnit\Abstracts\TestCase; |
| 9 | -use Vinkla\Hashids\Facades\Hashids; |
|
| 10 | 7 | |
| 11 | 8 | /** |
| 12 | 9 | * Class FindPermissionByNameTest. |
@@ -3,10 +3,7 @@ |
||
| 3 | 3 | namespace App\Containers\Order\UI\API\Tests\Functional; |
| 4 | 4 | |
| 5 | 5 | use App\Containers\Order\Models\Order; |
| 6 | -use App\Containers\Invoice\Models\Invoice; |
|
| 7 | -use App\Containers\User\Models\User; |
|
| 8 | 6 | use App\Port\Tests\PHPUnit\Abstracts\TestCase; |
| 9 | -use Vinkla\Hashids\Facades\Hashids; |
|
| 10 | 7 | |
| 11 | 8 | /** |
| 12 | 9 | * Class FindRoleByNameTest. |
@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace App\Containers\Authorization\UI\API\Tests\Functional; |
| 4 | 4 | |
| 5 | -use App\Containers\Authorization\Models\User; |
|
| 6 | 5 | use App\Port\Tests\PHPUnit\Abstracts\TestCase; |
| 7 | 6 | |
| 8 | 7 | /** |
@@ -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; |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | /** |
| 22 | 22 | * GetAdminRoleAction constructor. |
| 23 | 23 | * |
| 24 | - * @param \App\Containers\Authorization\Data\Repositories\AssignRoleTask $assignRoleTask |
|
| 24 | + * @param AssignRoleTask $assignRoleTask |
|
| 25 | 25 | */ |
| 26 | 26 | public function __construct(AssignRoleTask $assignRoleTask) |
| 27 | 27 | { |