@@ -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); |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use App\Containers\Authorization\Models\Permission; |
| 6 | 6 | use App\Containers\Authorization\Models\Role; |
| 7 | -use App\Containers\User\Models\User; |
|
| 8 | 7 | use App\Port\Test\PHPUnit\Abstracts\TestCase; |
| 9 | 8 | |
| 10 | 9 | /** |
@@ -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\Test\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\Test\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\Test\PHPUnit\Abstracts\TestCase; |
| 7 | 6 | |
| 8 | 7 | /** |
@@ -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\Test\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; |
@@ -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 | |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | public function transform(User $user) |
| 27 | 27 | { |
| 28 | 28 | |
| 29 | - $response = [ |
|
| 29 | + $response = [ |
|
| 30 | 30 | 'id' => $user->getHashedKey(), |
| 31 | 31 | 'name' => $user->name, |
| 32 | 32 | 'email' => $user->email, |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | */ |
| 37 | 37 | public function apply($model, PrettusRepositoryInterface $repository) |
| 38 | 38 | { |
| 39 | - if(!$this->userId){ |
|
| 39 | + if (!$this->userId) { |
|
| 40 | 40 | $this->userId = Auth::user()->id; |
| 41 | 41 | } |
| 42 | 42 | |
@@ -37,6 +37,6 @@ |
||
| 37 | 37 | */ |
| 38 | 38 | public function apply($model, PrettusRepositoryInterface $repository) |
| 39 | 39 | { |
| 40 | - return DB::table($model->getModel()->getTable())->select('*', DB::raw('count('.$this->field.') as total_count'))->groupBy($this->field); |
|
| 40 | + return DB::table($model->getModel()->getTable())->select('*', DB::raw('count(' . $this->field . ') as total_count'))->groupBy($this->field); |
|
| 41 | 41 | } |
| 42 | 42 | } |