From d6672981cbf79cd98af9a73794fb3c180dc105c4 Mon Sep 17 00:00:00 2001 From: Leon Jacobs Date: Thu, 30 Sep 2021 11:56:26 +0200 Subject: [PATCH] Apply fixes from StyleCI (#67) Co-authored-by: Leon Jacobs --- src/ApiServiceProvider.php | 3 +- .../Controllers/Admin/ApiAdminController.php | 9 ++-- src/Http/Controllers/Api/v2/ApiController.php | 1 + .../Api/v2/CharacterController.php | 44 +++++++------------ .../Api/v2/CorporationController.php | 28 +++++------- .../Api/v2/KillmailsController.php | 8 ++-- .../Controllers/Api/v2/RoleController.php | 12 +++-- .../Api/v2/RoleLookupController.php | 11 +++-- .../Controllers/Api/v2/SquadController.php | 6 +-- .../Controllers/Api/v2/UserController.php | 9 ++-- src/Http/DataTables/ApiTokenLogDataTable.php | 1 + src/Http/DataTables/Scopes/ApiTokenScope.php | 4 +- src/Http/Middleware/ApiRequest.php | 2 +- src/Http/Middleware/ApiToken.php | 13 +++--- src/Http/Resources/CharacterSheetResource.php | 3 +- src/Http/Resources/ContactResource.php | 4 +- src/Http/Resources/ContractResource.php | 4 +- .../Resources/CorporationHistoryResource.php | 4 +- .../Resources/CorporationSheetResource.php | 4 +- src/Http/Resources/GroupResource.php | 4 +- src/Http/Resources/IndustryResource.php | 4 +- src/Http/Resources/JumpcloneResource.php | 4 +- src/Http/Resources/KillmailDetailResource.php | 4 +- src/Http/Resources/MailResource.php | 4 +- src/Http/Resources/MemberTrackingResource.php | 4 +- src/Http/Resources/NotificationResource.php | 4 +- src/Http/Resources/PermissionResource.php | 2 +- src/Http/Resources/RoleResource.php | 2 +- src/Http/Resources/SquadResource.php | 2 +- src/Http/Resources/UserResource.php | 4 +- src/Http/Traits/Filterable.php | 16 +++---- src/Http/Validation/NewUser.php | 1 + src/Models/ApiToken.php | 2 + src/Models/ApiTokenLog.php | 1 + 34 files changed, 103 insertions(+), 125 deletions(-) diff --git a/src/ApiServiceProvider.php b/src/ApiServiceProvider.php index 3de3503..9ae4fb5 100644 --- a/src/ApiServiceProvider.php +++ b/src/ApiServiceProvider.php @@ -30,6 +30,7 @@ /** * Class ApiServiceProvider. + * * @package Seat\Api */ class ApiServiceProvider extends AbstractSeatPlugin @@ -37,7 +38,7 @@ class ApiServiceProvider extends AbstractSeatPlugin /** * Bootstrap the application services. * - * @param \Illuminate\Routing\Router $router + * @param \Illuminate\Routing\Router $router */ public function boot(Router $router) { diff --git a/src/Http/Controllers/Admin/ApiAdminController.php b/src/Http/Controllers/Admin/ApiAdminController.php index 2877f65..91c91b3 100644 --- a/src/Http/Controllers/Admin/ApiAdminController.php +++ b/src/Http/Controllers/Admin/ApiAdminController.php @@ -31,6 +31,7 @@ /** * Class ApiAdminController. + * * @package Seat\Api\Http\Controllers\Admin */ class ApiAdminController extends Controller @@ -47,8 +48,7 @@ public function listTokens() } /** - * @param \Seat\Api\Http\Validation\NewToken $request - * + * @param \Seat\Api\Http\Validation\NewToken $request * @return \Illuminate\Http\RedirectResponse */ public function generateToken(NewToken $request) @@ -65,7 +65,6 @@ public function generateToken(NewToken $request) /** * @param $token_id - * * @return \Illuminate\Http\RedirectResponse */ public function deleteToken($token_id) @@ -78,8 +77,8 @@ public function deleteToken($token_id) } /** - * @param int $token_id - * @param \Seat\Api\Http\DataTables\ApiTokenLogDataTable $dataTable + * @param int $token_id + * @param \Seat\Api\Http\DataTables\ApiTokenLogDataTable $dataTable * @return mixed */ public function show(int $token_id, ApiTokenLogDataTable $dataTable) diff --git a/src/Http/Controllers/Api/v2/ApiController.php b/src/Http/Controllers/Api/v2/ApiController.php index cda9c28..177e198 100644 --- a/src/Http/Controllers/Api/v2/ApiController.php +++ b/src/Http/Controllers/Api/v2/ApiController.php @@ -79,6 +79,7 @@ /** * Class ApiController. + * * @package Seat\Api\v2 */ class ApiController extends BaseController diff --git a/src/Http/Controllers/Api/v2/CharacterController.php b/src/Http/Controllers/Api/v2/CharacterController.php index 8e254a4..f69b3b1 100644 --- a/src/Http/Controllers/Api/v2/CharacterController.php +++ b/src/Http/Controllers/Api/v2/CharacterController.php @@ -104,9 +104,8 @@ class CharacterController extends ApiController * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * @param int $item_id - * + * @param int $character_id + * @param int $item_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getAssets(int $character_id) @@ -172,8 +171,7 @@ public function getAssets(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getContacts(int $character_id) @@ -238,8 +236,7 @@ public function getContacts(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getContracts(int $character_id) @@ -307,8 +304,7 @@ public function getContracts(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getCorporationHistory(int $character_id) @@ -373,8 +369,7 @@ public function getCorporationHistory(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getIndustry(int $character_id) @@ -439,8 +434,7 @@ public function getIndustry(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getJumpClones(int $character_id) @@ -505,8 +499,7 @@ public function getJumpClones(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getMail(int $character_id) @@ -575,8 +568,7 @@ public function getMail(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getMarketOrders(int $character_id) @@ -642,8 +634,7 @@ public function getMarketOrders(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getNotifications(int $character_id) @@ -692,8 +683,7 @@ public function getNotifications(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Seat\Api\Http\Resources\CharacterSheetResource */ public function getSheet(int $character_id) @@ -751,8 +741,7 @@ public function getSheet(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getSkills(int $character_id) @@ -818,8 +807,7 @@ public function getSkills(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getSkillQueue(int $character_id) @@ -884,8 +872,7 @@ public function getSkillQueue(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getWalletJournal(int $character_id) @@ -951,8 +938,7 @@ public function getWalletJournal(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id - * + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getWalletTransactions(int $character_id) diff --git a/src/Http/Controllers/Api/v2/CorporationController.php b/src/Http/Controllers/Api/v2/CorporationController.php index c5625a2..66e04f8 100644 --- a/src/Http/Controllers/Api/v2/CorporationController.php +++ b/src/Http/Controllers/Api/v2/CorporationController.php @@ -41,6 +41,7 @@ /** * Class CorporationController. + * * @package Seat\Api\Http\Controllers\Api\v2 */ class CorporationController extends ApiController @@ -95,8 +96,7 @@ class CorporationController extends ApiController * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $corporation_id - * + * @param int $corporation_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getAssets(int $corporation_id) @@ -162,8 +162,7 @@ public function getAssets(int $corporation_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $corporation_id - * + * @param int $corporation_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getContacts(int $corporation_id) @@ -229,8 +228,7 @@ public function getContacts(int $corporation_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $corporation_id - * + * @param int $corporation_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getContracts(int $corporation_id) @@ -296,8 +294,7 @@ public function getContracts(int $corporation_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $corporation_id - * + * @param int $corporation_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getIndustry(int $corporation_id) @@ -363,8 +360,7 @@ public function getIndustry(int $corporation_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $corporation_id - * + * @param int $corporation_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getMarketOrders(int $corporation_id) @@ -430,8 +426,7 @@ public function getMarketOrders(int $corporation_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $corporation_id - * + * @param int $corporation_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getMemberTracking(int $corporation_id) @@ -480,8 +475,7 @@ public function getMemberTracking(int $corporation_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $corporation_id - * + * @param int $corporation_id * @return \Seat\Api\Http\Resources\CorporationSheetResource */ public function getSheet(int $corporation_id) @@ -538,8 +532,7 @@ public function getSheet(int $corporation_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $corporation_id - * + * @param int $corporation_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getWalletJournal(int $corporation_id) @@ -605,8 +598,7 @@ public function getWalletJournal(int $corporation_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $corporation_id - * + * @param int $corporation_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getWalletTransactions(int $corporation_id) diff --git a/src/Http/Controllers/Api/v2/KillmailsController.php b/src/Http/Controllers/Api/v2/KillmailsController.php index d09908f..4269dc7 100644 --- a/src/Http/Controllers/Api/v2/KillmailsController.php +++ b/src/Http/Controllers/Api/v2/KillmailsController.php @@ -29,6 +29,7 @@ /** * Class KillmailsController. + * * @package Seat\Api\Http\Controllers\Api\v2 */ class KillmailsController extends ApiController @@ -73,7 +74,7 @@ class KillmailsController extends ApiController * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $character_id + * @param int $character_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getCharacterKillmails(int $character_id) @@ -128,7 +129,7 @@ public function getCharacterKillmails(int $character_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $corporation_id + * @param int $corporation_id * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection */ public function getCorporationKillmails(int $corporation_id) @@ -206,8 +207,7 @@ public function getCorporationKillmails(int $corporation_id) * * Returns a detailed killmail * - * @param int $killmail_id - * + * @param int $killmail_id * @return \Seat\Api\Http\Resources\KillmailDetailResource */ public function getDetail(int $killmail_id) diff --git a/src/Http/Controllers/Api/v2/RoleController.php b/src/Http/Controllers/Api/v2/RoleController.php index 6ba9448..4158b21 100644 --- a/src/Http/Controllers/Api/v2/RoleController.php +++ b/src/Http/Controllers/Api/v2/RoleController.php @@ -33,6 +33,7 @@ /** * Class RoleController. + * * @package Seat\Api\Http\Controllers\Api\v1 */ class RoleController extends ApiController @@ -111,7 +112,7 @@ public function getIndex() * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $role_id + * @param int $role_id * @return \Seat\Api\Http\Resources\RoleResource */ public function getDetail(int $role_id) @@ -201,7 +202,7 @@ public function getDetail(int $role_id) * ), * ) * - * @param \Seat\Api\Http\Validation\NewRole $request + * @param \Seat\Api\Http\Validation\NewRole $request * @return \Seat\Api\Http\Resources\RoleResource */ public function postNew(NewRole $request) @@ -305,8 +306,8 @@ public function postNew(NewRole $request) * ), * ) * - * @param \Seat\Api\Http\Validation\EditRole $request - * @param int $role_id + * @param \Seat\Api\Http\Validation\EditRole $request + * @param int $role_id * @return \Illuminate\Http\JsonResponse|\Seat\Api\Http\Resources\RoleResource */ public function patch(EditRole $request, int $role_id) @@ -355,7 +356,6 @@ public function patch(EditRole $request, int $role_id) * ) * * @param $role_id - * * @return \Illuminate\Http\JsonResponse */ public function deleteRole($role_id) @@ -402,7 +402,6 @@ public function deleteRole($role_id) * ) * * @param $request - * * @return \Illuminate\Http\JsonResponse */ public function postGrantUserRole(Request $request) @@ -451,7 +450,6 @@ public function postGrantUserRole(Request $request) * * @param $user_id * @param $role_id - * * @return \Illuminate\Http\JsonResponse */ public function deleteRevokeUserRole($user_id, $role_id) diff --git a/src/Http/Controllers/Api/v2/RoleLookupController.php b/src/Http/Controllers/Api/v2/RoleLookupController.php index c357214..4f919b6 100644 --- a/src/Http/Controllers/Api/v2/RoleLookupController.php +++ b/src/Http/Controllers/Api/v2/RoleLookupController.php @@ -26,6 +26,7 @@ /** * Class RoleLookupController. + * * @package Seat\Api\Http\Controllers\Api\v1 */ class RoleLookupController extends ApiController @@ -103,9 +104,8 @@ public function getPermissions() * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $user_id - * @param string $role_name - * + * @param int $user_id + * @param string $role_name * @return \Illuminate\Http\JsonResponse */ public function getRoleCheck(int $user_id, string $role_name) @@ -148,9 +148,8 @@ public function getRoleCheck(int $user_id, string $role_name) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $user_id - * @param string $permission_name - * + * @param int $user_id + * @param string $permission_name * @return \Illuminate\Http\JsonResponse */ public function getPermissionCheck(int $user_id, string $permission_name) diff --git a/src/Http/Controllers/Api/v2/SquadController.php b/src/Http/Controllers/Api/v2/SquadController.php index 421dbce..0d20ebb 100644 --- a/src/Http/Controllers/Api/v2/SquadController.php +++ b/src/Http/Controllers/Api/v2/SquadController.php @@ -103,7 +103,7 @@ public function index() * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $squad_id + * @param int $squad_id * @return \Seat\Api\Http\Resources\SquadResource */ public function show(int $squad_id) @@ -164,7 +164,7 @@ public function show(int $squad_id) * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param \Seat\Api\Http\Validation\NewSquad $request + * @param \Seat\Api\Http\Validation\NewSquad $request * @return \Seat\Api\Http\Resources\SquadResource */ public function store(NewSquad $request) @@ -205,7 +205,7 @@ public function store(NewSquad $request) * @OA\Response(response=401, description="Unauthorized") * ) * - * @param int $squad_id + * @param int $squad_id * @return \Illuminate\Http\JsonResponse */ public function destroy(int $squad_id) diff --git a/src/Http/Controllers/Api/v2/UserController.php b/src/Http/Controllers/Api/v2/UserController.php index 1a88189..3c6adeb 100644 --- a/src/Http/Controllers/Api/v2/UserController.php +++ b/src/Http/Controllers/Api/v2/UserController.php @@ -28,6 +28,7 @@ /** * Class UserController. + * * @package Seat\Api\Http\Controllers\Api\v2 */ class UserController extends ApiController @@ -102,7 +103,7 @@ public function getUsers() * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param int $user_id + * @param int $user_id * @return \Seat\Api\Http\Resources\UserResource */ public function show(int $user_id) @@ -131,6 +132,7 @@ public function show(int $user_id) * ) * * @return \Illuminate\Http\JsonResponse + * * @throws \Seat\Services\Exceptions\SettingException */ public function getConfiguredScopes() @@ -194,7 +196,7 @@ public function getConfiguredScopes() * @OA\Response(response=401, description="Unauthorized"), * ) * - * @param \Seat\Api\Http\Validation\NewUser $request + * @param \Seat\Api\Http\Validation\NewUser $request * @return \Illuminate\Http\JsonResponse|\Seat\Api\Http\Resources\UserResource */ public function postNewUser(NewUser $request) @@ -245,8 +247,7 @@ public function postNewUser(NewUser $request) * @OA\Response(response=403, description="Unauthorized"), * ) * - * @param int $user_id - * + * @param int $user_id * @return \Illuminate\Http\JsonResponse */ public function deleteUser(int $user_id) diff --git a/src/Http/DataTables/ApiTokenLogDataTable.php b/src/Http/DataTables/ApiTokenLogDataTable.php index bac1124..ddc601f 100644 --- a/src/Http/DataTables/ApiTokenLogDataTable.php +++ b/src/Http/DataTables/ApiTokenLogDataTable.php @@ -34,6 +34,7 @@ class ApiTokenLogDataTable extends DataTable { /** * @return \Illuminate\Http\JsonResponse + * * @throws \Exception */ public function ajax() diff --git a/src/Http/DataTables/Scopes/ApiTokenScope.php b/src/Http/DataTables/Scopes/ApiTokenScope.php index b4fa548..857ea03 100644 --- a/src/Http/DataTables/Scopes/ApiTokenScope.php +++ b/src/Http/DataTables/Scopes/ApiTokenScope.php @@ -36,7 +36,7 @@ class ApiTokenScope implements DataTableScope /** * ApiTokenScope constructor. * - * @param int $token_id + * @param int $token_id */ public function __construct(int $token_id) { @@ -46,7 +46,7 @@ public function __construct(int $token_id) /** * Apply a query scope. * - * @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query + * @param \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder $query * @return mixed */ public function apply($query) diff --git a/src/Http/Middleware/ApiRequest.php b/src/Http/Middleware/ApiRequest.php index 8579bb9..049b8e3 100644 --- a/src/Http/Middleware/ApiRequest.php +++ b/src/Http/Middleware/ApiRequest.php @@ -29,7 +29,7 @@ class ApiRequest { /** * @param $request - * @param \Closure $next + * @param \Closure $next * @return mixed|void */ public function handle($request, Closure $next) diff --git a/src/Http/Middleware/ApiToken.php b/src/Http/Middleware/ApiToken.php index bc8d9dd..7932006 100644 --- a/src/Http/Middleware/ApiToken.php +++ b/src/Http/Middleware/ApiToken.php @@ -29,6 +29,7 @@ /** * Class ApiToken. + * * @package Seat\Api\Http\Middleware */ class ApiToken @@ -36,9 +37,8 @@ class ApiToken /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next - * + * @param \Illuminate\Http\Request $request + * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) @@ -59,8 +59,7 @@ public function handle($request, Closure $next) /** * Validate a token / ip pair from a Request. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return mixed */ public function valid_token_ip(Request $request) @@ -74,8 +73,8 @@ public function valid_token_ip(Request $request) /** * Log an API request based on the config setting. * - * @param \Illuminate\Http\Request $request - * @param $action + * @param \Illuminate\Http\Request $request + * @param $action */ public function log_activity(Request $request, $action) { diff --git a/src/Http/Resources/CharacterSheetResource.php b/src/Http/Resources/CharacterSheetResource.php index 562a043..a1c1637 100644 --- a/src/Http/Resources/CharacterSheetResource.php +++ b/src/Http/Resources/CharacterSheetResource.php @@ -58,8 +58,7 @@ class CharacterSheetResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/ContactResource.php b/src/Http/Resources/ContactResource.php index 13b56b9..e2dd35e 100644 --- a/src/Http/Resources/ContactResource.php +++ b/src/Http/Resources/ContactResource.php @@ -26,6 +26,7 @@ /** * Class ContactResource. + * * @package Seat\Api\Http\Resources */ class ContactResource extends Resource @@ -33,8 +34,7 @@ class ContactResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/ContractResource.php b/src/Http/Resources/ContractResource.php index ace2baf..72f51e5 100644 --- a/src/Http/Resources/ContractResource.php +++ b/src/Http/Resources/ContractResource.php @@ -26,6 +26,7 @@ /** * Class ContractResource. + * * @package Seat\Api\Http\Resources */ class ContractResource extends Resource @@ -33,8 +34,7 @@ class ContractResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/CorporationHistoryResource.php b/src/Http/Resources/CorporationHistoryResource.php index 0c4fe71..b54afc8 100644 --- a/src/Http/Resources/CorporationHistoryResource.php +++ b/src/Http/Resources/CorporationHistoryResource.php @@ -27,6 +27,7 @@ /** * Class CorporationHistoryResource. + * * @package Seat\Api\Http\Resources */ class CorporationHistoryResource extends Resource @@ -34,8 +35,7 @@ class CorporationHistoryResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/CorporationSheetResource.php b/src/Http/Resources/CorporationSheetResource.php index c82acd9..606884b 100644 --- a/src/Http/Resources/CorporationSheetResource.php +++ b/src/Http/Resources/CorporationSheetResource.php @@ -26,6 +26,7 @@ /** * Class CorporationSheetResource. + * * @package Seat\Api\Http\Resources */ class CorporationSheetResource extends Resource @@ -33,8 +34,7 @@ class CorporationSheetResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/GroupResource.php b/src/Http/Resources/GroupResource.php index e61adca..4d6e270 100644 --- a/src/Http/Resources/GroupResource.php +++ b/src/Http/Resources/GroupResource.php @@ -26,6 +26,7 @@ /** * Class GroupResource. + * * @package Seat\Api\Http\Resources */ class GroupResource extends Resource @@ -33,8 +34,7 @@ class GroupResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/IndustryResource.php b/src/Http/Resources/IndustryResource.php index df68db3..5b6aae1 100644 --- a/src/Http/Resources/IndustryResource.php +++ b/src/Http/Resources/IndustryResource.php @@ -26,6 +26,7 @@ /** * Class IndustryResource. + * * @package Seat\Api\Http\Resources */ class IndustryResource extends Resource @@ -33,8 +34,7 @@ class IndustryResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/JumpcloneResource.php b/src/Http/Resources/JumpcloneResource.php index 7d7e278..0569e54 100644 --- a/src/Http/Resources/JumpcloneResource.php +++ b/src/Http/Resources/JumpcloneResource.php @@ -27,6 +27,7 @@ /** * Class JumpcloneResource. + * * @package Seat\Api\Http\Resources */ class JumpcloneResource extends Resource @@ -34,8 +35,7 @@ class JumpcloneResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/KillmailDetailResource.php b/src/Http/Resources/KillmailDetailResource.php index 64feadb..3a76e05 100644 --- a/src/Http/Resources/KillmailDetailResource.php +++ b/src/Http/Resources/KillmailDetailResource.php @@ -27,6 +27,7 @@ /** * Class KillmailDetailResource. + * * @package Seat\Api\Http\Resources */ class KillmailDetailResource extends Resource @@ -34,8 +35,7 @@ class KillmailDetailResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/MailResource.php b/src/Http/Resources/MailResource.php index eaa331d..25c69f0 100644 --- a/src/Http/Resources/MailResource.php +++ b/src/Http/Resources/MailResource.php @@ -27,6 +27,7 @@ /** * Class MailResource. + * * @package Seat\Api\Http\Resources * * @OA\Schema( @@ -46,8 +47,7 @@ class MailResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/MemberTrackingResource.php b/src/Http/Resources/MemberTrackingResource.php index 646dab7..78734a1 100644 --- a/src/Http/Resources/MemberTrackingResource.php +++ b/src/Http/Resources/MemberTrackingResource.php @@ -26,6 +26,7 @@ /** * Class MemberTrackingResource. + * * @package Seat\Api\Http\Resources */ class MemberTrackingResource extends Resource @@ -33,8 +34,7 @@ class MemberTrackingResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/NotificationResource.php b/src/Http/Resources/NotificationResource.php index 86aef22..f19072f 100644 --- a/src/Http/Resources/NotificationResource.php +++ b/src/Http/Resources/NotificationResource.php @@ -27,6 +27,7 @@ /** * Class NotificationResource. + * * @package Seat\Api\Http\Resources */ class NotificationResource extends Resource @@ -34,8 +35,7 @@ class NotificationResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/PermissionResource.php b/src/Http/Resources/PermissionResource.php index d4d6855..b403043 100644 --- a/src/Http/Resources/PermissionResource.php +++ b/src/Http/Resources/PermissionResource.php @@ -41,7 +41,7 @@ class PermissionResource extends Resource { /** - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/RoleResource.php b/src/Http/Resources/RoleResource.php index 1901452..b0c3ddd 100644 --- a/src/Http/Resources/RoleResource.php +++ b/src/Http/Resources/RoleResource.php @@ -55,7 +55,7 @@ class RoleResource extends Resource { /** - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/SquadResource.php b/src/Http/Resources/SquadResource.php index 14bc934..1c310bb 100644 --- a/src/Http/Resources/SquadResource.php +++ b/src/Http/Resources/SquadResource.php @@ -60,7 +60,7 @@ class SquadResource extends Resource { /** - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Resources/UserResource.php b/src/Http/Resources/UserResource.php index 103c435..d2324d1 100644 --- a/src/Http/Resources/UserResource.php +++ b/src/Http/Resources/UserResource.php @@ -26,6 +26,7 @@ /** * Class UserResource. + * * @package Seat\Api\Http\Resources * * @OA\Schema( @@ -96,8 +97,7 @@ class UserResource extends Resource /** * Transform the resource into an array. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return array */ public function toArray($request) diff --git a/src/Http/Traits/Filterable.php b/src/Http/Traits/Filterable.php index d4b8207..3e17ec8 100644 --- a/src/Http/Traits/Filterable.php +++ b/src/Http/Traits/Filterable.php @@ -35,9 +35,8 @@ trait Filterable /** * Apply OData filter over query. * - * @param \Illuminate\Http\Request $request - * @param \Illuminate\Database\Eloquent\Builder $query - * + * @param \Illuminate\Http\Request $request + * @param \Illuminate\Database\Eloquent\Builder $query * @return \Illuminate\Database\Eloquent\Builder */ protected function applyFilters(Request $request, Builder $query) @@ -63,11 +62,11 @@ protected function applyFilters(Request $request, Builder $query) /** * Append filter to current query builder. * - * @param \Illuminate\Database\Eloquent\Builder $query - * @param string $field - * @param string $operator + * @param \Illuminate\Database\Eloquent\Builder $query + * @param string $field + * @param string $operator * @param $value - * @param string|null $join + * @param string|null $join */ protected function addFilter(Builder $query, string $field, string $operator, $value, ?string $join = 'and') { @@ -82,8 +81,7 @@ protected function addFilter(Builder $query, string $field, string $operator, $v /** * Convert odata operator into an SQL query operator. * - * @param string $operator - * + * @param string $operator * @return string */ private function odataOperatorToQueryOperator(string $operator): string diff --git a/src/Http/Validation/NewUser.php b/src/Http/Validation/NewUser.php index 213af00..3d2c4fd 100644 --- a/src/Http/Validation/NewUser.php +++ b/src/Http/Validation/NewUser.php @@ -26,6 +26,7 @@ /** * Class NewUser. + * * @package Seat\Api\Http\Validation */ class NewUser extends FormRequest diff --git a/src/Models/ApiToken.php b/src/Models/ApiToken.php index f08e589..962a55a 100644 --- a/src/Models/ApiToken.php +++ b/src/Models/ApiToken.php @@ -26,6 +26,7 @@ /** * Class ApiToken. + * * @package Seat\Api\Models */ class ApiToken extends Model @@ -39,6 +40,7 @@ class ApiToken extends Model * Make sure we cleanup logs on delete. * * @return bool|null + * * @throws \Exception */ public function delete() diff --git a/src/Models/ApiTokenLog.php b/src/Models/ApiTokenLog.php index d661cce..f7f1623 100644 --- a/src/Models/ApiTokenLog.php +++ b/src/Models/ApiTokenLog.php @@ -26,6 +26,7 @@ /** * Class ApiTokenLog. + * * @package Seat\Api\Models */ class ApiTokenLog extends Model