From 1667b88dcd200e097629b8d2688e6b2f013b480e Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 30 Oct 2022 14:23:00 +0100 Subject: [PATCH] Use PSR-12 code style --- .../Autocomplete/AccountController.php | 11 +++--- .../Autocomplete/BillController.php | 1 - .../Autocomplete/ObjectGroupController.php | 1 - .../Autocomplete/PiggyBankController.php | 5 +-- .../Autocomplete/RecurrenceController.php | 1 - .../Autocomplete/RuleController.php | 1 - .../Autocomplete/TransactionController.php | 2 +- app/Api/V1/Controllers/Controller.php | 9 ++--- .../Data/Bulk/AccountController.php | 3 -- .../Data/Bulk/TransactionController.php | 1 - .../V1/Controllers/Data/DestroyController.php | 1 - .../Data/Export/ExportController.php | 2 -- .../V1/Controllers/Data/PurgeController.php | 5 ++- .../Insight/Expense/AccountController.php | 1 - .../Insight/Expense/BillController.php | 1 - .../Insight/Expense/BudgetController.php | 2 -- .../Insight/Expense/CategoryController.php | 1 - .../Insight/Expense/PeriodController.php | 2 -- .../Insight/Expense/TagController.php | 1 - .../Insight/Income/AccountController.php | 1 - .../Insight/Income/CategoryController.php | 1 - .../Insight/Income/PeriodController.php | 5 ++- .../Insight/Income/TagController.php | 7 ++-- .../Insight/Transfer/CategoryController.php | 1 - .../Insight/Transfer/PeriodController.php | 5 ++- .../Insight/Transfer/TagController.php | 6 ++-- .../Models/Account/ListController.php | 1 - .../Models/Account/ShowController.php | 1 - .../Models/Account/StoreController.php | 1 - .../Models/AvailableBudget/ShowController.php | 1 - .../Models/Bill/DestroyController.php | 1 - .../Models/Bill/ListController.php | 2 -- .../Models/Bill/UpdateController.php | 2 -- .../Models/Budget/ListController.php | 1 - .../Models/Budget/ShowController.php | 1 - .../Models/Budget/UpdateController.php | 1 - .../Models/BudgetLimit/ShowController.php | 1 - .../Models/BudgetLimit/UpdateController.php | 2 -- .../Models/Category/ListController.php | 1 - .../Models/Category/StoreController.php | 1 - .../Models/Category/UpdateController.php | 1 - .../Models/ObjectGroup/ListController.php | 1 - .../Models/PiggyBank/ListController.php | 1 - .../Models/PiggyBank/ShowController.php | 2 -- .../Models/PiggyBank/UpdateController.php | 1 - .../Models/Recurrence/ShowController.php | 1 - .../Models/Recurrence/UpdateController.php | 1 - .../Models/Rule/ShowController.php | 2 -- .../Models/RuleGroup/ListController.php | 1 - .../Models/RuleGroup/ShowController.php | 2 -- .../Models/RuleGroup/StoreController.php | 2 -- .../Models/RuleGroup/TriggerController.php | 1 - .../Models/RuleGroup/UpdateController.php | 1 - .../Controllers/Models/Tag/ShowController.php | 1 - .../Models/Tag/StoreController.php | 1 - .../Models/Tag/UpdateController.php | 2 -- .../Models/Transaction/DestroyController.php | 8 ++--- .../Models/Transaction/ListController.php | 4 +-- .../Models/Transaction/ShowController.php | 1 - .../Models/Transaction/StoreController.php | 5 +-- .../Models/Transaction/UpdateController.php | 1 - .../TransactionCurrency/ListController.php | 5 ++- .../TransactionCurrency/ShowController.php | 3 +- .../TransactionCurrency/StoreController.php | 3 +- .../TransactionCurrency/UpdateController.php | 7 ++-- .../TransactionLink/DestroyController.php | 2 -- .../Models/TransactionLink/ShowController.php | 2 -- .../TransactionLink/UpdateController.php | 1 - .../TransactionLinkType/DestroyController.php | 1 - .../TransactionLinkType/ListController.php | 1 - .../TransactionLinkType/ShowController.php | 2 -- .../TransactionLinkType/StoreController.php | 1 - .../TransactionLinkType/UpdateController.php | 1 - .../Controllers/Summary/BasicController.php | 5 +-- .../V1/Controllers/System/CronController.php | 1 - .../V1/Controllers/System/UserController.php | 2 -- .../User/PreferencesController.php | 2 -- .../Controllers/Webhook/AttemptController.php | 1 - .../Controllers/Webhook/DestroyController.php | 1 - .../Controllers/Webhook/MessageController.php | 1 - .../Controllers/Webhook/UpdateController.php | 1 - app/Api/V1/Middleware/ApiDemoUser.php | 1 - .../Autocomplete/AutocompleteRequest.php | 3 +- .../Data/Bulk/MoveTransactionsRequest.php | 6 ++-- .../Requests/Data/Bulk/TransactionRequest.php | 4 ++- app/Api/V1/Requests/Data/DateRequest.php | 3 +- app/Api/V1/Requests/Data/DestroyRequest.php | 3 +- .../V1/Requests/Data/Export/ExportRequest.php | 5 +-- .../V1/Requests/Insight/GenericRequest.php | 21 +++++------ .../Requests/Models/Account/StoreRequest.php | 8 +++-- .../Requests/Models/Account/UpdateRequest.php | 8 +++-- .../Models/Attachment/StoreRequest.php | 7 ++-- .../Models/Attachment/UpdateRequest.php | 7 ++-- .../Models/AvailableBudget/Request.php | 3 +- .../V1/Requests/Models/Bill/StoreRequest.php | 5 +-- .../V1/Requests/Models/Bill/UpdateRequest.php | 5 +-- .../Requests/Models/Budget/StoreRequest.php | 6 ++-- .../Requests/Models/Budget/UpdateRequest.php | 6 ++-- .../Models/BudgetLimit/StoreRequest.php | 4 +-- .../Models/BudgetLimit/UpdateRequest.php | 4 +-- .../Requests/Models/Category/StoreRequest.php | 3 +- .../Models/Category/UpdateRequest.php | 3 +- .../Models/ObjectGroup/UpdateRequest.php | 3 +- .../Models/PiggyBank/StoreRequest.php | 5 ++- .../Models/PiggyBank/UpdateRequest.php | 8 ++--- .../Models/Recurrence/StoreRequest.php | 25 +++++++------ .../Models/Recurrence/UpdateRequest.php | 25 +++++++------ .../V1/Requests/Models/Rule/StoreRequest.php | 19 +++++----- .../V1/Requests/Models/Rule/TestRequest.php | 5 ++- .../Requests/Models/Rule/TriggerRequest.php | 4 +-- .../V1/Requests/Models/Rule/UpdateRequest.php | 19 +++++----- .../Models/RuleGroup/StoreRequest.php | 5 +-- .../Requests/Models/RuleGroup/TestRequest.php | 4 +-- .../Models/RuleGroup/TriggerRequest.php | 4 +-- .../Models/RuleGroup/UpdateRequest.php | 5 +-- .../V1/Requests/Models/Tag/StoreRequest.php | 4 ++- .../V1/Requests/Models/Tag/UpdateRequest.php | 4 ++- .../Models/Transaction/StoreRequest.php | 35 ++++++++++--------- .../Models/Transaction/UpdateRequest.php | 30 ++++++++-------- .../TransactionCurrency/StoreRequest.php | 3 +- .../TransactionCurrency/UpdateRequest.php | 3 +- .../Models/TransactionLink/StoreRequest.php | 3 +- .../Models/TransactionLink/UpdateRequest.php | 3 +- .../TransactionLinkType/StoreRequest.php | 3 +- .../TransactionLinkType/UpdateRequest.php | 3 +- .../Requests/Models/Webhook/CreateRequest.php | 8 ++--- .../Requests/Models/Webhook/UpdateRequest.php | 6 ++-- app/Api/V1/Requests/System/UpdateRequest.php | 5 +-- .../V1/Requests/System/UserStoreRequest.php | 6 ++-- .../V1/Requests/System/UserUpdateRequest.php | 6 ++-- .../Requests/User/PreferenceStoreRequest.php | 4 +-- .../Requests/User/PreferenceUpdateRequest.php | 4 +-- .../Autocomplete/AccountController.php | 1 - .../Controllers/Chart/AccountController.php | 1 - app/Api/V2/Controllers/Controller.php | 7 ++-- .../Data/Bulk/AccountController.php | 1 - .../Data/Export/AccountController.php | 1 - .../Data/MassDestroy/AccountController.php | 1 - .../Model/Account/ShowController.php | 3 +- .../Controllers/Model/Bill/SumController.php | 2 +- .../Model/Budget/ListController.php | 1 - .../Model/Budget/SumController.php | 1 - .../Model/BudgetLimit/ListController.php | 3 +- app/Api/V2/Controllers/NetWorthController.php | 1 - .../Controllers/Search/AccountController.php | 1 - .../System/ConfigurationController.php | 1 - .../V2/Controllers/System/DebugController.php | 1 - .../System/PreferencesController.php | 4 +-- .../Transaction/List/AccountController.php | 3 +- .../Transaction/Sum/BillController.php | 2 -- .../Controllers/VersionUpdateController.php | 1 - app/Api/V2/Request/Generic/DateRequest.php | 3 +- .../V2/Request/Generic/SingleDateRequest.php | 5 +-- app/Api/V2/Response/Sum/AutoSum.php | 2 -- 154 files changed, 277 insertions(+), 322 deletions(-) diff --git a/app/Api/V1/Controllers/Autocomplete/AccountController.php b/app/Api/V1/Controllers/Autocomplete/AccountController.php index 7fe5b418cf..999a6a39f3 100644 --- a/app/Api/V1/Controllers/Autocomplete/AccountController.php +++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php @@ -111,12 +111,13 @@ class AccountController extends Controller // custom order. $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE]; usort( - $return, function ($a, $b) use ($order) { - $pos_a = array_search($a['type'], $order); - $pos_b = array_search($b['type'], $order); + $return, + function ($a, $b) use ($order) { + $pos_a = array_search($a['type'], $order, true); + $pos_b = array_search($b['type'], $order, true); - return $pos_a - $pos_b; - } + return $pos_a - $pos_b; + } ); return response()->json($return); diff --git a/app/Api/V1/Controllers/Autocomplete/BillController.php b/app/Api/V1/Controllers/Autocomplete/BillController.php index 7b4270b725..d8c4b706a9 100644 --- a/app/Api/V1/Controllers/Autocomplete/BillController.php +++ b/app/Api/V1/Controllers/Autocomplete/BillController.php @@ -78,5 +78,4 @@ class BillController extends Controller return response()->json($filtered->toArray()); } - } diff --git a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php index aaab2e1594..80706c9369 100644 --- a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php +++ b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php @@ -80,5 +80,4 @@ class ObjectGroupController extends Controller return response()->json($return); } - } diff --git a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php index 6efbe495cf..862f9c6cb0 100644 --- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php +++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php @@ -113,7 +113,9 @@ class PiggyBankController extends Controller 'id' => (string) $piggy->id, 'name' => $piggy->name, 'name_with_balance' => sprintf( - '%s (%s / %s)', $piggy->name, app('amount')->formatAnything($currency, $currentAmount, false), + '%s (%s / %s)', + $piggy->name, + app('amount')->formatAnything($currency, $currentAmount, false), app('amount')->formatAnything($currency, $piggy->targetamount, false), ), 'currency_id' => $currency->id, @@ -126,5 +128,4 @@ class PiggyBankController extends Controller return response()->json($response); } - } diff --git a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php index 93e6bbd315..f5a45b00be 100644 --- a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php +++ b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php @@ -77,5 +77,4 @@ class RecurrenceController extends Controller return response()->json($response); } - } diff --git a/app/Api/V1/Controllers/Autocomplete/RuleController.php b/app/Api/V1/Controllers/Autocomplete/RuleController.php index 47c24795ea..9123b8f78c 100644 --- a/app/Api/V1/Controllers/Autocomplete/RuleController.php +++ b/app/Api/V1/Controllers/Autocomplete/RuleController.php @@ -77,5 +77,4 @@ class RuleController extends Controller return response()->json($response); } - } diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionController.php b/app/Api/V1/Controllers/Autocomplete/TransactionController.php index d24902ae89..89dbe0494b 100644 --- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php +++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php @@ -101,7 +101,7 @@ class TransactionController extends Controller public function transactionsWithID(AutocompleteRequest $request): JsonResponse { $data = $request->getData(); - $result = new Collection; + $result = new Collection(); if (is_numeric($data['query'])) { // search for group, not journal. $firstResult = $this->groupRepository->find((int) $data['query']); diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index 40d01b83f9..ea8132335d 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -45,7 +45,9 @@ use Symfony\Component\HttpFoundation\ParameterBag; */ abstract class Controller extends BaseController { - use AuthorizesRequests, DispatchesJobs, ValidatesRequests; + use AuthorizesRequests; + use DispatchesJobs; + use ValidatesRequests; protected const CONTENT_TYPE = 'application/vnd.api+json'; protected array $allowedSort; @@ -69,7 +71,6 @@ abstract class Controller extends BaseController return $next($request); } ); - } /** @@ -81,7 +82,7 @@ abstract class Controller extends BaseController */ private function getParameters(): ParameterBag { - $bag = new ParameterBag; + $bag = new ParameterBag(); $page = (int)request()->get('page'); if ($page < 1) { @@ -180,7 +181,7 @@ abstract class Controller extends BaseController final protected function getManager(): Manager { // create some objects: - $manager = new Manager; + $manager = new Manager(); $baseUrl = request()->getSchemeAndHttpHost() . '/api/v1'; $manager->setSerializer(new JsonApiSerializer($baseUrl)); diff --git a/app/Api/V1/Controllers/Data/Bulk/AccountController.php b/app/Api/V1/Controllers/Data/Bulk/AccountController.php index 3d80897e83..caa9d2a4d5 100644 --- a/app/Api/V1/Controllers/Data/Bulk/AccountController.php +++ b/app/Api/V1/Controllers/Data/Bulk/AccountController.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers\Data\Bulk; - use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Data\Bulk\MoveTransactionsRequest; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -75,7 +74,5 @@ class AccountController extends Controller $service->moveTransactions($original, $destination); return response()->json([], 204); - } - } diff --git a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php index f04e698b97..d36516f309 100644 --- a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php +++ b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php @@ -96,5 +96,4 @@ class TransactionController extends Controller { return array_key_exists('account_id', $params['where']) && array_key_exists('account_id', $params['update']); } - } diff --git a/app/Api/V1/Controllers/Data/DestroyController.php b/app/Api/V1/Controllers/Data/DestroyController.php index ad7b41e66b..5fc4e46306 100644 --- a/app/Api/V1/Controllers/Data/DestroyController.php +++ b/app/Api/V1/Controllers/Data/DestroyController.php @@ -293,5 +293,4 @@ class DestroyController extends Controller $service->destroy($journal); } } - } diff --git a/app/Api/V1/Controllers/Data/Export/ExportController.php b/app/Api/V1/Controllers/Data/Export/ExportController.php index c6eef16cef..38c97f9121 100644 --- a/app/Api/V1/Controllers/Data/Export/ExportController.php +++ b/app/Api/V1/Controllers/Data/Export/ExportController.php @@ -67,7 +67,6 @@ class ExportController extends Controller $this->exporter->setExportAccounts(true); return $this->returnExport('accounts'); - } /** @@ -229,5 +228,4 @@ class ExportController extends Controller return $this->returnExport('transactions'); } - } diff --git a/app/Api/V1/Controllers/Data/PurgeController.php b/app/Api/V1/Controllers/Data/PurgeController.php index 34fa6d8695..02360301c8 100644 --- a/app/Api/V1/Controllers/Data/PurgeController.php +++ b/app/Api/V1/Controllers/Data/PurgeController.php @@ -43,7 +43,6 @@ class PurgeController extends Controller */ public function purge(): JsonResponse { - $user = auth()->user(); // some manual code, too lazy to call all repositories. @@ -56,10 +55,10 @@ class PurgeController extends Controller Bill::whereUserId($user->id)->onlyTrashed()->forceDelete(); // piggies - $set = PiggyBank::leftJoin('accounts','accounts.id','piggy_banks.account_id') + $set = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id') ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*']); /** @var PiggyBank $piggy */ - foreach($set as $piggy) { + foreach ($set as $piggy) { $piggy->forceDelete(); } diff --git a/app/Api/V1/Controllers/Insight/Expense/AccountController.php b/app/Api/V1/Controllers/Insight/Expense/AccountController.php index 51dcd4b84c..18442c377d 100644 --- a/app/Api/V1/Controllers/Insight/Expense/AccountController.php +++ b/app/Api/V1/Controllers/Insight/Expense/AccountController.php @@ -134,5 +134,4 @@ class AccountController extends Controller return response()->json($result); } - } diff --git a/app/Api/V1/Controllers/Insight/Expense/BillController.php b/app/Api/V1/Controllers/Insight/Expense/BillController.php index f43f33d389..b7de9137c3 100644 --- a/app/Api/V1/Controllers/Insight/Expense/BillController.php +++ b/app/Api/V1/Controllers/Insight/Expense/BillController.php @@ -170,5 +170,4 @@ class BillController extends Controller return response()->json(array_values($response)); } - } diff --git a/app/Api/V1/Controllers/Insight/Expense/BudgetController.php b/app/Api/V1/Controllers/Insight/Expense/BudgetController.php index d0b3442d87..2fb55e1cce 100644 --- a/app/Api/V1/Controllers/Insight/Expense/BudgetController.php +++ b/app/Api/V1/Controllers/Insight/Expense/BudgetController.php @@ -127,7 +127,5 @@ class BudgetController extends Controller } return response()->json($result); - } - } diff --git a/app/Api/V1/Controllers/Insight/Expense/CategoryController.php b/app/Api/V1/Controllers/Insight/Expense/CategoryController.php index b9745ccc62..c535f069fd 100644 --- a/app/Api/V1/Controllers/Insight/Expense/CategoryController.php +++ b/app/Api/V1/Controllers/Insight/Expense/CategoryController.php @@ -128,6 +128,5 @@ class CategoryController extends Controller } return response()->json($result); - } } diff --git a/app/Api/V1/Controllers/Insight/Expense/PeriodController.php b/app/Api/V1/Controllers/Insight/Expense/PeriodController.php index adca07dfcb..bd30c878bf 100644 --- a/app/Api/V1/Controllers/Insight/Expense/PeriodController.php +++ b/app/Api/V1/Controllers/Insight/Expense/PeriodController.php @@ -34,7 +34,6 @@ use Illuminate\Http\JsonResponse; */ class PeriodController extends Controller { - /** * This endpoint is documented at: * https://api-docs.firefly-iii.org/#/insight/insightExpenseTotal @@ -82,5 +81,4 @@ class PeriodController extends Controller return response()->json(array_values($response)); } - } diff --git a/app/Api/V1/Controllers/Insight/Expense/TagController.php b/app/Api/V1/Controllers/Insight/Expense/TagController.php index 48e8a0e04c..4de86ec2c0 100644 --- a/app/Api/V1/Controllers/Insight/Expense/TagController.php +++ b/app/Api/V1/Controllers/Insight/Expense/TagController.php @@ -176,5 +176,4 @@ class TagController extends Controller return response()->json(array_values($response)); } - } diff --git a/app/Api/V1/Controllers/Insight/Income/AccountController.php b/app/Api/V1/Controllers/Insight/Income/AccountController.php index 09ed57e515..12b72e002e 100644 --- a/app/Api/V1/Controllers/Insight/Income/AccountController.php +++ b/app/Api/V1/Controllers/Insight/Income/AccountController.php @@ -133,5 +133,4 @@ class AccountController extends Controller return response()->json($result); } - } diff --git a/app/Api/V1/Controllers/Insight/Income/CategoryController.php b/app/Api/V1/Controllers/Insight/Income/CategoryController.php index fad9df43b3..fec4a3c0b4 100644 --- a/app/Api/V1/Controllers/Insight/Income/CategoryController.php +++ b/app/Api/V1/Controllers/Insight/Income/CategoryController.php @@ -128,6 +128,5 @@ class CategoryController extends Controller } return response()->json($result); - } } diff --git a/app/Api/V1/Controllers/Insight/Income/PeriodController.php b/app/Api/V1/Controllers/Insight/Income/PeriodController.php index a7245d2597..ce611499ef 100644 --- a/app/Api/V1/Controllers/Insight/Income/PeriodController.php +++ b/app/Api/V1/Controllers/Insight/Income/PeriodController.php @@ -34,7 +34,6 @@ use Illuminate\Http\JsonResponse; */ class PeriodController extends Controller { - /** * This endpoint is documented at: * https://api-docs.firefly-iii.org/#/insight/insightIncomeTotal @@ -76,7 +75,8 @@ class PeriodController extends Controller 'currency_code' => $journal['foreign_currency_code'], ]; $response[$foreignCurrencyId]['difference'] = bcadd( - $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount']) + $response[$foreignCurrencyId]['difference'], + app('steam')->positive($journal['foreign_amount']) ); $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose. } @@ -84,5 +84,4 @@ class PeriodController extends Controller return response()->json(array_values($response)); } - } diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.php index 10ea364f8c..cf38550e45 100644 --- a/app/Api/V1/Controllers/Insight/Income/TagController.php +++ b/app/Api/V1/Controllers/Insight/Income/TagController.php @@ -101,7 +101,8 @@ class TagController extends Controller 'currency_code' => $journal['foreign_currency_code'], ]; $response[$foreignCurrencyId]['difference'] = bcadd( - $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount']) + $response[$foreignCurrencyId]['difference'], + app('steam')->positive($journal['foreign_amount']) ); $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; } @@ -172,7 +173,8 @@ class TagController extends Controller 'currency_code' => $journal['foreign_currency_code'], ]; $response[$foreignKey]['difference'] = bcadd( - $response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount']) + $response[$foreignKey]['difference'], + app('steam')->positive($journal['foreign_amount']) ); $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; } @@ -181,5 +183,4 @@ class TagController extends Controller return response()->json(array_values($response)); } - } diff --git a/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php b/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php index d42772f9be..966036eeb0 100644 --- a/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php +++ b/app/Api/V1/Controllers/Insight/Transfer/CategoryController.php @@ -127,6 +127,5 @@ class CategoryController extends Controller } return response()->json($result); - } } diff --git a/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php b/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php index 8f8eab7428..7ece2103e6 100644 --- a/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php +++ b/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php @@ -34,7 +34,6 @@ use Illuminate\Http\JsonResponse; */ class PeriodController extends Controller { - /** * This endpoint is documented at: * https://api-docs.firefly-iii.org/#/insight/insightTransferTotal @@ -76,7 +75,8 @@ class PeriodController extends Controller 'currency_code' => $journal['foreign_currency_code'], ]; $response[$foreignCurrencyId]['difference'] = bcadd( - $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount']) + $response[$foreignCurrencyId]['difference'], + app('steam')->positive($journal['foreign_amount']) ); $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; } @@ -84,5 +84,4 @@ class PeriodController extends Controller return response()->json(array_values($response)); } - } diff --git a/app/Api/V1/Controllers/Insight/Transfer/TagController.php b/app/Api/V1/Controllers/Insight/Transfer/TagController.php index edd0ab859f..cc4093587f 100644 --- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php +++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php @@ -98,7 +98,8 @@ class TagController extends Controller 'currency_code' => $journal['foreign_currency_code'], ]; $response[$foreignCurrencyId]['difference'] = bcadd( - $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount']) + $response[$foreignCurrencyId]['difference'], + app('steam')->positive($journal['foreign_amount']) ); $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; } @@ -169,7 +170,8 @@ class TagController extends Controller 'currency_code' => $journal['foreign_currency_code'], ]; $response[$foreignKey]['difference'] = bcadd( - $response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount']) + $response[$foreignKey]['difference'], + app('steam')->positive($journal['foreign_amount']) ); $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; } diff --git a/app/Api/V1/Controllers/Models/Account/ListController.php b/app/Api/V1/Controllers/Models/Account/ListController.php index a56131a639..24c5f6fe1a 100644 --- a/app/Api/V1/Controllers/Models/Account/ListController.php +++ b/app/Api/V1/Controllers/Models/Account/ListController.php @@ -137,7 +137,6 @@ class ListController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** diff --git a/app/Api/V1/Controllers/Models/Account/ShowController.php b/app/Api/V1/Controllers/Models/Account/ShowController.php index 3ad5c13933..2d7a8b5999 100644 --- a/app/Api/V1/Controllers/Models/Account/ShowController.php +++ b/app/Api/V1/Controllers/Models/Account/ShowController.php @@ -135,5 +135,4 @@ class ShowController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/Account/StoreController.php b/app/Api/V1/Controllers/Models/Account/StoreController.php index c18f94be4c..a05a0a66fd 100644 --- a/app/Api/V1/Controllers/Models/Account/StoreController.php +++ b/app/Api/V1/Controllers/Models/Account/StoreController.php @@ -82,5 +82,4 @@ class StoreController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php index 210648d109..b7d614b2cb 100644 --- a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php +++ b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php @@ -124,5 +124,4 @@ class ShowController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/Bill/DestroyController.php b/app/Api/V1/Controllers/Models/Bill/DestroyController.php index b9ca5e2531..70d3347eb8 100644 --- a/app/Api/V1/Controllers/Models/Bill/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Bill/DestroyController.php @@ -70,5 +70,4 @@ class DestroyController extends Controller return response()->json([], 204); } - } diff --git a/app/Api/V1/Controllers/Models/Bill/ListController.php b/app/Api/V1/Controllers/Models/Bill/ListController.php index 686277b718..5653c9fd1e 100644 --- a/app/Api/V1/Controllers/Models/Bill/ListController.php +++ b/app/Api/V1/Controllers/Models/Bill/ListController.php @@ -136,7 +136,6 @@ class ListController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** @@ -200,5 +199,4 @@ class ListController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/Bill/UpdateController.php b/app/Api/V1/Controllers/Models/Bill/UpdateController.php index 2705e62263..56420e2dcf 100644 --- a/app/Api/V1/Controllers/Models/Bill/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Bill/UpdateController.php @@ -80,7 +80,5 @@ class UpdateController extends Controller $resource = new Item($bill, $transformer, 'bills'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } - } diff --git a/app/Api/V1/Controllers/Models/Budget/ListController.php b/app/Api/V1/Controllers/Models/Budget/ListController.php index ca2f2fe078..422b4d6df8 100644 --- a/app/Api/V1/Controllers/Models/Budget/ListController.php +++ b/app/Api/V1/Controllers/Models/Budget/ListController.php @@ -264,5 +264,4 @@ class ListController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/Budget/ShowController.php b/app/Api/V1/Controllers/Models/Budget/ShowController.php index d408bccf5e..b011c5675d 100644 --- a/app/Api/V1/Controllers/Models/Budget/ShowController.php +++ b/app/Api/V1/Controllers/Models/Budget/ShowController.php @@ -119,5 +119,4 @@ class ShowController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/Budget/UpdateController.php b/app/Api/V1/Controllers/Models/Budget/UpdateController.php index ce40281086..29eba786b7 100644 --- a/app/Api/V1/Controllers/Models/Budget/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Budget/UpdateController.php @@ -80,6 +80,5 @@ class UpdateController extends Controller $resource = new Item($budget, $transformer, 'budgets'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php index ac628b3550..7856f6d428 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php @@ -163,5 +163,4 @@ class ShowController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php index 9325d3297d..4706f68b0f 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php @@ -76,7 +76,6 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse { - if ((int) $budget->id !== (int) $budgetLimit->budget_id) { throw new FireflyException('20028: The budget limit does not belong to the budget.'); } @@ -92,6 +91,5 @@ class UpdateController extends Controller $resource = new Item($budgetLimit, $transformer, 'budget_limits'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/Category/ListController.php b/app/Api/V1/Controllers/Models/Category/ListController.php index 1cfdf8e268..a3ebb136b4 100644 --- a/app/Api/V1/Controllers/Models/Category/ListController.php +++ b/app/Api/V1/Controllers/Models/Category/ListController.php @@ -157,5 +157,4 @@ class ListController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/Category/StoreController.php b/app/Api/V1/Controllers/Models/Category/StoreController.php index 3b93112db7..d5f81a3dde 100644 --- a/app/Api/V1/Controllers/Models/Category/StoreController.php +++ b/app/Api/V1/Controllers/Models/Category/StoreController.php @@ -80,5 +80,4 @@ class StoreController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/Category/UpdateController.php b/app/Api/V1/Controllers/Models/Category/UpdateController.php index f7d3532da0..191a85f6e7 100644 --- a/app/Api/V1/Controllers/Models/Category/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Category/UpdateController.php @@ -80,6 +80,5 @@ class UpdateController extends Controller $resource = new Item($category, $transformer, 'categories'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php b/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php index 907500a309..2283526b1c 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php @@ -135,6 +135,5 @@ class ListController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/PiggyBank/ListController.php b/app/Api/V1/Controllers/Models/PiggyBank/ListController.php index d7537df365..5d8964746c 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/ListController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/ListController.php @@ -126,6 +126,5 @@ class ListController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php b/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php index ccdcaeebf5..dd38e17401 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php @@ -92,7 +92,6 @@ class ShowController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** @@ -117,6 +116,5 @@ class ShowController extends Controller $resource = new Item($piggyBank, $transformer, 'piggy_banks'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php index 41d69b904b..e156de2672 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php @@ -84,6 +84,5 @@ class UpdateController extends Controller $resource = new Item($piggyBank, $transformer, 'piggy_banks'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/Recurrence/ShowController.php b/app/Api/V1/Controllers/Models/Recurrence/ShowController.php index 1d53b2528a..8d5bdfd0d0 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/ShowController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/ShowController.php @@ -93,7 +93,6 @@ class ShowController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** diff --git a/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php b/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php index 8e0ec86815..4d569dbeec 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php @@ -80,6 +80,5 @@ class UpdateController extends Controller $resource = new Item($recurrence, $transformer, 'recurrences'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/Rule/ShowController.php b/app/Api/V1/Controllers/Models/Rule/ShowController.php index c633aac828..e3ffd674fc 100644 --- a/app/Api/V1/Controllers/Models/Rule/ShowController.php +++ b/app/Api/V1/Controllers/Models/Rule/ShowController.php @@ -97,7 +97,6 @@ class ShowController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** @@ -121,6 +120,5 @@ class ShowController extends Controller $resource = new Item($rule, $transformer, 'rules'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php b/app/Api/V1/Controllers/Models/RuleGroup/ListController.php index f730025352..26e1ca2767 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/ListController.php @@ -95,6 +95,5 @@ class ListController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php b/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php index da714489aa..7c72b09e38 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php @@ -118,7 +118,5 @@ class ShowController extends Controller $resource = new Item($ruleGroup, $transformer, 'rule_groups'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } - } diff --git a/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php b/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php index 5f87c6866f..ce8d81141c 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php @@ -37,7 +37,6 @@ use League\Fractal\Resource\Item; */ class StoreController extends Controller { - private AccountRepositoryInterface $accountRepository; private RuleGroupRepositoryInterface $ruleGroupRepository; @@ -87,6 +86,5 @@ class StoreController extends Controller $resource = new Item($ruleGroup, $transformer, 'rule_groups'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php index 98c4d37793..33e83be30c 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php @@ -167,5 +167,4 @@ class TriggerController extends Controller return response()->json([], 204); } - } diff --git a/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php b/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php index 2cb39726ac..70f9c1a352 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php @@ -37,7 +37,6 @@ use League\Fractal\Resource\Item; */ class UpdateController extends Controller { - private RuleGroupRepositoryInterface $ruleGroupRepository; /** diff --git a/app/Api/V1/Controllers/Models/Tag/ShowController.php b/app/Api/V1/Controllers/Models/Tag/ShowController.php index 3aede9926f..2400b9aab6 100644 --- a/app/Api/V1/Controllers/Models/Tag/ShowController.php +++ b/app/Api/V1/Controllers/Models/Tag/ShowController.php @@ -119,6 +119,5 @@ class ShowController extends Controller $resource = new Item($tag, $transformer, 'tags'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/Tag/StoreController.php b/app/Api/V1/Controllers/Models/Tag/StoreController.php index 9b2dcff1c5..68df097bda 100644 --- a/app/Api/V1/Controllers/Models/Tag/StoreController.php +++ b/app/Api/V1/Controllers/Models/Tag/StoreController.php @@ -82,4 +82,3 @@ class StoreController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } } - diff --git a/app/Api/V1/Controllers/Models/Tag/UpdateController.php b/app/Api/V1/Controllers/Models/Tag/UpdateController.php index 5646a4b302..17dc165d29 100644 --- a/app/Api/V1/Controllers/Models/Tag/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Tag/UpdateController.php @@ -82,7 +82,5 @@ class UpdateController extends Controller $resource = new Item($rule, $transformer, 'tags'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } - } diff --git a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php index 3a0ba982db..76e082047b 100644 --- a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php @@ -84,12 +84,12 @@ class DestroyController extends Controller // grab asset account(s) from group: $accounts = []; /** @var TransactionJournal $journal */ - foreach($transactionGroup->transactionJournals as $journal) { + foreach ($transactionGroup->transactionJournals as $journal) { /** @var Transaction $transaction */ - foreach($journal->transactions as $transaction) { + foreach ($journal->transactions as $transaction) { $type = $transaction->account->accountType->type; // if is valid liability, trigger event! - if(in_array($type, config('firefly.valid_liabilities'))) { + if (in_array($type, config('firefly.valid_liabilities'), true)) { $accounts[] = $transaction->account; } } @@ -102,7 +102,7 @@ class DestroyController extends Controller app('preferences')->mark(); /** @var Account $account */ - foreach($accounts as $account) { + foreach ($accounts as $account) { Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id)); event(new UpdatedAccount($account)); } diff --git a/app/Api/V1/Controllers/Models/Transaction/ListController.php b/app/Api/V1/Controllers/Models/Transaction/ListController.php index 025836433b..f08ffa918f 100644 --- a/app/Api/V1/Controllers/Models/Transaction/ListController.php +++ b/app/Api/V1/Controllers/Models/Transaction/ListController.php @@ -80,7 +80,7 @@ class ListController extends Controller { $manager = $this->getManager(); $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; - $collection = new Collection; + $collection = new Collection(); foreach ($transactionGroup->transactionJournals as $transactionJournal) { $collection = $this->journalAPIRepository->getAttachments($transactionJournal)->merge($collection); } @@ -115,7 +115,7 @@ class ListController extends Controller public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse { $manager = $this->getManager(); - $collection = new Collection; + $collection = new Collection(); $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data; foreach ($transactionGroup->transactionJournals as $transactionJournal) { $collection = $this->journalAPIRepository->getPiggyBankEvents($transactionJournal)->merge($collection); diff --git a/app/Api/V1/Controllers/Models/Transaction/ShowController.php b/app/Api/V1/Controllers/Models/Transaction/ShowController.php index c86af23b9b..a200505818 100644 --- a/app/Api/V1/Controllers/Models/Transaction/ShowController.php +++ b/app/Api/V1/Controllers/Models/Transaction/ShowController.php @@ -151,5 +151,4 @@ class ShowController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/Transaction/StoreController.php b/app/Api/V1/Controllers/Models/Transaction/StoreController.php index 4595ee55c4..c00a8425c1 100644 --- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php +++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php @@ -95,14 +95,15 @@ class StoreController extends Controller } catch (DuplicateTransactionException $e) { Log::warning('Caught a duplicate transaction. Return error message.'); $validator = Validator::make( - ['transactions' => [['description' => $e->getMessage()]]], ['transactions.0.description' => new IsDuplicateTransaction] + ['transactions' => [['description' => $e->getMessage()]]], + ['transactions.0.description' => new IsDuplicateTransaction()] ); throw new ValidationException($validator, 0, $e); } catch (FireflyException $e) { Log::warning('Caught an exception. Return error message.'); Log::error($e->getMessage()); $message = sprintf('Internal exception: %s', $e->getMessage()); - $validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction]); + $validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction()]); throw new ValidationException($validator, 0, $e); } app('preferences')->mark(); diff --git a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php index 500ad0d508..d2beda1960 100644 --- a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php @@ -110,5 +110,4 @@ class UpdateController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php index 50d4e3c704..2cafef38fb 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php @@ -63,7 +63,8 @@ use League\Fractal\Resource\Collection as FractalCollection; */ class ListController extends Controller { - use AccountFilter, TransactionFilter; + use AccountFilter; + use TransactionFilter; private CurrencyRepositoryInterface $repository; private UserRepositoryInterface $userRepository; @@ -310,7 +311,6 @@ class ListController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** @@ -363,7 +363,6 @@ class ListController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php index 2cc7c99838..2c3ac82a67 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php @@ -43,7 +43,8 @@ use League\Fractal\Resource\Item; */ class ShowController extends Controller { - use AccountFilter, TransactionFilter; + use AccountFilter; + use TransactionFilter; private CurrencyRepositoryInterface $repository; diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php index e85ed2ab05..cc4a6caa0f 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php @@ -41,7 +41,8 @@ use League\Fractal\Resource\Item; */ class StoreController extends Controller { - use AccountFilter, TransactionFilter; + use AccountFilter; + use TransactionFilter; private CurrencyRepositoryInterface $repository; private UserRepositoryInterface $userRepository; diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php index d81fed2b5a..c69d4415a9 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php @@ -42,7 +42,8 @@ use League\Fractal\Resource\Item; */ class UpdateController extends Controller { - use AccountFilter, TransactionFilter; + use AccountFilter; + use TransactionFilter; private CurrencyRepositoryInterface $repository; private UserRepositoryInterface $userRepository; @@ -98,7 +99,6 @@ class UpdateController extends Controller $resource = new Item($currency, $transformer, 'currencies'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** @@ -129,7 +129,6 @@ class UpdateController extends Controller $resource = new Item($currency, $transformer, 'currencies'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** @@ -162,7 +161,6 @@ class UpdateController extends Controller $resource = new Item($currency, $transformer, 'currencies'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** @@ -200,6 +198,5 @@ class UpdateController extends Controller $resource = new Item($currency, $transformer, 'currencies'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php index cc50a7feed..02290e33ed 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php @@ -32,7 +32,6 @@ use Illuminate\Http\JsonResponse; class DestroyController extends Controller { - private LinkTypeRepositoryInterface $repository; /** @@ -74,5 +73,4 @@ class DestroyController extends Controller return response()->json([], 204); } - } diff --git a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php index c54b08610d..0f2ef4b6bb 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php @@ -103,7 +103,6 @@ class ShowController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** @@ -128,6 +127,5 @@ class ShowController extends Controller $resource = new Item($journalLink, $transformer, 'transaction_links'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php index e95de834a9..7543587cfa 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php @@ -87,6 +87,5 @@ class UpdateController extends Controller $resource = new Item($journalLink, $transformer, 'transaction_links'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php index 165185c146..cf9b645e4f 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php @@ -85,5 +85,4 @@ class DestroyController extends Controller return response()->json([], 204); } - } diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php index d1ae43c0da..236e1e354b 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php @@ -126,5 +126,4 @@ class ListController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php index 5bc8538995..70289e6e3c 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php @@ -101,7 +101,6 @@ class ShowController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** @@ -125,6 +124,5 @@ class ShowController extends Controller $resource = new Item($linkType, $transformer, 'link_types'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php index 6a16ca9c34..1a839b2b83 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php @@ -96,6 +96,5 @@ class StoreController extends Controller $resource = new Item($linkType, $transformer, 'link_types'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php index 4eb5ad9ee4..1b15727943 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php @@ -102,6 +102,5 @@ class UpdateController extends Controller $resource = new Item($linkType, $transformer, 'link_types'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } } diff --git a/app/Api/V1/Controllers/Summary/BasicController.php b/app/Api/V1/Controllers/Summary/BasicController.php index af1ad594f2..192822819f 100644 --- a/app/Api/V1/Controllers/Summary/BasicController.php +++ b/app/Api/V1/Controllers/Summary/BasicController.php @@ -150,8 +150,9 @@ class BasicController extends Controller foreach ($set as $transactionJournal) { $currencyId = (int) $transactionJournal['currency_id']; $incomes[$currencyId] = $incomes[$currencyId] ?? '0'; - $incomes[$currencyId] = bcadd($incomes[$currencyId], - bcmul($transactionJournal['amount'], '-1') + $incomes[$currencyId] = bcadd( + $incomes[$currencyId], + bcmul($transactionJournal['amount'], '-1') ); $sums[$currencyId] = $sums[$currencyId] ?? '0'; $sums[$currencyId] = bcadd($sums[$currencyId], bcmul($transactionJournal['amount'], '-1')); diff --git a/app/Api/V1/Controllers/System/CronController.php b/app/Api/V1/Controllers/System/CronController.php index aac11c2447..59ab407f03 100644 --- a/app/Api/V1/Controllers/System/CronController.php +++ b/app/Api/V1/Controllers/System/CronController.php @@ -57,5 +57,4 @@ class CronController extends Controller return response()->json($return); } - } diff --git a/app/Api/V1/Controllers/System/UserController.php b/app/Api/V1/Controllers/System/UserController.php index c36eeb03c2..a1ef8d64fa 100644 --- a/app/Api/V1/Controllers/System/UserController.php +++ b/app/Api/V1/Controllers/System/UserController.php @@ -201,7 +201,5 @@ class UserController extends Controller $resource = new Item($user, $transformer, 'users'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } - } diff --git a/app/Api/V1/Controllers/User/PreferencesController.php b/app/Api/V1/Controllers/User/PreferencesController.php index 08650f24ae..8bd14d5d55 100644 --- a/app/Api/V1/Controllers/User/PreferencesController.php +++ b/app/Api/V1/Controllers/User/PreferencesController.php @@ -74,7 +74,6 @@ class PreferencesController extends Controller $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); - } /** @@ -148,5 +147,4 @@ class PreferencesController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Webhook/AttemptController.php b/app/Api/V1/Controllers/Webhook/AttemptController.php index 3d80cad8d7..1f51ad302a 100644 --- a/app/Api/V1/Controllers/Webhook/AttemptController.php +++ b/app/Api/V1/Controllers/Webhook/AttemptController.php @@ -116,7 +116,6 @@ class AttemptController extends Controller } if ($attempt->webhook_message_id !== $message->id) { throw new FireflyException('Webhook message and webhook attempt are no match'); - } $manager = $this->getManager(); diff --git a/app/Api/V1/Controllers/Webhook/DestroyController.php b/app/Api/V1/Controllers/Webhook/DestroyController.php index 8bee3a7d34..7efe5f018e 100644 --- a/app/Api/V1/Controllers/Webhook/DestroyController.php +++ b/app/Api/V1/Controllers/Webhook/DestroyController.php @@ -94,7 +94,6 @@ class DestroyController extends Controller } if ($attempt->webhook_message_id !== $message->id) { throw new FireflyException('Webhook message and webhook attempt are no match'); - } $this->repository->destroyAttempt($attempt); diff --git a/app/Api/V1/Controllers/Webhook/MessageController.php b/app/Api/V1/Controllers/Webhook/MessageController.php index b9fd26272e..6263cf7ea9 100644 --- a/app/Api/V1/Controllers/Webhook/MessageController.php +++ b/app/Api/V1/Controllers/Webhook/MessageController.php @@ -115,5 +115,4 @@ class MessageController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Controllers/Webhook/UpdateController.php b/app/Api/V1/Controllers/Webhook/UpdateController.php index 2ac56df45d..144d6c4d8a 100644 --- a/app/Api/V1/Controllers/Webhook/UpdateController.php +++ b/app/Api/V1/Controllers/Webhook/UpdateController.php @@ -76,5 +76,4 @@ class UpdateController extends Controller return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V1/Middleware/ApiDemoUser.php b/app/Api/V1/Middleware/ApiDemoUser.php index 46cecc1966..00a369d3de 100644 --- a/app/Api/V1/Middleware/ApiDemoUser.php +++ b/app/Api/V1/Middleware/ApiDemoUser.php @@ -49,7 +49,6 @@ class ApiDemoUser } if ($user->hasRole('demo')) { return response('', 403); - } return $next($request); diff --git a/app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php b/app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php index c023c500fc..5d071fe7b6 100644 --- a/app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php +++ b/app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php @@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class AutocompleteRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * @return array diff --git a/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php b/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php index cc98320f34..2df49ea83b 100644 --- a/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php +++ b/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php @@ -35,7 +35,8 @@ use Illuminate\Validation\Validator; */ class MoveTransactionsRequest extends FormRequest { - use ChecksLogin, ConvertsDataTypes; + use ChecksLogin; + use ConvertsDataTypes; /** * @return array @@ -84,7 +85,8 @@ class MoveTransactionsRequest extends FormRequest * @param Validator $validator * @return void */ - private function validateMove(Validator $validator): void { + private function validateMove(Validator $validator): void + { $data = $validator->getData(); $repository = app(AccountRepositoryInterface::class); $repository->setUser(auth()->user()); diff --git a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php index 02e013fdea..e74c9389a3 100644 --- a/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php +++ b/app/Api/V1/Requests/Data/Bulk/TransactionRequest.php @@ -39,7 +39,9 @@ use Log; */ class TransactionRequest extends FormRequest { - use ChecksLogin, ConvertsDataTypes, ValidatesBulkTransactionQuery; + use ChecksLogin; + use ConvertsDataTypes; + use ValidatesBulkTransactionQuery; /** * @return array diff --git a/app/Api/V1/Requests/Data/DateRequest.php b/app/Api/V1/Requests/Data/DateRequest.php index ead7ffc4e2..a6e1cdf23b 100644 --- a/app/Api/V1/Requests/Data/DateRequest.php +++ b/app/Api/V1/Requests/Data/DateRequest.php @@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class DateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Data/DestroyRequest.php b/app/Api/V1/Requests/Data/DestroyRequest.php index 2b77fc5614..06df600ea5 100644 --- a/app/Api/V1/Requests/Data/DestroyRequest.php +++ b/app/Api/V1/Requests/Data/DestroyRequest.php @@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class DestroyRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Data/Export/ExportRequest.php b/app/Api/V1/Requests/Data/Export/ExportRequest.php index 0ada44dce7..d22a1f3d36 100644 --- a/app/Api/V1/Requests/Data/Export/ExportRequest.php +++ b/app/Api/V1/Requests/Data/Export/ExportRequest.php @@ -36,7 +36,8 @@ use Illuminate\Support\Collection; */ class ExportRequest extends FormRequest { - use ChecksLogin, ConvertsDataTypes; + use ChecksLogin; + use ConvertsDataTypes; public function getAll(): array { @@ -49,7 +50,7 @@ class ExportRequest extends FormRequest $repository = app(AccountRepositoryInterface::class); $repository->setUser(auth()->user()); - $accounts = new Collection; + $accounts = new Collection(); foreach ($parts as $part) { $accountId = (int) $part; if (0 !== $accountId) { diff --git a/app/Api/V1/Requests/Insight/GenericRequest.php b/app/Api/V1/Requests/Insight/GenericRequest.php index 5a10d23e7d..8d7103d111 100644 --- a/app/Api/V1/Requests/Insight/GenericRequest.php +++ b/app/Api/V1/Requests/Insight/GenericRequest.php @@ -42,7 +42,8 @@ use Illuminate\Support\Collection; */ class GenericRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; private Collection $accounts; private Collection $bills; @@ -69,11 +70,11 @@ class GenericRequest extends FormRequest public function getAssetAccounts(): Collection { $this->parseAccounts(); - $return = new Collection; + $return = new Collection(); /** @var Account $account */ foreach ($this->accounts as $account) { $type = $account->accountType->type; - if (in_array($type, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE])) { + if (in_array($type, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], true)) { $return->push($account); } } @@ -216,7 +217,7 @@ class GenericRequest extends FormRequest public function getExpenseAccounts(): Collection { $this->parseAccounts(); - $return = new Collection; + $return = new Collection(); /** @var Account $account */ foreach ($this->accounts as $account) { $type = $account->accountType->type; @@ -234,7 +235,7 @@ class GenericRequest extends FormRequest public function getRevenueAccounts(): Collection { $this->parseAccounts(); - $return = new Collection; + $return = new Collection(); /** @var Account $account */ foreach ($this->accounts as $account) { $type = $account->accountType->type; @@ -297,11 +298,11 @@ class GenericRequest extends FormRequest public function rules(): array { // this is cheating but it works to initialize the collections. - $this->accounts = new Collection; - $this->budgets = new Collection; - $this->categories = new Collection; - $this->bills = new Collection; - $this->tags = new Collection; + $this->accounts = new Collection(); + $this->budgets = new Collection(); + $this->categories = new Collection(); + $this->bills = new Collection(); + $this->tags = new Collection(); return [ 'start' => 'required|date', diff --git a/app/Api/V1/Requests/Models/Account/StoreRequest.php b/app/Api/V1/Requests/Models/Account/StoreRequest.php index 2e02c2488d..da30e22c5b 100644 --- a/app/Api/V1/Requests/Models/Account/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Account/StoreRequest.php @@ -40,7 +40,9 @@ use Illuminate\Foundation\Http\FormRequest; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, AppendsLocationData, ChecksLogin; + use ConvertsDataTypes; + use AppendsLocationData; + use ChecksLogin; /** * @return array @@ -114,8 +116,8 @@ class StoreRequest extends FormRequest 'order' => 'numeric|nullable', 'currency_id' => 'numeric|exists:transaction_currencies,id', 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', - 'active' => [new IsBoolean], - 'include_net_worth' => [new IsBoolean], + 'active' => [new IsBoolean()], + 'include_net_worth' => [new IsBoolean()], 'account_role' => sprintf('nullable|in:%s|required_if:type,asset', $accountRoles), 'credit_card_type' => sprintf('nullable|in:%s|required_if:account_role,ccAsset', $ccPaymentTypes), 'monthly_payment_date' => 'nullable|date|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull', diff --git a/app/Api/V1/Requests/Models/Account/UpdateRequest.php b/app/Api/V1/Requests/Models/Account/UpdateRequest.php index 83c852a837..619463879d 100644 --- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php @@ -42,7 +42,9 @@ use Log; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, AppendsLocationData, ChecksLogin; + use ConvertsDataTypes; + use AppendsLocationData; + use ChecksLogin; /** * @return array @@ -116,8 +118,8 @@ class UpdateRequest extends FormRequest 'order' => 'numeric|nullable', 'currency_id' => 'numeric|exists:transaction_currencies,id', 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', - 'active' => [new IsBoolean], - 'include_net_worth' => [new IsBoolean], + 'active' => [new IsBoolean()], + 'include_net_worth' => [new IsBoolean()], 'account_role' => sprintf('in:%s|nullable|required_if:type,asset', $accountRoles), 'credit_card_type' => sprintf('in:%s|nullable|required_if:account_role,ccAsset', $ccPaymentTypes), 'monthly_payment_date' => 'date' . '|nullable|required_if:account_role,ccAsset|required_if:credit_card_type,monthlyFull', diff --git a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php index 96fa752803..cfd78e9291 100644 --- a/app/Api/V1/Requests/Models/Attachment/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Attachment/StoreRequest.php @@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -62,10 +63,10 @@ class StoreRequest extends FormRequest { $models = config('firefly.valid_attachment_models'); $models = array_map( - static function (string $className) { return str_replace('FireflyIII\\Models\\', '', $className); - }, $models + }, + $models ); $models = implode(',', $models); $model = $this->convertString('attachable_type'); diff --git a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php index 0727ea50c9..d3d50b5811 100644 --- a/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Attachment/UpdateRequest.php @@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -64,10 +65,10 @@ class UpdateRequest extends FormRequest { $models = config('firefly.valid_attachment_models'); $models = array_map( - static function (string $className) { return str_replace('FireflyIII\\Models\\', '', $className); - }, $models + }, + $models ); $models = implode(',', $models); $model = $this->convertString('attachable_type'); diff --git a/app/Api/V1/Requests/Models/AvailableBudget/Request.php b/app/Api/V1/Requests/Models/AvailableBudget/Request.php index 694015c1cf..6bcca4dbfd 100644 --- a/app/Api/V1/Requests/Models/AvailableBudget/Request.php +++ b/app/Api/V1/Requests/Models/AvailableBudget/Request.php @@ -36,7 +36,8 @@ use Illuminate\Validation\Validator; */ class Request extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Models/Bill/StoreRequest.php b/app/Api/V1/Requests/Models/Bill/StoreRequest.php index 5e3c757dfd..52c4961bc1 100644 --- a/app/Api/V1/Requests/Models/Bill/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Bill/StoreRequest.php @@ -38,7 +38,8 @@ use Log; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -87,7 +88,7 @@ class StoreRequest extends FormRequest 'extension_date' => 'date|after:date', 'repeat_freq' => 'in:weekly,monthly,quarterly,half-year,yearly|required', 'skip' => 'between:0,31', - 'active' => [new IsBoolean], + 'active' => [new IsBoolean()], 'notes' => 'between:1,65536', ]; } diff --git a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php index 0159fe68ed..1a896df108 100644 --- a/app/Api/V1/Requests/Models/Bill/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Bill/UpdateRequest.php @@ -37,7 +37,8 @@ use Illuminate\Validation\Validator; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -87,7 +88,7 @@ class UpdateRequest extends FormRequest 'extension_date' => 'date|after:date', 'repeat_freq' => 'in:weekly,monthly,quarterly,half-year,yearly', 'skip' => 'between:0,31', - 'active' => [new IsBoolean], + 'active' => [new IsBoolean()], 'notes' => 'between:1,65536', ]; } diff --git a/app/Api/V1/Requests/Models/Budget/StoreRequest.php b/app/Api/V1/Requests/Models/Budget/StoreRequest.php index 0398b7e5b5..6e62053a73 100644 --- a/app/Api/V1/Requests/Models/Budget/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Budget/StoreRequest.php @@ -37,7 +37,9 @@ use Illuminate\Validation\Validator; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin; + use ConvertsDataTypes; + use ValidatesAutoBudgetRequest; + use ChecksLogin; /** * Get all data from the request. @@ -72,7 +74,7 @@ class StoreRequest extends FormRequest { return [ 'name' => 'required|between:1,100|uniqueObjectForUser:budgets,name', - 'active' => [new IsBoolean], + 'active' => [new IsBoolean()], 'currency_id' => 'exists:transaction_currencies,id', 'currency_code' => 'exists:transaction_currencies,code', 'notes' => 'nullable|between:1,65536', diff --git a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php index 230edd7cd9..55bfe17058 100644 --- a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php @@ -37,7 +37,9 @@ use Illuminate\Validation\Validator; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin; + use ConvertsDataTypes; + use ValidatesAutoBudgetRequest; + use ChecksLogin; /** * Get all data from the request. @@ -82,7 +84,7 @@ class UpdateRequest extends FormRequest return [ 'name' => sprintf('between:1,100|uniqueObjectForUser:budgets,name,%d', $budget->id), - 'active' => [new IsBoolean], + 'active' => [new IsBoolean()], 'notes' => 'nullable|between:1,65536', 'auto_budget_type' => 'in:reset,rollover,none', 'auto_budget_currency_id' => 'exists:transaction_currencies,id', diff --git a/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php b/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php index f2d98b5017..247697e707 100644 --- a/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php +++ b/app/Api/V1/Requests/Models/BudgetLimit/StoreRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -67,5 +68,4 @@ class StoreRequest extends FormRequest 'currency_code' => 'min:3|max:3|exists:transaction_currencies,code', ]; } - } diff --git a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php index 7abc1fe432..5aa4858fa2 100644 --- a/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php @@ -36,7 +36,8 @@ use Illuminate\Validation\Validator; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -96,5 +97,4 @@ class UpdateRequest extends FormRequest } ); } - } diff --git a/app/Api/V1/Requests/Models/Category/StoreRequest.php b/app/Api/V1/Requests/Models/Category/StoreRequest.php index bebfee1438..8a5512f2f3 100644 --- a/app/Api/V1/Requests/Models/Category/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Category/StoreRequest.php @@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Models/Category/UpdateRequest.php b/app/Api/V1/Requests/Models/Category/UpdateRequest.php index 827df56734..24a0e921fd 100644 --- a/app/Api/V1/Requests/Models/Category/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Category/UpdateRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php b/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php index e0c3e12c66..32d95e4189 100644 --- a/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/ObjectGroup/UpdateRequest.php @@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * @return array diff --git a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php index 768fd93020..c7fe30e6ea 100644 --- a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php +++ b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -58,7 +59,6 @@ class StoreRequest extends FormRequest $data['object_group_title'] = $this->convertString('object_group_title'); return $data; - } /** @@ -80,5 +80,4 @@ class StoreRequest extends FormRequest 'notes' => 'max:65000', ]; } - } diff --git a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php index 189a4a4360..c8061fef1b 100644 --- a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php @@ -36,7 +36,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -72,13 +73,12 @@ class UpdateRequest extends FormRequest return [ 'name' => 'between:1,255|uniquePiggyBankForUser:' . $piggyBank->id, - 'current_amount' => ['numeric', 'gte:0', new LessThanPiggyTarget], + 'current_amount' => ['numeric', 'gte:0', new LessThanPiggyTarget()], 'target_amount' => 'numeric|gt:0', 'start_date' => 'date|nullable', 'target_date' => 'date|nullable|after:start_date', 'notes' => 'max:65000', - 'account_id' => ['belongsToUser:accounts', new IsAssetAccountId], + 'account_id' => ['belongsToUser:accounts', new IsAssetAccountId()], ]; } - } diff --git a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php index 5235446ea0..1dfc9435a5 100644 --- a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php @@ -39,7 +39,12 @@ use Illuminate\Validation\Validator; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData, ChecksLogin; + use ConvertsDataTypes; + use RecurrenceValidation; + use TransactionValidation; + use CurrencyValidation; + use GetRecurrenceData; + use ChecksLogin; /** * Get all data from the request. @@ -139,8 +144,8 @@ class StoreRequest extends FormRequest 'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title', 'description' => 'between:1,65000', 'first_date' => 'required|date', - 'apply_rules' => [new IsBoolean], - 'active' => [new IsBoolean], + 'apply_rules' => [new IsBoolean()], + 'active' => [new IsBoolean()], 'repeat_until' => 'nullable|date', 'nr_of_repetitions' => 'nullable|numeric|between:1,31', @@ -156,18 +161,18 @@ class StoreRequest extends FormRequest 'transactions.*.currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code', 'transactions.*.foreign_currency_id' => 'nullable|numeric|exists:transaction_currencies,id', 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code', - 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser], + 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()], 'transactions.*.source_name' => 'between:1,255|nullable', - 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser], + 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()], 'transactions.*.destination_name' => 'between:1,255|nullable', // new and updated fields: - 'transactions.*.budget_id' => ['nullable', 'mustExist:budgets,id', new BelongsUser], - 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser], - 'transactions.*.category_id' => ['nullable', 'mustExist:categories,id', new BelongsUser], + 'transactions.*.budget_id' => ['nullable', 'mustExist:budgets,id', new BelongsUser()], + 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.category_id' => ['nullable', 'mustExist:categories,id', new BelongsUser()], 'transactions.*.category_name' => 'between:1,255|nullable', - 'transactions.*.piggy_bank_id' => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser], - 'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser], + 'transactions.*.piggy_bank_id' => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser()], + 'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser()], 'transactions.*.tags' => 'nullable|between:1,64000', ]; } diff --git a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php index 0df8810a08..0c16d29cb3 100644 --- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php @@ -40,7 +40,12 @@ use Illuminate\Validation\Validator; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData, ChecksLogin; + use ConvertsDataTypes; + use RecurrenceValidation; + use TransactionValidation; + use CurrencyValidation; + use GetRecurrenceData; + use ChecksLogin; /** * Get all data from the request. @@ -153,8 +158,8 @@ class UpdateRequest extends FormRequest 'title' => sprintf('between:1,255|uniqueObjectForUser:recurrences,title,%d', $recurrence->id), 'description' => 'between:1,65000', 'first_date' => 'date', - 'apply_rules' => [new IsBoolean], - 'active' => [new IsBoolean], + 'apply_rules' => [new IsBoolean()], + 'active' => [new IsBoolean()], 'repeat_until' => 'nullable|date', 'nr_of_repetitions' => 'nullable|numeric|between:1,31', @@ -170,18 +175,18 @@ class UpdateRequest extends FormRequest 'transactions.*.currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code', 'transactions.*.foreign_currency_id' => 'nullable|numeric|exists:transaction_currencies,id', 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:3|exists:transaction_currencies,code', - 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser], + 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()], 'transactions.*.source_name' => 'between:1,255|nullable', - 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser], + 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()], 'transactions.*.destination_name' => 'between:1,255|nullable', // new and updated fields: - 'transactions.*.budget_id' => ['nullable', 'mustExist:budgets,id', new BelongsUser], - 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser], - 'transactions.*.category_id' => ['nullable', 'mustExist:categories,id', new BelongsUser], + 'transactions.*.budget_id' => ['nullable', 'mustExist:budgets,id', new BelongsUser()], + 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.category_id' => ['nullable', 'mustExist:categories,id', new BelongsUser()], 'transactions.*.category_name' => 'between:1,255|nullable', - 'transactions.*.piggy_bank_id' => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser], - 'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser], + 'transactions.*.piggy_bank_id' => ['nullable', 'numeric', 'mustExist:piggy_banks,id', new BelongsUser()], + 'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser()], 'transactions.*.tags' => 'nullable|between:1,64000', ]; diff --git a/app/Api/V1/Requests/Models/Rule/StoreRequest.php b/app/Api/V1/Requests/Models/Rule/StoreRequest.php index 042d9051c8..ef1c31911b 100644 --- a/app/Api/V1/Requests/Models/Rule/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Rule/StoreRequest.php @@ -29,6 +29,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Support\Request\GetRuleConfiguration; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; + use function is_array; /** @@ -36,7 +37,9 @@ use function is_array; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, GetRuleConfiguration, ChecksLogin; + use ConvertsDataTypes; + use GetRuleConfiguration; + use ChecksLogin; /** * Get all data from the request. @@ -128,15 +131,15 @@ class StoreRequest extends FormRequest 'trigger' => 'required|in:store-journal,update-journal', 'triggers.*.type' => 'required|in:' . implode(',', $validTriggers), 'triggers.*.value' => 'required_if:actions.*.type,' . $contextTriggers . '|min:1|ruleTriggerValue', - 'triggers.*.stop_processing' => [new IsBoolean], - 'triggers.*.active' => [new IsBoolean], + 'triggers.*.stop_processing' => [new IsBoolean()], + 'triggers.*.active' => [new IsBoolean()], 'actions.*.type' => 'required|in:' . implode(',', $validActions), 'actions.*.value' => 'required_if:actions.*.type,' . $contextActions . '|ruleActionValue', - 'actions.*.stop_processing' => [new IsBoolean], - 'actions.*.active' => [new IsBoolean], - 'strict' => [new IsBoolean], - 'stop_processing' => [new IsBoolean], - 'active' => [new IsBoolean], + 'actions.*.stop_processing' => [new IsBoolean()], + 'actions.*.active' => [new IsBoolean()], + 'strict' => [new IsBoolean()], + 'stop_processing' => [new IsBoolean()], + 'active' => [new IsBoolean()], ]; } diff --git a/app/Api/V1/Requests/Models/Rule/TestRequest.php b/app/Api/V1/Requests/Models/Rule/TestRequest.php index 640ca7c218..70adad99cb 100644 --- a/app/Api/V1/Requests/Models/Rule/TestRequest.php +++ b/app/Api/V1/Requests/Models/Rule/TestRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class TestRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * @return array @@ -56,7 +57,6 @@ class TestRequest extends FormRequest private function getPage(): int { return 0 === (int) $this->query('page') ? 1 : (int) $this->query('page'); - } /** @@ -89,5 +89,4 @@ class TestRequest extends FormRequest 'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts', ]; } - } diff --git a/app/Api/V1/Requests/Models/Rule/TriggerRequest.php b/app/Api/V1/Requests/Models/Rule/TriggerRequest.php index 932c54a0b2..8070fb066d 100644 --- a/app/Api/V1/Requests/Models/Rule/TriggerRequest.php +++ b/app/Api/V1/Requests/Models/Rule/TriggerRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class TriggerRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * @return array @@ -78,5 +79,4 @@ class TriggerRequest extends FormRequest 'accounts.*' => 'exists:accounts,id|belongsToUser:accounts', ]; } - } diff --git a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php index b3746488ef..0ae4a7cda1 100644 --- a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php @@ -29,6 +29,7 @@ use FireflyIII\Support\Request\ConvertsDataTypes; use FireflyIII\Support\Request\GetRuleConfiguration; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; + use function is_array; /** @@ -36,7 +37,9 @@ use function is_array; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, GetRuleConfiguration, ChecksLogin; + use ConvertsDataTypes; + use GetRuleConfiguration; + use ChecksLogin; /** * Get all data from the request. @@ -142,15 +145,15 @@ class UpdateRequest extends FormRequest 'trigger' => 'in:store-journal,update-journal', 'triggers.*.type' => 'required|in:' . implode(',', $validTriggers), 'triggers.*.value' => 'required_if:actions.*.type,' . $contextTriggers . '|min:1|ruleTriggerValue', - 'triggers.*.stop_processing' => [new IsBoolean], - 'triggers.*.active' => [new IsBoolean], + 'triggers.*.stop_processing' => [new IsBoolean()], + 'triggers.*.active' => [new IsBoolean()], 'actions.*.type' => 'required|in:' . implode(',', $validActions), 'actions.*.value' => 'required_if:actions.*.type,' . $contextActions . '|ruleActionValue', - 'actions.*.stop_processing' => [new IsBoolean], - 'actions.*.active' => [new IsBoolean], - 'strict' => [new IsBoolean], - 'stop_processing' => [new IsBoolean], - 'active' => [new IsBoolean], + 'actions.*.stop_processing' => [new IsBoolean()], + 'actions.*.active' => [new IsBoolean()], + 'strict' => [new IsBoolean()], + 'stop_processing' => [new IsBoolean()], + 'active' => [new IsBoolean()], 'order' => 'numeric|between:1,1337', ]; } diff --git a/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php b/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php index 1bfa8f5475..de4a99f7fc 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/StoreRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -70,7 +71,7 @@ class StoreRequest extends FormRequest return [ 'title' => 'required|between:1,100|uniqueObjectForUser:rule_groups,title', 'description' => 'between:1,5000|nullable', - 'active' => [new IsBoolean], + 'active' => [new IsBoolean()], ]; } } diff --git a/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php b/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php index aefc709247..b80c8e2b43 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class TestRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * @return array @@ -78,5 +79,4 @@ class TestRequest extends FormRequest 'accounts.*' => 'exists:accounts,id|belongsToUser:accounts', ]; } - } diff --git a/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php b/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php index e6c3f2df80..23825955ae 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class TriggerRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * @return array @@ -76,5 +77,4 @@ class TriggerRequest extends FormRequest 'end' => 'date|after:start', ]; } - } diff --git a/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php b/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php index 0efada299e..76a7e2d370 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/UpdateRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -66,7 +67,7 @@ class UpdateRequest extends FormRequest return [ 'title' => 'between:1,100|uniqueObjectForUser:rule_groups,title,' . $ruleGroup->id, 'description' => 'between:1,5000|nullable', - 'active' => [new IsBoolean], + 'active' => [new IsBoolean()], ]; } } diff --git a/app/Api/V1/Requests/Models/Tag/StoreRequest.php b/app/Api/V1/Requests/Models/Tag/StoreRequest.php index 01ac8cb5c4..a1e4c82af1 100644 --- a/app/Api/V1/Requests/Models/Tag/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Tag/StoreRequest.php @@ -36,7 +36,9 @@ use Illuminate\Foundation\Http\FormRequest; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin, AppendsLocationData; + use ConvertsDataTypes; + use ChecksLogin; + use AppendsLocationData; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php index c303d76307..89e2b21565 100644 --- a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php @@ -37,7 +37,9 @@ use Illuminate\Foundation\Http\FormRequest; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin, AppendsLocationData; + use ConvertsDataTypes; + use ChecksLogin; + use AppendsLocationData; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php index 0fa7e692af..be900ae35a 100644 --- a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php @@ -43,7 +43,12 @@ use Log; */ class StoreRequest extends FormRequest { - use TransactionValidation, GroupValidation, CurrencyValidation, ConvertsDataTypes, ChecksLogin, AppendsLocationData; + use TransactionValidation; + use GroupValidation; + use CurrencyValidation; + use ConvertsDataTypes; + use ChecksLogin; + use AppendsLocationData; /** * Get all data. Is pretty complex because of all the ??-statements. @@ -173,12 +178,12 @@ class StoreRequest extends FormRequest return [ // basic fields for group: 'group_title' => 'between:1,1000|nullable', - 'error_if_duplicate_hash' => [new IsBoolean], - 'apply_rules' => [new IsBoolean], + 'error_if_duplicate_hash' => [new IsBoolean()], + 'apply_rules' => [new IsBoolean()], // transaction rules (in array for splits): 'transactions.*.type' => 'required|in:withdrawal,deposit,transfer,opening-balance,reconciliation', - 'transactions.*.date' => ['required', new IsDateOrTime], + 'transactions.*.date' => ['required', new IsDateOrTime()], 'transactions.*.order' => 'numeric|min:0', // currency info @@ -195,31 +200,31 @@ class StoreRequest extends FormRequest 'transactions.*.description' => 'nullable|between:1,1000', // source of transaction - 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser], + 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()], 'transactions.*.source_name' => 'between:1,255|nullable', 'transactions.*.source_iban' => 'between:1,255|nullable|iban', 'transactions.*.source_number' => 'between:1,255|nullable', 'transactions.*.source_bic' => 'between:1,255|nullable|bic', // destination of transaction - 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser], + 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()], 'transactions.*.destination_name' => 'between:1,255|nullable', 'transactions.*.destination_iban' => 'between:1,255|nullable|iban', 'transactions.*.destination_number' => 'between:1,255|nullable', 'transactions.*.destination_bic' => 'between:1,255|nullable|bic', // budget, category, bill and piggy - 'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser], - 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser], - 'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUser, 'nullable'], + 'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser()], + 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUser(), 'nullable'], 'transactions.*.category_name' => 'between:1,255|nullable', - 'transactions.*.bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser], - 'transactions.*.bill_name' => ['between:1,255', 'nullable', new BelongsUser], - 'transactions.*.piggy_bank_id' => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUser], - 'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser], + 'transactions.*.bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()], + 'transactions.*.bill_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.piggy_bank_id' => ['numeric', 'nullable', 'mustExist:piggy_banks,id', new BelongsUser()], + 'transactions.*.piggy_bank_name' => ['between:1,255', 'nullable', new BelongsUser()], // other interesting fields - 'transactions.*.reconciled' => [new IsBoolean], + 'transactions.*.reconciled' => [new IsBoolean()], 'transactions.*.notes' => 'min:1,max:50000|nullable', 'transactions.*.tags' => 'between:0,255', @@ -261,7 +266,6 @@ class StoreRequest extends FormRequest { $validator->after( function (Validator $validator) { - // must be valid array. $this->validateTransactionArray($validator); @@ -285,7 +289,6 @@ class StoreRequest extends FormRequest // the group must have a description if > 1 journal. $this->validateGroupDescription($validator); - } ); } diff --git a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php index 9cbe848241..3241d0f300 100644 --- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php @@ -41,7 +41,10 @@ use Log; */ class UpdateRequest extends FormRequest { - use TransactionValidation, GroupValidation, ConvertsDataTypes, ChecksLogin; + use TransactionValidation; + use GroupValidation; + use ConvertsDataTypes; + use ChecksLogin; private array $arrayFields; private array $booleanFields; @@ -290,15 +293,15 @@ class UpdateRequest extends FormRequest return [ // basic fields for group: 'group_title' => 'between:1,1000', - 'apply_rules' => [new IsBoolean], + 'apply_rules' => [new IsBoolean()], // transaction rules (in array for splits): 'transactions.*.type' => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation', - 'transactions.*.date' => [new IsDateOrTime], + 'transactions.*.date' => [new IsDateOrTime()], 'transactions.*.order' => 'numeric|min:0', // group id: - 'transactions.*.transaction_journal_id' => ['nullable', 'numeric', new BelongsUser], + 'transactions.*.transaction_journal_id' => ['nullable', 'numeric', new BelongsUser()], // currency info @@ -315,23 +318,23 @@ class UpdateRequest extends FormRequest 'transactions.*.description' => 'nullable|between:1,1000', // source of transaction - 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser], + 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()], 'transactions.*.source_name' => 'between:1,255|nullable', // destination of transaction - 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser], + 'transactions.*.destination_id' => ['numeric', 'nullable', new BelongsUser()], 'transactions.*.destination_name' => 'between:1,255|nullable', // budget, category, bill and piggy - 'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser], - 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser], - 'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUser], + 'transactions.*.budget_id' => ['mustExist:budgets,id', new BelongsUser()], + 'transactions.*.budget_name' => ['between:1,255', 'nullable', new BelongsUser()], + 'transactions.*.category_id' => ['mustExist:categories,id', new BelongsUser()], 'transactions.*.category_name' => 'between:1,255|nullable', - 'transactions.*.bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser], - 'transactions.*.bill_name' => ['between:1,255', 'nullable', new BelongsUser], + 'transactions.*.bill_id' => ['numeric', 'nullable', 'mustExist:bills,id', new BelongsUser()], + 'transactions.*.bill_name' => ['between:1,255', 'nullable', new BelongsUser()], // other interesting fields - 'transactions.*.reconciled' => [new IsBoolean], + 'transactions.*.reconciled' => [new IsBoolean()], 'transactions.*.notes' => 'min:1,max:50000|nullable', 'transactions.*.tags' => 'between:0,255', @@ -385,12 +388,11 @@ class UpdateRequest extends FormRequest $this->validateEqualAccountsForUpdate($validator, $transactionGroup); // a catch when users submit splits with no source or destination info at all. - $this->preventNoAccountInfo($validator,); + $this->preventNoAccountInfo($validator, ); // validate that the currency fits the source and/or destination account. // validate all account info $this->validateAccountInformationUpdate($validator, $transactionGroup); - } ); } diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php index f0fe87c6d7..f048c336a3 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/StoreRequest.php @@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php index df72125217..b11889efc0 100644 --- a/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionCurrency/UpdateRequest.php @@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php index 9473a75a42..9d77154dff 100644 --- a/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php @@ -36,7 +36,8 @@ use Illuminate\Validation\Validator; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php index 0649b832c8..82e31be5d8 100644 --- a/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php @@ -36,7 +36,8 @@ use Illuminate\Validation\Validator; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php index 5226968de4..3cd392ed30 100644 --- a/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class StoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php index 54036336bd..592f9183a7 100644 --- a/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php @@ -35,7 +35,8 @@ use Illuminate\Validation\Rule; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php index 5042aae044..24c4084bf0 100644 --- a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php @@ -34,14 +34,14 @@ use Illuminate\Foundation\Http\FormRequest; */ class CreateRequest extends FormRequest { - use ChecksLogin, ConvertsDataTypes; + use ChecksLogin; + use ConvertsDataTypes; /** * @return array */ public function getData(): array { - $triggers = Webhook::getTriggersForValidation(); $responses = Webhook::getResponsesForValidation(); $deliveries = Webhook::getDeliveriesForValidation(); @@ -77,13 +77,11 @@ class CreateRequest extends FormRequest return [ 'title' => 'required|between:1,512|uniqueObjectForUser:webhooks,title', - 'active' => [new IsBoolean], + 'active' => [new IsBoolean()], 'trigger' => sprintf('required|in:%s', $triggers), 'response' => sprintf('required|in:%s', $responses), 'delivery' => sprintf('required|in:%s', $deliveries), 'url' => ['required', 'url', 'uniqueWebhook'], ]; } - - } diff --git a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php index 2c20f41015..0dad365dd6 100644 --- a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class UpdateRequest extends FormRequest { - use ChecksLogin, ConvertsDataTypes; + use ChecksLogin; + use ConvertsDataTypes; /** * @return array @@ -80,7 +81,6 @@ class UpdateRequest extends FormRequest */ public function rules(): array { - $triggers = implode(',', array_keys(Webhook::getTriggersForValidation())); $responses = implode(',', array_keys(Webhook::getResponsesForValidation())); $deliveries = implode(',', array_keys(Webhook::getDeliveriesForValidation())); @@ -88,7 +88,7 @@ class UpdateRequest extends FormRequest return [ 'title' => sprintf('between:1,512|uniqueObjectForUser:webhooks,title,%d', $webhook->id), - 'active' => [new IsBoolean], + 'active' => [new IsBoolean()], 'trigger' => sprintf('in:%s', $triggers), 'response' => sprintf('in:%s', $responses), 'delivery' => sprintf('in:%s', $deliveries), diff --git a/app/Api/V1/Requests/System/UpdateRequest.php b/app/Api/V1/Requests/System/UpdateRequest.php index fddaa7cb80..0418096d42 100644 --- a/app/Api/V1/Requests/System/UpdateRequest.php +++ b/app/Api/V1/Requests/System/UpdateRequest.php @@ -36,7 +36,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class UpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -73,7 +74,7 @@ class UpdateRequest extends FormRequest break; case 'configuration.is_demo_site': case 'configuration.single_user_mode': - return ['value' => ['required', new IsBoolean]]; + return ['value' => ['required', new IsBoolean()]]; case 'configuration.permission_update_check': return ['value' => 'required|numeric|between:-1,1']; case 'configuration.last_update_check': diff --git a/app/Api/V1/Requests/System/UserStoreRequest.php b/app/Api/V1/Requests/System/UserStoreRequest.php index 7168bc4555..28dae61728 100644 --- a/app/Api/V1/Requests/System/UserStoreRequest.php +++ b/app/Api/V1/Requests/System/UserStoreRequest.php @@ -34,7 +34,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class UserStoreRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Logged in + owner @@ -75,10 +76,9 @@ class UserStoreRequest extends FormRequest { return [ 'email' => 'required|email|unique:users,email', - 'blocked' => [new IsBoolean], + 'blocked' => [new IsBoolean()], 'blocked_code' => 'in:email_changed', 'role' => 'in:owner,demo', ]; } - } diff --git a/app/Api/V1/Requests/System/UserUpdateRequest.php b/app/Api/V1/Requests/System/UserUpdateRequest.php index 1433467ce2..c0b88dd44e 100644 --- a/app/Api/V1/Requests/System/UserUpdateRequest.php +++ b/app/Api/V1/Requests/System/UserUpdateRequest.php @@ -35,7 +35,8 @@ use Illuminate\Validation\Validator; */ class UserUpdateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Logged in + owner @@ -78,7 +79,7 @@ class UserUpdateRequest extends FormRequest return [ 'email' => sprintf('email|unique:users,email,%d', $user->id), - 'blocked' => [new IsBoolean], + 'blocked' => [new IsBoolean()], 'blocked_code' => 'in:email_changed', 'role' => 'in:owner,demo,', ]; @@ -104,5 +105,4 @@ class UserUpdateRequest extends FormRequest } ); } - } diff --git a/app/Api/V1/Requests/User/PreferenceStoreRequest.php b/app/Api/V1/Requests/User/PreferenceStoreRequest.php index e652950b25..b722645579 100644 --- a/app/Api/V1/Requests/User/PreferenceStoreRequest.php +++ b/app/Api/V1/Requests/User/PreferenceStoreRequest.php @@ -29,7 +29,8 @@ use Illuminate\Foundation\Http\FormRequest; class PreferenceStoreRequest extends FormRequest { - use ChecksLogin, ConvertsDataTypes; + use ChecksLogin; + use ConvertsDataTypes; /** * @return array @@ -63,5 +64,4 @@ class PreferenceStoreRequest extends FormRequest 'data' => 'required', ]; } - } diff --git a/app/Api/V1/Requests/User/PreferenceUpdateRequest.php b/app/Api/V1/Requests/User/PreferenceUpdateRequest.php index 7f389c872e..61e011ea25 100644 --- a/app/Api/V1/Requests/User/PreferenceUpdateRequest.php +++ b/app/Api/V1/Requests/User/PreferenceUpdateRequest.php @@ -30,7 +30,8 @@ use Illuminate\Foundation\Http\FormRequest; class PreferenceUpdateRequest extends FormRequest { - use ChecksLogin, ConvertsDataTypes; + use ChecksLogin; + use ConvertsDataTypes; /** * @return array @@ -63,5 +64,4 @@ class PreferenceUpdateRequest extends FormRequest 'data' => 'required', ]; } - } diff --git a/app/Api/V2/Controllers/Autocomplete/AccountController.php b/app/Api/V2/Controllers/Autocomplete/AccountController.php index 26764f9c3d..eac0044f95 100644 --- a/app/Api/V2/Controllers/Autocomplete/AccountController.php +++ b/app/Api/V2/Controllers/Autocomplete/AccountController.php @@ -31,5 +31,4 @@ use FireflyIII\Api\V2\Controllers\Controller; */ class AccountController extends Controller { - } diff --git a/app/Api/V2/Controllers/Chart/AccountController.php b/app/Api/V2/Controllers/Chart/AccountController.php index d6b87e6b2d..11a0b5f384 100644 --- a/app/Api/V2/Controllers/Chart/AccountController.php +++ b/app/Api/V2/Controllers/Chart/AccountController.php @@ -123,5 +123,4 @@ class AccountController extends Controller return response()->json($chartData); return response()->json(['x']); } - } diff --git a/app/Api/V2/Controllers/Controller.php b/app/Api/V2/Controllers/Controller.php index 0aedbff38b..fa961ab800 100644 --- a/app/Api/V2/Controllers/Controller.php +++ b/app/Api/V2/Controllers/Controller.php @@ -73,7 +73,7 @@ class Controller extends BaseController final protected function jsonApiObject(string $key, Model $object, AbstractTransformer $transformer): array { // create some objects: - $manager = new Manager; + $manager = new Manager(); $baseUrl = request()->getSchemeAndHttpHost() . '/api/v2'; $manager->setSerializer(new JsonApiSerializer($baseUrl)); @@ -91,7 +91,7 @@ class Controller extends BaseController */ final protected function jsonApiList(string $key, LengthAwarePaginator $paginator, AbstractTransformer $transformer): array { - $manager = new Manager; + $manager = new Manager(); $baseUrl = request()->getSchemeAndHttpHost() . '/api/v2'; $manager->setSerializer(new JsonApiSerializer($baseUrl)); @@ -115,7 +115,7 @@ class Controller extends BaseController */ private function getParameters(): ParameterBag { - $bag = new ParameterBag; + $bag = new ParameterBag(); try { $page = (int) request()->get('page'); } catch (ContainerExceptionInterface|NotFoundExceptionInterface $e) { @@ -161,5 +161,4 @@ class Controller extends BaseController return $bag; } - } diff --git a/app/Api/V2/Controllers/Data/Bulk/AccountController.php b/app/Api/V2/Controllers/Data/Bulk/AccountController.php index ef83fd052e..d869b8843f 100644 --- a/app/Api/V2/Controllers/Data/Bulk/AccountController.php +++ b/app/Api/V2/Controllers/Data/Bulk/AccountController.php @@ -31,5 +31,4 @@ use FireflyIII\Api\V2\Controllers\Controller; */ class AccountController extends Controller { - } diff --git a/app/Api/V2/Controllers/Data/Export/AccountController.php b/app/Api/V2/Controllers/Data/Export/AccountController.php index 7c47fc383a..3787530d57 100644 --- a/app/Api/V2/Controllers/Data/Export/AccountController.php +++ b/app/Api/V2/Controllers/Data/Export/AccountController.php @@ -31,5 +31,4 @@ use FireflyIII\Api\V2\Controllers\Controller; */ class AccountController extends Controller { - } diff --git a/app/Api/V2/Controllers/Data/MassDestroy/AccountController.php b/app/Api/V2/Controllers/Data/MassDestroy/AccountController.php index 70343cb35f..51c18b60fe 100644 --- a/app/Api/V2/Controllers/Data/MassDestroy/AccountController.php +++ b/app/Api/V2/Controllers/Data/MassDestroy/AccountController.php @@ -31,5 +31,4 @@ use FireflyIII\Api\V2\Controllers\Controller; */ class AccountController extends Controller { - } diff --git a/app/Api/V2/Controllers/Model/Account/ShowController.php b/app/Api/V2/Controllers/Model/Account/ShowController.php index 8929e73581..17def3cf5f 100644 --- a/app/Api/V2/Controllers/Model/Account/ShowController.php +++ b/app/Api/V2/Controllers/Model/Account/ShowController.php @@ -35,14 +35,13 @@ use Illuminate\Http\Request; */ class ShowController extends Controller { - /** * @param Account $account * @return JsonResponse */ public function show(Request $request, Account $account): JsonResponse { - $transformer = new AccountTransformer; + $transformer = new AccountTransformer(); $transformer->setParameters($this->parameters); return response() diff --git a/app/Api/V2/Controllers/Model/Bill/SumController.php b/app/Api/V2/Controllers/Model/Bill/SumController.php index 2df4c5aff4..79b422afc0 100644 --- a/app/Api/V2/Controllers/Model/Bill/SumController.php +++ b/app/Api/V2/Controllers/Model/Bill/SumController.php @@ -35,8 +35,8 @@ use Illuminate\Http\JsonResponse; */ class SumController extends Controller { - private BillRepositoryInterface $repository; use ConvertsExchangeRates; + private BillRepositoryInterface $repository; /** * diff --git a/app/Api/V2/Controllers/Model/Budget/ListController.php b/app/Api/V2/Controllers/Model/Budget/ListController.php index ef1b81b988..240c488ec5 100644 --- a/app/Api/V2/Controllers/Model/Budget/ListController.php +++ b/app/Api/V2/Controllers/Model/Budget/ListController.php @@ -62,5 +62,4 @@ class ListController extends Controller ->api($this->jsonApiList('budgets', $paginator, $transformer)) ->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V2/Controllers/Model/Budget/SumController.php b/app/Api/V2/Controllers/Model/Budget/SumController.php index 1b17ebcfaf..993a0952bb 100644 --- a/app/Api/V2/Controllers/Model/Budget/SumController.php +++ b/app/Api/V2/Controllers/Model/Budget/SumController.php @@ -77,5 +77,4 @@ class SumController extends Controller return response()->json($converted); } - } diff --git a/app/Api/V2/Controllers/Model/BudgetLimit/ListController.php b/app/Api/V2/Controllers/Model/BudgetLimit/ListController.php index f5a3d3026c..2c4732671e 100644 --- a/app/Api/V2/Controllers/Model/BudgetLimit/ListController.php +++ b/app/Api/V2/Controllers/Model/BudgetLimit/ListController.php @@ -53,7 +53,7 @@ class ListController extends Controller public function index(DateRequest $request, Budget $budget): JsonResponse { $dates = $request->getAll(); - $collection = $this->repository->getBudgetLimits($budget,$dates['start'], $dates['end']); + $collection = $this->repository->getBudgetLimits($budget, $dates['start'], $dates['end']); $total = $collection->count(); $collection->slice($this->pageSize * $this->parameters->get('page'), $this->pageSize); @@ -63,5 +63,4 @@ class ListController extends Controller ->api($this->jsonApiList('budget_limits', $paginator, $transformer)) ->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V2/Controllers/NetWorthController.php b/app/Api/V2/Controllers/NetWorthController.php index 388adfb376..3c479565aa 100644 --- a/app/Api/V2/Controllers/NetWorthController.php +++ b/app/Api/V2/Controllers/NetWorthController.php @@ -68,5 +68,4 @@ class NetWorthController extends Controller return response()->api($converted); } - } diff --git a/app/Api/V2/Controllers/Search/AccountController.php b/app/Api/V2/Controllers/Search/AccountController.php index 5963983e15..9c107899cf 100644 --- a/app/Api/V2/Controllers/Search/AccountController.php +++ b/app/Api/V2/Controllers/Search/AccountController.php @@ -31,5 +31,4 @@ use FireflyIII\Api\V2\Controllers\Controller; */ class AccountController extends Controller { - } diff --git a/app/Api/V2/Controllers/System/ConfigurationController.php b/app/Api/V2/Controllers/System/ConfigurationController.php index 381276530d..3945e0680a 100644 --- a/app/Api/V2/Controllers/System/ConfigurationController.php +++ b/app/Api/V2/Controllers/System/ConfigurationController.php @@ -26,5 +26,4 @@ namespace FireflyIII\Api\V2\Controllers\System; class ConfigurationController { - } diff --git a/app/Api/V2/Controllers/System/DebugController.php b/app/Api/V2/Controllers/System/DebugController.php index b275e9093d..f1c07c8163 100644 --- a/app/Api/V2/Controllers/System/DebugController.php +++ b/app/Api/V2/Controllers/System/DebugController.php @@ -28,5 +28,4 @@ use FireflyIII\Api\V2\Controllers\Controller; class DebugController extends Controller { - } diff --git a/app/Api/V2/Controllers/System/PreferencesController.php b/app/Api/V2/Controllers/System/PreferencesController.php index 8c3f8d8c0a..37a02c663b 100644 --- a/app/Api/V2/Controllers/System/PreferencesController.php +++ b/app/Api/V2/Controllers/System/PreferencesController.php @@ -34,7 +34,6 @@ use Illuminate\Http\JsonResponse; */ class PreferencesController extends Controller { - /** * @param Preference $preference * @return JsonResponse @@ -42,8 +41,7 @@ class PreferencesController extends Controller public function get(Preference $preference): JsonResponse { return response() - ->json($this->jsonApiObject('preferences', $preference, new PreferenceTransformer)) + ->json($this->jsonApiObject('preferences', $preference, new PreferenceTransformer())) ->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V2/Controllers/Transaction/List/AccountController.php b/app/Api/V2/Controllers/Transaction/List/AccountController.php index 16c72175c8..27ec076fe1 100644 --- a/app/Api/V2/Controllers/Transaction/List/AccountController.php +++ b/app/Api/V2/Controllers/Transaction/List/AccountController.php @@ -77,8 +77,7 @@ class AccountController extends Controller $paginator->setPath(route('api.v2.accounts.transactions', [$account->id])); // TODO . $this->buildParams() return response() - ->json($this->jsonApiList('transactions', $paginator, new TransactionGroupTransformer)) + ->json($this->jsonApiList('transactions', $paginator, new TransactionGroupTransformer())) ->header('Content-Type', self::CONTENT_TYPE); } - } diff --git a/app/Api/V2/Controllers/Transaction/Sum/BillController.php b/app/Api/V2/Controllers/Transaction/Sum/BillController.php index 0803ff4f8b..bd031e34dc 100644 --- a/app/Api/V2/Controllers/Transaction/Sum/BillController.php +++ b/app/Api/V2/Controllers/Transaction/Sum/BillController.php @@ -31,6 +31,4 @@ use FireflyIII\Api\V2\Controllers\Controller; */ class BillController extends Controller { - - } diff --git a/app/Api/V2/Controllers/VersionUpdateController.php b/app/Api/V2/Controllers/VersionUpdateController.php index 67ed5c0fda..0852ae7d74 100644 --- a/app/Api/V2/Controllers/VersionUpdateController.php +++ b/app/Api/V2/Controllers/VersionUpdateController.php @@ -29,5 +29,4 @@ namespace FireflyIII\Api\V2\Controllers; */ class VersionUpdateController extends Controller { - } diff --git a/app/Api/V2/Request/Generic/DateRequest.php b/app/Api/V2/Request/Generic/DateRequest.php index f983b00cec..2c9acfc13f 100644 --- a/app/Api/V2/Request/Generic/DateRequest.php +++ b/app/Api/V2/Request/Generic/DateRequest.php @@ -35,7 +35,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class DateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. diff --git a/app/Api/V2/Request/Generic/SingleDateRequest.php b/app/Api/V2/Request/Generic/SingleDateRequest.php index 949fee2b4c..c76e6df39a 100644 --- a/app/Api/V2/Request/Generic/SingleDateRequest.php +++ b/app/Api/V2/Request/Generic/SingleDateRequest.php @@ -36,7 +36,8 @@ use Illuminate\Foundation\Http\FormRequest; */ class SingleDateRequest extends FormRequest { - use ConvertsDataTypes, ChecksLogin; + use ConvertsDataTypes; + use ChecksLogin; /** * Get all data from the request. @@ -45,7 +46,7 @@ class SingleDateRequest extends FormRequest */ public function getDate(): Carbon { - return $this->getCarbonDate('date'); + return $this->getCarbonDate('date'); } /** diff --git a/app/Api/V2/Response/Sum/AutoSum.php b/app/Api/V2/Response/Sum/AutoSum.php index df941f017b..1d2c0e8754 100644 --- a/app/Api/V2/Response/Sum/AutoSum.php +++ b/app/Api/V2/Response/Sum/AutoSum.php @@ -65,7 +65,5 @@ class AutoSum var_dump(array_values($return)); exit; - } - }