From 1bd3019c1685084fd02bebe437094a21eff9417b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 16 Mar 2024 22:57:48 +0100 Subject: [PATCH] Small code cleanup. --- app/Api/V2/Controllers/Model/Account/UpdateController.php | 6 ++---- app/Api/V2/Request/Model/Account/UpdateRequest.php | 5 +---- app/Repositories/UserGroups/Account/AccountRepository.php | 3 ++- .../UserGroups/Account/AccountRepositoryInterface.php | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/app/Api/V2/Controllers/Model/Account/UpdateController.php b/app/Api/V2/Controllers/Model/Account/UpdateController.php index 877977f3d9..08b56ab2c9 100644 --- a/app/Api/V2/Controllers/Model/Account/UpdateController.php +++ b/app/Api/V2/Controllers/Model/Account/UpdateController.php @@ -68,14 +68,12 @@ class UpdateController extends Controller $account->refresh(); app('preferences')->mark(); - $transformer = new AccountTransformer(); + $transformer = new AccountTransformer(); $transformer->setParameters($this->parameters); return response() ->api($this->jsonApiObject('accounts', $account, $transformer)) ->header('Content-Type', self::CONTENT_TYPE) - ; + ; } - - } diff --git a/app/Api/V2/Request/Model/Account/UpdateRequest.php b/app/Api/V2/Request/Model/Account/UpdateRequest.php index 6576f47829..5e5a5713b3 100644 --- a/app/Api/V2/Request/Model/Account/UpdateRequest.php +++ b/app/Api/V2/Request/Model/Account/UpdateRequest.php @@ -35,13 +35,12 @@ use Illuminate\Foundation\Http\FormRequest; class UpdateRequest extends FormRequest { - use ChecksLogin; use AppendsLocationData; + use ChecksLogin; use ConvertsDataTypes; /** * TODO is a duplicate of the v1 update thing. - * @return array */ public function getUpdateData(): array { @@ -114,6 +113,4 @@ class UpdateRequest extends FormRequest return Location::requestRules($rules); } - - } diff --git a/app/Repositories/UserGroups/Account/AccountRepository.php b/app/Repositories/UserGroups/Account/AccountRepository.php index cecf5cdb60..53e8322ee8 100644 --- a/app/Repositories/UserGroups/Account/AccountRepository.php +++ b/app/Repositories/UserGroups/Account/AccountRepository.php @@ -293,7 +293,8 @@ class AccountRepository implements AccountRepositoryInterface return $dbQuery->take($limit)->get(['accounts.*']); } - #[\Override] public function update(Account $account, array $data): Account + #[\Override] + public function update(Account $account, array $data): Account { /** @var AccountUpdateService $service */ $service = app(AccountUpdateService::class); diff --git a/app/Repositories/UserGroups/Account/AccountRepositoryInterface.php b/app/Repositories/UserGroups/Account/AccountRepositoryInterface.php index 0f007432f1..9442c8f874 100644 --- a/app/Repositories/UserGroups/Account/AccountRepositoryInterface.php +++ b/app/Repositories/UserGroups/Account/AccountRepositoryInterface.php @@ -72,7 +72,7 @@ interface AccountRepositoryInterface public function setUser(User $user): void; - public function update(Account $account,array $data): Account; + public function update(Account $account, array $data): Account; public function setUserGroup(UserGroup $userGroup): void; }