From 657262f17975eca7045f099b4040536ed881a7d8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 1 Jan 2024 14:41:31 +0100 Subject: [PATCH] Various code cleanup and fixed alignments. --- .ci/php-cs-fixer/.php-cs-fixer.php | 5 +- .../Autocomplete/AccountController.php | 14 +- .../Autocomplete/TransactionController.php | 6 +- .../Controllers/Chart/AccountController.php | 30 ++-- app/Api/V1/Controllers/Controller.php | 12 +- .../Data/Bulk/TransactionController.php | 2 +- .../V1/Controllers/Data/DestroyController.php | 8 +- .../V1/Controllers/Data/PurgeController.php | 2 +- .../Insight/Expense/AccountController.php | 4 +- .../Insight/Expense/BillController.php | 30 ++-- .../Insight/Expense/PeriodController.php | 14 +- .../Insight/Expense/TagController.php | 54 +++---- .../Insight/Income/AccountController.php | 4 +- .../Insight/Income/PeriodController.php | 14 +- .../Insight/Income/TagController.php | 28 ++-- .../Insight/Transfer/PeriodController.php | 14 +- .../Insight/Transfer/TagController.php | 28 ++-- .../Models/Account/ListController.php | 42 +++--- .../Models/Account/ShowController.php | 22 +-- .../Models/Account/StoreController.php | 8 +- .../Models/Account/UpdateController.php | 4 +- .../Models/Attachment/ShowController.php | 16 +- .../Models/Attachment/StoreController.php | 8 +- .../Models/Attachment/UpdateController.php | 6 +- .../Models/AvailableBudget/ShowController.php | 18 +-- .../Models/Bill/ListController.php | 42 +++--- .../Models/Bill/ShowController.php | 18 +-- .../Models/Bill/StoreController.php | 8 +- .../Models/Bill/UpdateController.php | 8 +- .../Models/Budget/ListController.php | 54 +++---- .../Models/Budget/ShowController.php | 18 +-- .../Models/Budget/StoreController.php | 6 +- .../Models/Budget/UpdateController.php | 8 +- .../Models/BudgetLimit/ListController.php | 18 +-- .../Models/BudgetLimit/ShowController.php | 16 +- .../Models/BudgetLimit/StoreController.php | 8 +- .../Models/BudgetLimit/UpdateController.php | 4 +- .../Models/Category/ListController.php | 28 ++-- .../Models/Category/ShowController.php | 18 +-- .../Models/Category/StoreController.php | 6 +- .../Models/Category/UpdateController.php | 8 +- .../Models/ObjectGroup/ListController.php | 28 ++-- .../Models/ObjectGroup/ShowController.php | 14 +- .../Models/ObjectGroup/UpdateController.php | 6 +- .../Models/PiggyBank/ListController.php | 24 +-- .../Models/PiggyBank/ShowController.php | 18 +-- .../Models/PiggyBank/StoreController.php | 6 +- .../Models/PiggyBank/UpdateController.php | 8 +- .../Models/Recurrence/ListController.php | 20 +-- .../Models/Recurrence/ShowController.php | 18 +-- .../Models/Recurrence/StoreController.php | 8 +- .../Models/Recurrence/UpdateController.php | 8 +- .../Models/Rule/DestroyController.php | 2 +- .../Models/Rule/ShowController.php | 20 +-- .../Models/Rule/StoreController.php | 8 +- .../Models/Rule/TriggerController.php | 14 +- .../Models/Rule/UpdateController.php | 10 +- .../Models/RuleGroup/DestroyController.php | 2 +- .../Models/RuleGroup/ListController.php | 16 +- .../Models/RuleGroup/ShowController.php | 20 +-- .../Models/RuleGroup/StoreController.php | 10 +- .../Models/RuleGroup/TriggerController.php | 18 +-- .../Models/RuleGroup/UpdateController.php | 8 +- .../Models/Tag/DestroyController.php | 2 +- .../Controllers/Models/Tag/ListController.php | 30 ++-- .../Controllers/Models/Tag/ShowController.php | 20 +-- .../Models/Tag/StoreController.php | 8 +- .../Models/Tag/UpdateController.php | 8 +- .../Models/Transaction/DestroyController.php | 4 +- .../Models/Transaction/ListController.php | 32 ++-- .../Models/Transaction/ShowController.php | 28 ++-- .../Models/Transaction/StoreController.php | 20 +-- .../Models/Transaction/UpdateController.php | 18 +-- .../TransactionCurrency/ListController.php | 106 ++++++------- .../TransactionCurrency/ShowController.php | 26 ++-- .../TransactionCurrency/StoreController.php | 8 +- .../TransactionCurrency/UpdateController.php | 30 ++-- .../TransactionLink/DestroyController.php | 2 +- .../Models/TransactionLink/ShowController.php | 20 +-- .../TransactionLink/StoreController.php | 16 +- .../TransactionLink/UpdateController.php | 4 +- .../TransactionLinkType/ListController.php | 20 +-- .../TransactionLinkType/ShowController.php | 18 +-- .../TransactionLinkType/StoreController.php | 12 +- .../TransactionLinkType/UpdateController.php | 10 +- .../Controllers/Search/AccountController.php | 22 +-- .../Search/TransactionController.php | 20 +-- .../Controllers/Summary/BasicController.php | 48 +++--- .../V1/Controllers/System/AboutController.php | 4 +- .../System/ConfigurationController.php | 2 +- .../V1/Controllers/System/CronController.php | 4 +- .../V1/Controllers/System/UserController.php | 34 ++--- .../User/PreferencesController.php | 24 +-- .../Controllers/Webhook/AttemptController.php | 18 +-- .../Controllers/Webhook/MessageController.php | 18 +-- .../V1/Controllers/Webhook/ShowController.php | 18 +-- .../Controllers/Webhook/StoreController.php | 8 +- .../Controllers/Webhook/UpdateController.php | 8 +- .../Data/Bulk/MoveTransactionsRequest.php | 8 +- app/Api/V1/Requests/Data/DateRequest.php | 2 +- .../V1/Requests/Data/Export/ExportRequest.php | 8 +- .../V1/Requests/Insight/GenericRequest.php | 10 +- .../Requests/Models/Account/StoreRequest.php | 4 +- .../Requests/Models/Account/UpdateRequest.php | 2 +- .../Models/Recurrence/StoreRequest.php | 30 ++-- .../Models/Recurrence/UpdateRequest.php | 36 ++--- .../V1/Requests/Models/Rule/StoreRequest.php | 16 +- .../V1/Requests/Models/Rule/TestRequest.php | 2 +- .../Requests/Models/Rule/TriggerRequest.php | 2 +- .../V1/Requests/Models/Rule/UpdateRequest.php | 8 +- .../Requests/Models/RuleGroup/TestRequest.php | 2 +- .../Models/RuleGroup/TriggerRequest.php | 2 +- .../V1/Requests/Models/Tag/UpdateRequest.php | 2 +- .../Models/Transaction/StoreRequest.php | 140 +++++++++--------- .../Models/Transaction/UpdateRequest.php | 102 ++++++------- .../Models/TransactionLink/StoreRequest.php | 14 +- .../Models/TransactionLink/UpdateRequest.php | 16 +- .../Requests/Models/Webhook/CreateRequest.php | 8 +- .../Requests/Models/Webhook/UpdateRequest.php | 12 +- 119 files changed, 1022 insertions(+), 1021 deletions(-) diff --git a/.ci/php-cs-fixer/.php-cs-fixer.php b/.ci/php-cs-fixer/.php-cs-fixer.php index d30c0cc3cc..c1462f7fcd 100644 --- a/.ci/php-cs-fixer/.php-cs-fixer.php +++ b/.ci/php-cs-fixer/.php-cs-fixer.php @@ -22,7 +22,7 @@ $current = __DIR__; $paths = [ - $current . '/../../app/Api/V1/Controllers/Autocomplete', + $current . '/../../app/Api/V1', // $current . '/../../config', // $current . '/../../database', // $current . '/../../routes', @@ -61,7 +61,8 @@ return $config->setRules([ 'default' => 'at_least_single_space', 'operators' => [ '=>' => 'align_single_space_by_scope', - '=' => 'align_single_space_minimal', + '=' => 'align_single_space_minimal_by_scope', + '??=' => 'align_single_space_minimal_by_scope', ], ], 'void_return' => true, diff --git a/app/Api/V1/Controllers/Autocomplete/AccountController.php b/app/Api/V1/Controllers/Autocomplete/AccountController.php index a9a50ee9eb..c1cbea6229 100644 --- a/app/Api/V1/Controllers/Autocomplete/AccountController.php +++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php @@ -72,12 +72,12 @@ class AccountController extends Controller */ public function accounts(AutocompleteRequest $request): JsonResponse { - $data = $request->getData(); - $types = $data['types']; - $query = $data['query']; - $date = $data['date'] ?? today(config('app.timezone')); - $return = []; - $result = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit')); + $data = $request->getData(); + $types = $data['types']; + $query = $data['query']; + $date = $data['date'] ?? today(config('app.timezone')); + $return = []; + $result = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit')); // TODO this code is duplicated in the V2 Autocomplete controller, which means this code is due to be deprecated. $defaultCurrency = app('amount')->getDefaultCurrency(); @@ -96,7 +96,7 @@ class AccountController extends Controller ); } - $return[] = [ + $return[] = [ 'id' => (string) $account->id, 'name' => $account->name, 'name_with_balance' => $nameWithBalance, diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionController.php b/app/Api/V1/Controllers/Autocomplete/TransactionController.php index ec6c2a4dd6..c43e0caa2d 100644 --- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php +++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php @@ -66,8 +66,8 @@ class TransactionController extends Controller */ public function transactions(AutocompleteRequest $request): JsonResponse { - $data = $request->getData(); - $result = $this->repository->searchJournalDescriptions($data['query'], $this->parameters->get('limit')); + $data = $request->getData(); + $result = $this->repository->searchJournalDescriptions($data['query'], $this->parameters->get('limit')); // limit and unique $filtered = $result->unique('description'); @@ -109,7 +109,7 @@ class TransactionController extends Controller } // limit and unique - $array = []; + $array = []; /** @var TransactionJournal $journal */ foreach ($result as $journal) { diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.php index 9bc23a457e..2943243d07 100644 --- a/app/Api/V1/Controllers/Chart/AccountController.php +++ b/app/Api/V1/Controllers/Chart/AccountController.php @@ -72,20 +72,20 @@ class AccountController extends Controller public function overview(DateRequest $request): JsonResponse { // parameters for chart: - $dates = $request->getAll(); + $dates = $request->getAll(); /** @var Carbon $start */ - $start = $dates['start']; + $start = $dates['start']; /** @var Carbon $end */ - $end = $dates['end']; + $end = $dates['end']; // user's preferences $defaultSet = $this->repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray(); /** @var Preference $frontPage */ - $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet); - $default = app('amount')->getDefaultCurrency(); + $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet); + $default = app('amount')->getDefaultCurrency(); if (!(is_array($frontPage->data) && count($frontPage->data) > 0)) { $frontPage->data = $defaultSet; @@ -93,16 +93,16 @@ class AccountController extends Controller } // get accounts: - $accounts = $this->repository->getAccountsById($frontPage->data); - $chartData = []; + $accounts = $this->repository->getAccountsById($frontPage->data); + $chartData = []; /** @var Account $account */ foreach ($accounts as $account) { - $currency = $this->repository->getAccountCurrency($account); + $currency = $this->repository->getAccountCurrency($account); if (null === $currency) { $currency = $default; } - $currentSet = [ + $currentSet = [ 'label' => $account->name, 'currency_id' => (string) $currency->id, 'currency_code' => $currency->code, @@ -118,16 +118,16 @@ class AccountController extends Controller $currentStart = clone $start; $range = app('steam')->balanceInRange($account, $start, clone $end); // 2022-10-11 this method no longer converts to float. - $previous = array_values($range)[0]; + $previous = array_values($range)[0]; while ($currentStart <= $end) { - $format = $currentStart->format('Y-m-d'); - $label = $currentStart->toAtomString(); - $balance = array_key_exists($format, $range) ? $range[$format] : $previous; - $previous = $balance; + $format = $currentStart->format('Y-m-d'); + $label = $currentStart->toAtomString(); + $balance = array_key_exists($format, $range) ? $range[$format] : $previous; + $previous = $balance; $currentStart->addDay(); $currentSet['entries'][$label] = $balance; } - $chartData[] = $currentSet; + $chartData[] = $currentSet; } return response()->json($chartData); diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index ad6b3e07c0..2f3a41c8a6 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -113,8 +113,8 @@ abstract class Controller extends BaseController */ private function getParameters(): ParameterBag { - $bag = new ParameterBag(); - $page = (int)request()->get('page'); + $bag = new ParameterBag(); + $page = (int)request()->get('page'); if ($page < 1) { $page = 1; } @@ -124,7 +124,7 @@ abstract class Controller extends BaseController $bag->set('page', $page); // some date fields: - $dates = ['start', 'end', 'date']; + $dates = ['start', 'end', 'date']; foreach ($dates as $field) { $date = null; @@ -136,7 +136,7 @@ abstract class Controller extends BaseController app('log')->error($e->getTraceAsString()); $value = null; } - $obj = null; + $obj = null; if (null !== $date) { try { $obj = Carbon::parse((string)$date); @@ -173,7 +173,7 @@ abstract class Controller extends BaseController && auth()->check()) { // set default for user: /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); /** @var Preference $pageSize */ $pageSize = (int)app('preferences')->getForUser($user, 'listPageSize', 50)->data; @@ -200,7 +200,7 @@ abstract class Controller extends BaseController if ('' === $param) { return $bag; } - $parts = explode(',', $param); + $parts = explode(',', $param); foreach ($parts as $part) { $part = trim($part); $direction = 'asc'; diff --git a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php index f274b8b679..f6ae26a5e2 100644 --- a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php +++ b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php @@ -74,7 +74,7 @@ class TransactionController extends Controller $destination = $this->repository->find((int) $params['update']['account_id']); /** @var AccountDestroyService $service */ - $service = app(AccountDestroyService::class); + $service = app(AccountDestroyService::class); $service->moveTransactions($original, $destination); } diff --git a/app/Api/V1/Controllers/Data/DestroyController.php b/app/Api/V1/Controllers/Data/DestroyController.php index 58ff4d3498..3d2caf491a 100644 --- a/app/Api/V1/Controllers/Data/DestroyController.php +++ b/app/Api/V1/Controllers/Data/DestroyController.php @@ -61,8 +61,8 @@ class DestroyController extends Controller */ public function destroy(DestroyRequest $request): JsonResponse { - $objects = $request->getObjects(); - $this->unused = $request->boolean('unused', false); + $objects = $request->getObjects(); + $this->unused = $request->boolean('unused', false); $allExceptAssets = [AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::RECONCILIATION, AccountType::REVENUE]; $all = [AccountType::ASSET, AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEBT, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::RECONCILIATION]; @@ -99,11 +99,11 @@ class DestroyController extends Controller private function destroyBudgets(): void { /** @var AvailableBudgetRepositoryInterface $abRepository */ - $abRepository = app(AvailableBudgetRepositoryInterface::class); + $abRepository = app(AvailableBudgetRepositoryInterface::class); $abRepository->destroyAll(); /** @var BudgetLimitRepositoryInterface $blRepository */ - $blRepository = app(BudgetLimitRepositoryInterface::class); + $blRepository = app(BudgetLimitRepositoryInterface::class); $blRepository->destroyAll(); /** @var BudgetRepositoryInterface $budgetRepository */ diff --git a/app/Api/V1/Controllers/Data/PurgeController.php b/app/Api/V1/Controllers/Data/PurgeController.php index f35ba7dfbc..593e60c623 100644 --- a/app/Api/V1/Controllers/Data/PurgeController.php +++ b/app/Api/V1/Controllers/Data/PurgeController.php @@ -62,7 +62,7 @@ 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.*']) ; diff --git a/app/Api/V1/Controllers/Insight/Expense/AccountController.php b/app/Api/V1/Controllers/Insight/Expense/AccountController.php index 24b501f08c..6649561c78 100644 --- a/app/Api/V1/Controllers/Insight/Expense/AccountController.php +++ b/app/Api/V1/Controllers/Insight/Expense/AccountController.php @@ -52,8 +52,8 @@ class AccountController extends Controller parent::__construct(); $this->middleware( function ($request, $next) { - $user = auth()->user(); - $this->repository = app(AccountRepositoryInterface::class); + $user = auth()->user(); + $this->repository = app(AccountRepositoryInterface::class); $this->repository->setUser($user); $this->opsRepository = app(OperationsRepositoryInterface::class); diff --git a/app/Api/V1/Controllers/Insight/Expense/BillController.php b/app/Api/V1/Controllers/Insight/Expense/BillController.php index 5ccd79084f..bb88f850b1 100644 --- a/app/Api/V1/Controllers/Insight/Expense/BillController.php +++ b/app/Api/V1/Controllers/Insight/Expense/BillController.php @@ -63,11 +63,11 @@ class BillController extends Controller */ public function bill(GenericRequest $request): JsonResponse { - $accounts = $request->getAssetAccounts(); - $bills = $request->getBills(); - $start = $request->getStart(); - $end = $request->getEnd(); - $response = []; + $accounts = $request->getAssetAccounts(); + $bills = $request->getBills(); + $start = $request->getStart(); + $end = $request->getEnd(); + $response = []; // get all bills: if (0 === $bills->count()) { @@ -75,7 +75,7 @@ class BillController extends Controller } // collect all expenses in this period (regardless of type) by the given bills and accounts. - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts); $collector->setBills($bills); @@ -88,7 +88,7 @@ class BillController extends Controller $foreignKey = sprintf('%d-%d', $billId, $foreignCurrencyId); if (0 !== $currencyId) { - $response[$key] ??= [ + $response[$key] ??= [ 'id' => (string)$billId, 'name' => $journal['bill_name'], 'difference' => '0', @@ -100,7 +100,7 @@ class BillController extends Controller $response[$key]['difference_float'] = (float)$response[$key]['difference']; // intentional float } if (0 !== $foreignCurrencyId) { - $response[$foreignKey] ??= [ + $response[$foreignKey] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$foreignCurrencyId, @@ -122,13 +122,13 @@ class BillController extends Controller */ public function noBill(GenericRequest $request): JsonResponse { - $accounts = $request->getAssetAccounts(); - $start = $request->getStart(); - $end = $request->getEnd(); - $response = []; + $accounts = $request->getAssetAccounts(); + $start = $request->getStart(); + $end = $request->getEnd(); + $response = []; // collect all expenses in this period (regardless of type) by the given bills and accounts. - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts); $collector->withoutBill(); @@ -139,7 +139,7 @@ class BillController extends Controller $foreignCurrencyId = (int)$journal['foreign_currency_id']; if (0 !== $currencyId) { - $response[$currencyId] ??= [ + $response[$currencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$currencyId, @@ -149,7 +149,7 @@ class BillController extends Controller $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float } if (0 !== $foreignCurrencyId) { - $response[$foreignCurrencyId] ??= [ + $response[$foreignCurrencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$foreignCurrencyId, diff --git a/app/Api/V1/Controllers/Insight/Expense/PeriodController.php b/app/Api/V1/Controllers/Insight/Expense/PeriodController.php index b3fef62b52..ad708ecd2d 100644 --- a/app/Api/V1/Controllers/Insight/Expense/PeriodController.php +++ b/app/Api/V1/Controllers/Insight/Expense/PeriodController.php @@ -40,13 +40,13 @@ class PeriodController extends Controller */ public function total(GenericRequest $request): JsonResponse { - $accounts = $request->getAssetAccounts(); - $start = $request->getStart(); - $end = $request->getEnd(); - $response = []; + $accounts = $request->getAssetAccounts(); + $start = $request->getStart(); + $end = $request->getEnd(); + $response = []; // collect all expenses in this period (regardless of type) - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts); $genericSet = $collector->getExtractedJournals(); foreach ($genericSet as $journal) { @@ -54,7 +54,7 @@ class PeriodController extends Controller $foreignCurrencyId = (int)$journal['foreign_currency_id']; if (0 !== $currencyId) { - $response[$currencyId] ??= [ + $response[$currencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$currencyId, @@ -64,7 +64,7 @@ class PeriodController extends Controller $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float } if (0 !== $foreignCurrencyId) { - $response[$foreignCurrencyId] ??= [ + $response[$foreignCurrencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$foreignCurrencyId, diff --git a/app/Api/V1/Controllers/Insight/Expense/TagController.php b/app/Api/V1/Controllers/Insight/Expense/TagController.php index 6af63a7f8b..de7c902816 100644 --- a/app/Api/V1/Controllers/Insight/Expense/TagController.php +++ b/app/Api/V1/Controllers/Insight/Expense/TagController.php @@ -62,41 +62,41 @@ class TagController extends Controller */ public function noTag(GenericRequest $request): JsonResponse { - $accounts = $request->getAssetAccounts(); - $start = $request->getStart(); - $end = $request->getEnd(); - $response = []; + $accounts = $request->getAssetAccounts(); + $start = $request->getStart(); + $end = $request->getEnd(); + $response = []; // collect all expenses in this period (regardless of type) by the given bills and accounts. - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts); $collector->withoutTags(); $genericSet = $collector->getExtractedJournals(); foreach ($genericSet as $journal) { - $currencyId = (int)$journal['currency_id']; - $foreignCurrencyId = (int)$journal['foreign_currency_id']; + $currencyId = (int) $journal['currency_id']; + $foreignCurrencyId = (int) $journal['foreign_currency_id']; if (0 !== $currencyId) { - $response[$currencyId] ??= [ + $response[$currencyId] ??= [ 'difference' => '0', 'difference_float' => 0, - 'currency_id' => (string)$currencyId, + 'currency_id' => (string) $currencyId, 'currency_code' => $journal['currency_code'], ]; $response[$currencyId]['difference'] = bcadd($response[$currencyId]['difference'], $journal['amount']); - $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose. + $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose. } if (0 !== $foreignCurrencyId) { - $response[$foreignCurrencyId] ??= [ + $response[$foreignCurrencyId] ??= [ 'difference' => '0', 'difference_float' => 0, - 'currency_id' => (string)$foreignCurrencyId, + 'currency_id' => (string) $foreignCurrencyId, 'currency_code' => $journal['foreign_currency_code'], ]; $response[$foreignCurrencyId]['difference'] = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']); - $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose. + $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose. } } @@ -111,11 +111,11 @@ class TagController extends Controller */ public function tag(GenericRequest $request): JsonResponse { - $accounts = $request->getAssetAccounts(); - $tags = $request->getTags(); - $start = $request->getStart(); - $end = $request->getEnd(); - $response = []; + $accounts = $request->getAssetAccounts(); + $tags = $request->getTags(); + $start = $request->getStart(); + $end = $request->getEnd(); + $response = []; // get all tags: if (0 === $tags->count()) { @@ -123,15 +123,15 @@ class TagController extends Controller } // collect all expenses in this period (regardless of type) by the given bills and accounts. - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts); $collector->setTags($tags); $genericSet = $collector->getExtractedJournals(); /** @var array $journal */ foreach ($genericSet as $journal) { - $currencyId = (int)$journal['currency_id']; - $foreignCurrencyId = (int)$journal['foreign_currency_id']; + $currencyId = (int) $journal['currency_id']; + $foreignCurrencyId = (int) $journal['foreign_currency_id']; /** @var array $tag */ foreach ($journal['tags'] as $tag) { @@ -141,16 +141,16 @@ class TagController extends Controller // on currency ID if (0 !== $currencyId) { - $response[$key] ??= [ - 'id' => (string)$tagId, + $response[$key] ??= [ + 'id' => (string) $tagId, 'name' => $tag['name'], 'difference' => '0', 'difference_float' => 0, - 'currency_id' => (string)$currencyId, + 'currency_id' => (string) $currencyId, 'currency_code' => $journal['currency_code'], ]; $response[$key]['difference'] = bcadd($response[$key]['difference'], $journal['amount']); - $response[$key]['difference_float'] = (float)$response[$key]['difference']; // float but on purpose. + $response[$key]['difference_float'] = (float) $response[$key]['difference']; // float but on purpose. } // on foreign ID @@ -158,11 +158,11 @@ class TagController extends Controller $response[$foreignKey] = $journal[$foreignKey] ?? [ 'difference' => '0', 'difference_float' => 0, - 'currency_id' => (string)$foreignCurrencyId, + 'currency_id' => (string) $foreignCurrencyId, 'currency_code' => $journal['foreign_currency_code'], ]; $response[$foreignKey]['difference'] = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']); - $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // float but on purpose. + $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // float but on purpose. } } } diff --git a/app/Api/V1/Controllers/Insight/Income/AccountController.php b/app/Api/V1/Controllers/Insight/Income/AccountController.php index bc99892c4c..17e9d34205 100644 --- a/app/Api/V1/Controllers/Insight/Income/AccountController.php +++ b/app/Api/V1/Controllers/Insight/Income/AccountController.php @@ -52,8 +52,8 @@ class AccountController extends Controller parent::__construct(); $this->middleware( function ($request, $next) { - $user = auth()->user(); - $this->repository = app(AccountRepositoryInterface::class); + $user = auth()->user(); + $this->repository = app(AccountRepositoryInterface::class); $this->repository->setUser($user); $this->opsRepository = app(OperationsRepositoryInterface::class); diff --git a/app/Api/V1/Controllers/Insight/Income/PeriodController.php b/app/Api/V1/Controllers/Insight/Income/PeriodController.php index c99ce413d2..c207625407 100644 --- a/app/Api/V1/Controllers/Insight/Income/PeriodController.php +++ b/app/Api/V1/Controllers/Insight/Income/PeriodController.php @@ -40,13 +40,13 @@ class PeriodController extends Controller */ public function total(GenericRequest $request): JsonResponse { - $accounts = $request->getAssetAccounts(); - $start = $request->getStart(); - $end = $request->getEnd(); - $response = []; + $accounts = $request->getAssetAccounts(); + $start = $request->getStart(); + $end = $request->getEnd(); + $response = []; // collect all expenses in this period (regardless of type) - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts); $genericSet = $collector->getExtractedJournals(); foreach ($genericSet as $journal) { @@ -54,7 +54,7 @@ class PeriodController extends Controller $foreignCurrencyId = (int)$journal['foreign_currency_id']; if (0 !== $currencyId) { - $response[$currencyId] ??= [ + $response[$currencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$currencyId, @@ -64,7 +64,7 @@ class PeriodController extends Controller $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose. } if (0 !== $foreignCurrencyId) { - $response[$foreignCurrencyId] ??= [ + $response[$foreignCurrencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$foreignCurrencyId, diff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.php index cc182b63bc..ce35e5773c 100644 --- a/app/Api/V1/Controllers/Insight/Income/TagController.php +++ b/app/Api/V1/Controllers/Insight/Income/TagController.php @@ -63,13 +63,13 @@ class TagController extends Controller */ public function noTag(GenericRequest $request): JsonResponse { - $accounts = $request->getAssetAccounts(); - $start = $request->getStart(); - $end = $request->getEnd(); - $response = []; + $accounts = $request->getAssetAccounts(); + $start = $request->getStart(); + $end = $request->getEnd(); + $response = []; // collect all expenses in this period (regardless of type) by the given bills and accounts. - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts); $collector->withoutTags(); @@ -80,7 +80,7 @@ class TagController extends Controller $foreignCurrencyId = (int)$journal['foreign_currency_id']; if (0 !== $currencyId) { - $response[$currencyId] ??= [ + $response[$currencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$currencyId, @@ -90,7 +90,7 @@ class TagController extends Controller $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; } if (0 !== $foreignCurrencyId) { - $response[$foreignCurrencyId] ??= [ + $response[$foreignCurrencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$foreignCurrencyId, @@ -115,11 +115,11 @@ class TagController extends Controller */ public function tag(GenericRequest $request): JsonResponse { - $accounts = $request->getAssetAccounts(); - $tags = $request->getTags(); - $start = $request->getStart(); - $end = $request->getEnd(); - $response = []; + $accounts = $request->getAssetAccounts(); + $tags = $request->getTags(); + $start = $request->getStart(); + $end = $request->getEnd(); + $response = []; // get all tags: if (0 === $tags->count()) { @@ -127,7 +127,7 @@ class TagController extends Controller } // collect all expenses in this period (regardless of type) by the given bills and accounts. - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts); $collector->setTags($tags); $genericSet = $collector->getExtractedJournals(); @@ -145,7 +145,7 @@ class TagController extends Controller // on currency ID if (0 !== $currencyId) { - $response[$key] ??= [ + $response[$key] ??= [ 'id' => (string)$tagId, 'name' => $tag['name'], 'difference' => '0', diff --git a/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php b/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php index 7aac24202b..6b011ec63d 100644 --- a/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php +++ b/app/Api/V1/Controllers/Insight/Transfer/PeriodController.php @@ -40,13 +40,13 @@ class PeriodController extends Controller */ public function total(GenericRequest $request): JsonResponse { - $accounts = $request->getAssetAccounts(); - $start = $request->getStart(); - $end = $request->getEnd(); - $response = []; + $accounts = $request->getAssetAccounts(); + $start = $request->getStart(); + $end = $request->getEnd(); + $response = []; // collect all expenses in this period (regardless of type) - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts); $genericSet = $collector->getExtractedJournals(); foreach ($genericSet as $journal) { @@ -54,7 +54,7 @@ class PeriodController extends Controller $foreignCurrencyId = (int)$journal['foreign_currency_id']; if (0 !== $currencyId) { - $response[$currencyId] ??= [ + $response[$currencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$currencyId, @@ -64,7 +64,7 @@ class PeriodController extends Controller $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; } if (0 !== $foreignCurrencyId) { - $response[$foreignCurrencyId] ??= [ + $response[$foreignCurrencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$foreignCurrencyId, diff --git a/app/Api/V1/Controllers/Insight/Transfer/TagController.php b/app/Api/V1/Controllers/Insight/Transfer/TagController.php index 83b9f0600b..4c79f40fb7 100644 --- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php +++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php @@ -60,13 +60,13 @@ class TagController extends Controller */ public function noTag(GenericRequest $request): JsonResponse { - $accounts = $request->getAssetAccounts(); - $start = $request->getStart(); - $end = $request->getEnd(); - $response = []; + $accounts = $request->getAssetAccounts(); + $start = $request->getStart(); + $end = $request->getEnd(); + $response = []; // collect all expenses in this period (regardless of type) by the given bills and accounts. - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts); $collector->withoutTags(); @@ -77,7 +77,7 @@ class TagController extends Controller $foreignCurrencyId = (int)$journal['foreign_currency_id']; if (0 !== $currencyId) { - $response[$currencyId] ??= [ + $response[$currencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$currencyId, @@ -87,7 +87,7 @@ class TagController extends Controller $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; } if (0 !== $foreignCurrencyId) { - $response[$foreignCurrencyId] ??= [ + $response[$foreignCurrencyId] ??= [ 'difference' => '0', 'difference_float' => 0, 'currency_id' => (string)$foreignCurrencyId, @@ -112,11 +112,11 @@ class TagController extends Controller */ public function tag(GenericRequest $request): JsonResponse { - $accounts = $request->getAssetAccounts(); - $tags = $request->getTags(); - $start = $request->getStart(); - $end = $request->getEnd(); - $response = []; + $accounts = $request->getAssetAccounts(); + $tags = $request->getTags(); + $start = $request->getStart(); + $end = $request->getEnd(); + $response = []; // get all tags: if (0 === $tags->count()) { @@ -124,7 +124,7 @@ class TagController extends Controller } // collect all expenses in this period (regardless of type) by the given bills and accounts. - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts); $collector->setTags($tags); $genericSet = $collector->getExtractedJournals(); @@ -142,7 +142,7 @@ class TagController extends Controller // on currency ID if (0 !== $currencyId) { - $response[$key] ??= [ + $response[$key] ??= [ 'id' => (string)$tagId, 'name' => $tag['name'], 'difference' => '0', diff --git a/app/Api/V1/Controllers/Models/Account/ListController.php b/app/Api/V1/Controllers/Models/Account/ListController.php index 31abbeb341..edcdf2dfea 100644 --- a/app/Api/V1/Controllers/Models/Account/ListController.php +++ b/app/Api/V1/Controllers/Models/Account/ListController.php @@ -75,22 +75,22 @@ class ListController extends Controller */ public function attachments(Account $account): JsonResponse { - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); - $collection = $this->repository->getAttachments($account); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $collection = $this->repository->getAttachments($account); $count = $collection->count(); $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.accounts.attachments', [$account->id]).$this->buildParams()); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($attachments, $transformer, 'attachments'); + $resource = new FractalCollection($attachments, $transformer, 'attachments'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -105,25 +105,25 @@ class ListController extends Controller public function piggyBanks(Account $account): JsonResponse { // create some objects: - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of budgets. Count it and split it. - $collection = $this->repository->getPiggyBanks($account); - $count = $collection->count(); - $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->getPiggyBanks($account); + $count = $collection->count(); + $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.accounts.piggy-banks', [$account->id]).$this->buildParams()); /** @var PiggyBankTransformer $transformer */ $transformer = app(PiggyBankTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks'); + $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -139,18 +139,18 @@ class ListController extends Controller */ public function transactions(Request $request, Account $account): JsonResponse { - $pageSize = $this->parameters->get('limit'); - $type = $request->get('type') ?? 'default'; + $pageSize = $this->parameters->get('limit'); + $type = $request->get('type') ?? 'default'; $this->parameters->set('type', $type); - $types = $this->mapTransactionTypes($this->parameters->get('type')); - $manager = $this->getManager(); + $types = $this->mapTransactionTypes($this->parameters->get('type')); + $manager = $this->getManager(); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setUser($admin)->setAccounts(new Collection([$account])) ->withAPIInformation()->setLimit($pageSize)->setPage($this->parameters->get('page'))->setTypes($types) ; @@ -162,15 +162,15 @@ class ListController extends Controller $collector->setEnd($this->parameters->get('end')); } - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams()); - $groups = $paginator->getCollection(); + $groups = $paginator->getCollection(); /** @var TransactionGroupTransformer $transformer */ $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($groups, $transformer, 'transactions'); + $resource = new FractalCollection($groups, $transformer, 'transactions'); $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 b371a65f63..e0aa98eb54 100644 --- a/app/Api/V1/Controllers/Models/Account/ShowController.php +++ b/app/Api/V1/Controllers/Models/Account/ShowController.php @@ -73,32 +73,32 @@ class ShowController extends Controller */ public function index(Request $request): JsonResponse { - $manager = $this->getManager(); - $type = $request->get('type') ?? 'all'; + $manager = $this->getManager(); + $type = $request->get('type') ?? 'all'; $this->parameters->set('type', $type); // types to get, page size: - $types = $this->mapAccountTypes($this->parameters->get('type')); - $pageSize = $this->parameters->get('limit'); + $types = $this->mapAccountTypes($this->parameters->get('type')); + $pageSize = $this->parameters->get('limit'); // get list of accounts. Count it and split it. $this->repository->resetAccountOrder(); - $collection = $this->repository->getAccountsByType($types, $this->parameters->get('sort') ?? []); - $count = $collection->count(); + $collection = $this->repository->getAccountsByType($types, $this->parameters->get('sort') ?? []); + $count = $collection->count(); // continue sort: - $accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.accounts.index').$this->buildParams()); /** @var AccountTransformer $transformer */ $transformer = app(AccountTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($accounts, $transformer, self::RESOURCE_KEY); + $resource = new FractalCollection($accounts, $transformer, self::RESOURCE_KEY); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -115,12 +115,12 @@ class ShowController extends Controller // get list of accounts. Count it and split it. $this->repository->resetAccountOrder(); $account->refresh(); - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var AccountTransformer $transformer */ $transformer = app(AccountTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($account, $transformer, self::RESOURCE_KEY); + $resource = new Item($account, $transformer, self::RESOURCE_KEY); 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 bdd27aa5a2..f5ed92468b 100644 --- a/app/Api/V1/Controllers/Models/Account/StoreController.php +++ b/app/Api/V1/Controllers/Models/Account/StoreController.php @@ -63,16 +63,16 @@ class StoreController extends Controller */ public function store(StoreRequest $request): JsonResponse { - $data = $request->getAllAccountData(); + $data = $request->getAllAccountData(); $this->repository->resetAccountOrder(); - $account = $this->repository->store($data); - $manager = $this->getManager(); + $account = $this->repository->store($data); + $manager = $this->getManager(); /** @var AccountTransformer $transformer */ $transformer = app(AccountTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($account, $transformer, self::RESOURCE_KEY); + $resource = new Item($account, $transformer, self::RESOURCE_KEY); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/Models/Account/UpdateController.php b/app/Api/V1/Controllers/Models/Account/UpdateController.php index c51dcb1c55..2031ba7005 100644 --- a/app/Api/V1/Controllers/Models/Account/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Account/UpdateController.php @@ -73,9 +73,9 @@ class UpdateController extends Controller app('preferences')->mark(); /** @var AccountTransformer $transformer */ - $transformer = app(AccountTransformer::class); + $transformer = app(AccountTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($account, $transformer, self::RESOURCE_KEY); + $resource = new Item($account, $transformer, self::RESOURCE_KEY); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/Models/Attachment/ShowController.php b/app/Api/V1/Controllers/Models/Attachment/ShowController.php index 39b215b25e..ad9b89010b 100644 --- a/app/Api/V1/Controllers/Models/Attachment/ShowController.php +++ b/app/Api/V1/Controllers/Models/Attachment/ShowController.php @@ -87,11 +87,11 @@ class ShowController extends Controller throw new FireflyException('200000: File has not been uploaded (yet).'); } if ($this->repository->exists($attachment)) { - $content = $this->repository->getContent($attachment); + $content = $this->repository->getContent($attachment); if ('' === $content) { throw new FireflyException('200002: File is empty (zero bytes).'); } - $quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\')); + $quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\')); /** @var LaravelResponse $response */ $response = response($content); @@ -129,10 +129,10 @@ class ShowController extends Controller throw new NotFoundHttpException(); } - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of attachments. Count it and split it. $collection = $this->repository->get(); @@ -140,14 +140,14 @@ class ShowController extends Controller $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.attachments.index').$this->buildParams()); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($attachments, $transformer, 'attachments'); + $resource = new FractalCollection($attachments, $transformer, 'attachments'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -166,13 +166,13 @@ class ShowController extends Controller throw new NotFoundHttpException(); } - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($attachment, $transformer, 'attachments'); + $resource = new Item($attachment, $transformer, 'attachments'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/Models/Attachment/StoreController.php b/app/Api/V1/Controllers/Models/Attachment/StoreController.php index 8e9ffd0c57..16560e5985 100644 --- a/app/Api/V1/Controllers/Models/Attachment/StoreController.php +++ b/app/Api/V1/Controllers/Models/Attachment/StoreController.php @@ -80,15 +80,15 @@ class StoreController extends Controller throw new NotFoundHttpException(); } app('log')->debug(sprintf('Now in %s', __METHOD__)); - $data = $request->getAll(); - $attachment = $this->repository->store($data); - $manager = $this->getManager(); + $data = $request->getAll(); + $attachment = $this->repository->store($data); + $manager = $this->getManager(); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($attachment, $transformer, 'attachments'); + $resource = new Item($attachment, $transformer, 'attachments'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/Models/Attachment/UpdateController.php b/app/Api/V1/Controllers/Models/Attachment/UpdateController.php index ed095212a2..356e6d8fc0 100644 --- a/app/Api/V1/Controllers/Models/Attachment/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Attachment/UpdateController.php @@ -74,15 +74,15 @@ class UpdateController extends Controller throw new NotFoundHttpException(); } - $data = $request->getAll(); + $data = $request->getAll(); $this->repository->update($attachment, $data); - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($attachment, $transformer, 'attachments'); + $resource = new Item($attachment, $transformer, 'attachments'); 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 881343225f..165645d40f 100644 --- a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php +++ b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php @@ -70,13 +70,13 @@ class ShowController extends Controller */ public function index(): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); - $start = $this->parameters->get('start'); - $end = $this->parameters->get('end'); + $start = $this->parameters->get('start'); + $end = $this->parameters->get('end'); // get list of available budgets. Count it and split it. $collection = $this->abRepository->getAvailableBudgetsByDate($start, $end); @@ -84,14 +84,14 @@ class ShowController extends Controller $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.available-budgets.index').$this->buildParams()); /** @var AvailableBudgetTransformer $transformer */ - $transformer = app(AvailableBudgetTransformer::class); + $transformer = app(AvailableBudgetTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($availableBudgets, $transformer, 'available_budgets'); + $resource = new FractalCollection($availableBudgets, $transformer, 'available_budgets'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -105,13 +105,13 @@ class ShowController extends Controller */ public function show(AvailableBudget $availableBudget): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var AvailableBudgetTransformer $transformer */ $transformer = app(AvailableBudgetTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($availableBudget, $transformer, 'available_budgets'); + $resource = new Item($availableBudget, $transformer, 'available_budgets'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/Models/Bill/ListController.php b/app/Api/V1/Controllers/Models/Bill/ListController.php index 23bf285aa1..24985d9e08 100644 --- a/app/Api/V1/Controllers/Models/Bill/ListController.php +++ b/app/Api/V1/Controllers/Models/Bill/ListController.php @@ -74,22 +74,22 @@ class ListController extends Controller */ public function attachments(Bill $bill): JsonResponse { - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); - $collection = $this->repository->getAttachments($bill); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $collection = $this->repository->getAttachments($bill); $count = $collection->count(); $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.bills.attachments', [$bill->id]).$this->buildParams()); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($attachments, $transformer, 'attachments'); + $resource = new FractalCollection($attachments, $transformer, 'attachments'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -105,24 +105,24 @@ class ListController extends Controller */ public function rules(Bill $bill): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of budgets. Count it and split it. - $collection = $this->repository->getRulesForBill($bill); - $count = $collection->count(); - $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->getRulesForBill($bill); + $count = $collection->count(); + $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.bills.rules', [$bill->id]).$this->buildParams()); /** @var RuleTransformer $transformer */ $transformer = app(RuleTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($rules, $transformer, 'rules'); + $resource = new FractalCollection($rules, $transformer, 'rules'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -138,19 +138,19 @@ class ListController extends Controller */ public function transactions(Request $request, Bill $bill): JsonResponse { - $pageSize = $this->parameters->get('limit'); - $type = $request->get('type') ?? 'default'; + $pageSize = $this->parameters->get('limit'); + $type = $request->get('type') ?? 'default'; $this->parameters->set('type', $type); - $types = $this->mapTransactionTypes($this->parameters->get('type')); - $manager = $this->getManager(); + $types = $this->mapTransactionTypes($this->parameters->get('type')); + $manager = $this->getManager(); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // include source + destination account name and type. @@ -173,15 +173,15 @@ class ListController extends Controller } // get paginator. - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]).$this->buildParams()); $transactions = $paginator->getCollection(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $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/Bill/ShowController.php b/app/Api/V1/Controllers/Models/Bill/ShowController.php index 8107008b99..b18abdddd0 100644 --- a/app/Api/V1/Controllers/Models/Bill/ShowController.php +++ b/app/Api/V1/Controllers/Models/Bill/ShowController.php @@ -68,18 +68,18 @@ class ShowController extends Controller public function index(): JsonResponse { $this->repository->correctOrder(); - $bills = $this->repository->getBills(); - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); - $count = $bills->count(); - $bills = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); - $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page')); + $bills = $this->repository->getBills(); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $count = $bills->count(); + $bills = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page')); /** @var BillTransformer $transformer */ $transformer = app(BillTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($bills, $transformer, 'bills'); + $resource = new FractalCollection($bills, $transformer, 'bills'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -93,13 +93,13 @@ class ShowController extends Controller */ public function show(Bill $bill): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var BillTransformer $transformer */ $transformer = app(BillTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($bill, $transformer, 'bills'); + $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/Bill/StoreController.php b/app/Api/V1/Controllers/Models/Bill/StoreController.php index 2989ad0b74..d5c08063d5 100644 --- a/app/Api/V1/Controllers/Models/Bill/StoreController.php +++ b/app/Api/V1/Controllers/Models/Bill/StoreController.php @@ -67,15 +67,15 @@ class StoreController extends Controller */ public function store(StoreRequest $request): JsonResponse { - $data = $request->getAll(); - $bill = $this->repository->store($data); - $manager = $this->getManager(); + $data = $request->getAll(); + $bill = $this->repository->store($data); + $manager = $this->getManager(); /** @var BillTransformer $transformer */ $transformer = app(BillTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($bill, $transformer, 'bills'); + $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/Bill/UpdateController.php b/app/Api/V1/Controllers/Models/Bill/UpdateController.php index f3f3e2e86b..3c8c81bd76 100644 --- a/app/Api/V1/Controllers/Models/Bill/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Bill/UpdateController.php @@ -62,15 +62,15 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, Bill $bill): JsonResponse { - $data = $request->getAll(); - $bill = $this->repository->update($bill, $data); - $manager = $this->getManager(); + $data = $request->getAll(); + $bill = $this->repository->update($bill, $data); + $manager = $this->getManager(); /** @var BillTransformer $transformer */ $transformer = app(BillTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($bill, $transformer, 'bills'); + $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 0b0213ce68..c7892fb394 100644 --- a/app/Api/V1/Controllers/Models/Budget/ListController.php +++ b/app/Api/V1/Controllers/Models/Budget/ListController.php @@ -74,22 +74,22 @@ class ListController extends Controller */ public function attachments(Budget $budget): JsonResponse { - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); - $collection = $this->repository->getAttachments($budget); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $collection = $this->repository->getAttachments($budget); $count = $collection->count(); $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.budgets.attachments', [$budget->id]).$this->buildParams()); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($attachments, $transformer, 'attachments'); + $resource = new FractalCollection($attachments, $transformer, 'attachments'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -105,8 +105,8 @@ class ListController extends Controller */ public function budgetLimits(Budget $budget): JsonResponse { - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); $this->parameters->set('budget_id', $budget->id); $collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end')); $count = $collection->count(); @@ -115,9 +115,9 @@ class ListController extends Controller $paginator->setPath(route('api.v1.budgets.budget-limits', [$budget->id]).$this->buildParams()); /** @var BudgetLimitTransformer $transformer */ - $transformer = app(BudgetLimitTransformer::class); + $transformer = app(BudgetLimitTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits'); + $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -133,20 +133,20 @@ class ListController extends Controller */ public function transactions(Request $request, Budget $budget): JsonResponse { - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); - $type = $request->get('type') ?? 'default'; + $type = $request->get('type') ?? 'default'; $this->parameters->set('type', $type); - $types = $this->mapTransactionTypes($this->parameters->get('type')); - $manager = $this->getManager(); + $types = $this->mapTransactionTypes($this->parameters->get('type')); + $manager = $this->getManager(); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // filter on budget. @@ -168,14 +168,14 @@ class ListController extends Controller $collector->setEnd($this->parameters->get('end')); } - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]).$this->buildParams()); $transactions = $paginator->getCollection(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -191,20 +191,20 @@ class ListController extends Controller */ public function withoutBudget(Request $request): JsonResponse { - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); - $type = $request->get('type') ?? 'default'; + $type = $request->get('type') ?? 'default'; $this->parameters->set('type', $type); - $types = $this->mapTransactionTypes($this->parameters->get('type')); - $manager = $this->getManager(); + $types = $this->mapTransactionTypes($this->parameters->get('type')); + $manager = $this->getManager(); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // filter on budget. @@ -226,14 +226,14 @@ class ListController extends Controller $collector->setEnd($this->parameters->get('end')); } - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.budgets.without-budget').$this->buildParams()); $transactions = $paginator->getCollection(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $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/Budget/ShowController.php b/app/Api/V1/Controllers/Models/Budget/ShowController.php index c80d3000b3..5c266ed4e8 100644 --- a/app/Api/V1/Controllers/Models/Budget/ShowController.php +++ b/app/Api/V1/Controllers/Models/Budget/ShowController.php @@ -71,25 +71,25 @@ class ShowController extends Controller */ public function index(): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of budgets. Count it and split it. - $collection = $this->repository->getBudgets(); - $count = $collection->count(); - $budgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->getBudgets(); + $count = $collection->count(); + $budgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.budgets.index').$this->buildParams()); /** @var BudgetTransformer $transformer */ $transformer = app(BudgetTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($budgets, $transformer, 'budgets'); + $resource = new FractalCollection($budgets, $transformer, 'budgets'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -100,13 +100,13 @@ class ShowController extends Controller */ public function show(Budget $budget): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var BudgetTransformer $transformer */ $transformer = app(BudgetTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($budget, $transformer, 'budgets'); + $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/Budget/StoreController.php b/app/Api/V1/Controllers/Models/Budget/StoreController.php index f262712cb0..3bc7df5f3c 100644 --- a/app/Api/V1/Controllers/Models/Budget/StoreController.php +++ b/app/Api/V1/Controllers/Models/Budget/StoreController.php @@ -64,15 +64,15 @@ class StoreController extends Controller */ public function store(StoreRequest $request): JsonResponse { - $budget = $this->repository->store($request->getAll()); + $budget = $this->repository->store($request->getAll()); $budget->refresh(); - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var BudgetTransformer $transformer */ $transformer = app(BudgetTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($budget, $transformer, 'budgets'); + $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/Budget/UpdateController.php b/app/Api/V1/Controllers/Models/Budget/UpdateController.php index 2057a484a5..e6e6405255 100644 --- a/app/Api/V1/Controllers/Models/Budget/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Budget/UpdateController.php @@ -62,15 +62,15 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, Budget $budget): JsonResponse { - $data = $request->getAll(); - $budget = $this->repository->update($budget, $data); - $manager = $this->getManager(); + $data = $request->getAll(); + $budget = $this->repository->update($budget, $data); + $manager = $this->getManager(); /** @var BudgetTransformer $transformer */ $transformer = app(BudgetTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($budget, $transformer, 'budgets'); + $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/ListController.php b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php index 5d8017ac78..5dac95e7bd 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/ListController.php @@ -52,19 +52,19 @@ class ListController extends Controller */ public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse { - $pageSize = $this->parameters->get('limit'); - $type = $request->get('type') ?? 'default'; + $pageSize = $this->parameters->get('limit'); + $type = $request->get('type') ?? 'default'; $this->parameters->set('type', $type); - $types = $this->mapTransactionTypes($this->parameters->get('type')); - $manager = $this->getManager(); + $types = $this->mapTransactionTypes($this->parameters->get('type')); + $manager = $this->getManager(); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // filter on budget. @@ -81,15 +81,15 @@ class ListController extends Controller $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date); $collector->setTypes($types); - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]).$this->buildParams()); $transactions = $paginator->getCollection(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $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/BudgetLimit/ShowController.php b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php index 19181562bd..c26cddcd19 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php @@ -74,7 +74,7 @@ class ShowController extends Controller */ public function index(Budget $budget): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); $manager->parseIncludes('budget'); $pageSize = $this->parameters->get('limit'); $collection = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end')); @@ -84,10 +84,10 @@ class ShowController extends Controller $paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]).$this->buildParams()); /** @var BudgetLimitTransformer $transformer */ - $transformer = app(BudgetLimitTransformer::class); + $transformer = app(BudgetLimitTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits'); + $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -103,7 +103,7 @@ class ShowController extends Controller */ public function indexAll(SameDateRequest $request): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); $manager->parseIncludes('budget'); $pageSize = $this->parameters->get('limit'); $collection = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end')); @@ -113,10 +113,10 @@ class ShowController extends Controller $paginator->setPath(route('api.v1.budget-limits.index').$this->buildParams()); /** @var BudgetLimitTransformer $transformer */ - $transformer = app(BudgetLimitTransformer::class); + $transformer = app(BudgetLimitTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits'); + $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -134,13 +134,13 @@ class ShowController extends Controller throw new FireflyException('20028: The budget limit does not belong to the budget.'); } // continue! - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var BudgetLimitTransformer $transformer */ $transformer = app(BudgetLimitTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($budgetLimit, $transformer, 'budget_limits'); + $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/BudgetLimit/StoreController.php b/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php index 2388e46c9a..32913dc1d3 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/StoreController.php @@ -70,14 +70,14 @@ class StoreController extends Controller $data['end_date'] = $data['end']; $data['budget_id'] = $budget->id; - $budgetLimit = $this->blRepository->store($data); - $manager = $this->getManager(); + $budgetLimit = $this->blRepository->store($data); + $manager = $this->getManager(); /** @var BudgetLimitTransformer $transformer */ - $transformer = app(BudgetLimitTransformer::class); + $transformer = app(BudgetLimitTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($budgetLimit, $transformer, 'budget_limits'); + $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/BudgetLimit/UpdateController.php b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php index dedd8d5777..31a9e81244 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php @@ -80,10 +80,10 @@ class UpdateController extends Controller $manager = $this->getManager(); /** @var BudgetLimitTransformer $transformer */ - $transformer = app(BudgetLimitTransformer::class); + $transformer = app(BudgetLimitTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($budgetLimit, $transformer, 'budget_limits'); + $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 3add877e7a..4377a47b80 100644 --- a/app/Api/V1/Controllers/Models/Category/ListController.php +++ b/app/Api/V1/Controllers/Models/Category/ListController.php @@ -71,22 +71,22 @@ class ListController extends Controller */ public function attachments(Category $category): JsonResponse { - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); - $collection = $this->repository->getAttachments($category); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $collection = $this->repository->getAttachments($category); $count = $collection->count(); $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.categories.attachments', [$category->id]).$this->buildParams()); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($attachments, $transformer, 'attachments'); + $resource = new FractalCollection($attachments, $transformer, 'attachments'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -102,19 +102,19 @@ class ListController extends Controller */ public function transactions(Request $request, Category $category): JsonResponse { - $pageSize = $this->parameters->get('limit'); - $type = $request->get('type') ?? 'default'; + $pageSize = $this->parameters->get('limit'); + $type = $request->get('type') ?? 'default'; $this->parameters->set('type', $type); - $types = $this->mapTransactionTypes($this->parameters->get('type')); - $manager = $this->getManager(); + $types = $this->mapTransactionTypes($this->parameters->get('type')); + $manager = $this->getManager(); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // filter on category. @@ -136,15 +136,15 @@ class ListController extends Controller $collector->setEnd($this->parameters->get('end')); } - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.categories.transactions', [$category->id]).$this->buildParams()); $transactions = $paginator->getCollection(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $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/Category/ShowController.php b/app/Api/V1/Controllers/Models/Category/ShowController.php index 2598f924f2..8ff9c81972 100644 --- a/app/Api/V1/Controllers/Models/Category/ShowController.php +++ b/app/Api/V1/Controllers/Models/Category/ShowController.php @@ -67,24 +67,24 @@ class ShowController extends Controller */ public function index(): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of budgets. Count it and split it. - $collection = $this->repository->getCategories(); - $count = $collection->count(); - $categories = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->getCategories(); + $count = $collection->count(); + $categories = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.categories.index').$this->buildParams()); /** @var CategoryTransformer $transformer */ $transformer = app(CategoryTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($categories, $transformer, 'categories'); + $resource = new FractalCollection($categories, $transformer, 'categories'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -98,13 +98,13 @@ class ShowController extends Controller */ public function show(Category $category): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var CategoryTransformer $transformer */ $transformer = app(CategoryTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($category, $transformer, 'categories'); + $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/Category/StoreController.php b/app/Api/V1/Controllers/Models/Category/StoreController.php index bc678fffe2..12ccc9517b 100644 --- a/app/Api/V1/Controllers/Models/Category/StoreController.php +++ b/app/Api/V1/Controllers/Models/Category/StoreController.php @@ -64,14 +64,14 @@ class StoreController extends Controller */ public function store(StoreRequest $request): JsonResponse { - $category = $this->repository->store($request->getAll()); - $manager = $this->getManager(); + $category = $this->repository->store($request->getAll()); + $manager = $this->getManager(); /** @var CategoryTransformer $transformer */ $transformer = app(CategoryTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($category, $transformer, 'categories'); + $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/Category/UpdateController.php b/app/Api/V1/Controllers/Models/Category/UpdateController.php index 049fbc0c08..9efa912e72 100644 --- a/app/Api/V1/Controllers/Models/Category/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Category/UpdateController.php @@ -62,15 +62,15 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, Category $category): JsonResponse { - $data = $request->getAll(); - $category = $this->repository->update($category, $data); - $manager = $this->getManager(); + $data = $request->getAll(); + $category = $this->repository->update($category, $data); + $manager = $this->getManager(); /** @var CategoryTransformer $transformer */ $transformer = app(CategoryTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($category, $transformer, 'categories'); + $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 b7105f80e5..97cc5d794f 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/ListController.php @@ -70,23 +70,23 @@ class ListController extends Controller */ public function bills(ObjectGroup $objectGroup): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of piggy banks. Count it and split it. - $collection = $this->repository->getBills($objectGroup); - $count = $collection->count(); - $bills = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->getBills($objectGroup); + $count = $collection->count(); + $bills = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]).$this->buildParams()); /** @var BillTransformer $transformer */ $transformer = app(BillTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($bills, $transformer, 'bills'); + $resource = new FractalCollection($bills, $transformer, 'bills'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -103,25 +103,25 @@ class ListController extends Controller public function piggyBanks(ObjectGroup $objectGroup): JsonResponse { // create some objects: - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of piggy banks. Count it and split it. - $collection = $this->repository->getPiggyBanks($objectGroup); - $count = $collection->count(); - $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->getPiggyBanks($objectGroup); + $count = $collection->count(); + $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.object-groups.piggy-banks', [$objectGroup->id]).$this->buildParams()); /** @var PiggyBankTransformer $transformer */ $transformer = app(PiggyBankTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks'); + $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks'); $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/ObjectGroup/ShowController.php b/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php index 68dfa3e3d9..c7452c3d5b 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php @@ -67,10 +67,10 @@ class ShowController extends Controller */ public function index(): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); $this->repository->resetOrder(); $collection = $this->repository->get(); @@ -78,14 +78,14 @@ class ShowController extends Controller $objectGroups = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($objectGroups, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($objectGroups, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.object-groups.index').$this->buildParams()); /** @var ObjectGroupTransformer $transformer */ - $transformer = app(ObjectGroupTransformer::class); + $transformer = app(ObjectGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($objectGroups, $transformer, 'object_groups'); + $resource = new FractalCollection($objectGroups, $transformer, 'object_groups'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -99,14 +99,14 @@ class ShowController extends Controller */ public function show(ObjectGroup $objectGroup): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); $this->repository->resetOrder(); $objectGroup->refresh(); /** @var ObjectGroupTransformer $transformer */ $transformer = app(ObjectGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($objectGroup, $transformer, 'object_groups'); + $resource = new Item($objectGroup, $transformer, 'object_groups'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php b/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php index 1480954ef3..02b6d0f6ac 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php @@ -63,15 +63,15 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, ObjectGroup $objectGroup): JsonResponse { - $data = $request->getUpdateData(); + $data = $request->getUpdateData(); $this->repository->update($objectGroup, $data); $this->repository->resetOrder(); - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var ObjectGroupTransformer $transformer */ $transformer = app(ObjectGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($objectGroup, $transformer, 'object_groups'); + $resource = new Item($objectGroup, $transformer, 'object_groups'); 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 a8af7b8d63..4b48b6335a 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/ListController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/ListController.php @@ -65,22 +65,22 @@ class ListController extends Controller */ public function attachments(PiggyBank $piggyBank): JsonResponse { - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); - $collection = $this->repository->getAttachments($piggyBank); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $collection = $this->repository->getAttachments($piggyBank); $count = $collection->count(); $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.piggy-banks.attachments', [$piggyBank->id]).$this->buildParams()); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($attachments, $transformer, 'attachments'); + $resource = new FractalCollection($attachments, $transformer, 'attachments'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -97,22 +97,22 @@ class ListController extends Controller public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse { // types to get, page size: - $pageSize = $this->parameters->get('limit'); - $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $manager = $this->getManager(); - $collection = $this->repository->getEvents($piggyBank); - $count = $collection->count(); - $events = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->getEvents($piggyBank); + $count = $collection->count(); + $events = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.piggy-banks.events', [$piggyBank->id]).$this->buildParams()); /** @var PiggyBankEventTransformer $transformer */ $transformer = app(PiggyBankEventTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($events, $transformer, 'piggy_bank_events'); + $resource = new FractalCollection($events, $transformer, 'piggy_bank_events'); $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 9b3524a2b3..12fcc88eb1 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/ShowController.php @@ -67,24 +67,24 @@ class ShowController extends Controller */ public function index(): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of budgets. Count it and split it. - $collection = $this->repository->getPiggyBanks(); - $count = $collection->count(); - $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->getPiggyBanks(); + $count = $collection->count(); + $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.piggy-banks.index').$this->buildParams()); /** @var PiggyBankTransformer $transformer */ $transformer = app(PiggyBankTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks'); + $resource = new FractalCollection($piggyBanks, $transformer, 'piggy_banks'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -98,13 +98,13 @@ class ShowController extends Controller */ public function show(PiggyBank $piggyBank): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var PiggyBankTransformer $transformer */ $transformer = app(PiggyBankTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($piggyBank, $transformer, 'piggy_banks'); + $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/StoreController.php b/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php index a13b4f03e0..ecc97d6662 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/StoreController.php @@ -64,14 +64,14 @@ class StoreController extends Controller */ public function store(StoreRequest $request): JsonResponse { - $piggyBank = $this->repository->store($request->getAll()); - $manager = $this->getManager(); + $piggyBank = $this->repository->store($request->getAll()); + $manager = $this->getManager(); /** @var PiggyBankTransformer $transformer */ $transformer = app(PiggyBankTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($piggyBank, $transformer, 'piggy_banks'); + $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 b85a9c21da..06e0a29b04 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php @@ -62,20 +62,20 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, PiggyBank $piggyBank): JsonResponse { - $data = $request->getAll(); - $piggyBank = $this->repository->update($piggyBank, $data); + $data = $request->getAll(); + $piggyBank = $this->repository->update($piggyBank, $data); if (array_key_exists('current_amount', $data) && '' !== $data['current_amount']) { $this->repository->setCurrentAmount($piggyBank, $data['current_amount']); } - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var PiggyBankTransformer $transformer */ $transformer = app(PiggyBankTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($piggyBank, $transformer, 'piggy_banks'); + $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/ListController.php b/app/Api/V1/Controllers/Models/Recurrence/ListController.php index 29426c6e8a..162ef9f84b 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/ListController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/ListController.php @@ -71,21 +71,21 @@ class ListController extends Controller */ public function transactions(Request $request, Recurrence $recurrence): JsonResponse { - $pageSize = $this->parameters->get('limit'); - $type = $request->get('type') ?? 'default'; + $pageSize = $this->parameters->get('limit'); + $type = $request->get('type') ?? 'default'; $this->parameters->set('type', $type); - $types = $this->mapTransactionTypes($this->parameters->get('type')); - $manager = $this->getManager(); + $types = $this->mapTransactionTypes($this->parameters->get('type')); + $manager = $this->getManager(); // whatever is returned by the query, it must be part of these journals: - $journalIds = $this->repository->getJournalIds($recurrence); + $journalIds = $this->repository->getJournalIds($recurrence); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // filter on journal IDs. @@ -107,15 +107,15 @@ class ListController extends Controller $collector->setEnd($this->parameters->get('end')); } - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.transactions.index').$this->buildParams()); $transactions = $paginator->getCollection(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $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/ShowController.php b/app/Api/V1/Controllers/Models/Recurrence/ShowController.php index 4ba6f320e0..83b8fc2b13 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/ShowController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/ShowController.php @@ -67,25 +67,25 @@ class ShowController extends Controller */ public function index(): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of budgets. Count it and split it. - $collection = $this->repository->get(); - $count = $collection->count(); - $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->get(); + $count = $collection->count(); + $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.recurrences.index').$this->buildParams()); /** @var RecurrenceTransformer $transformer */ $transformer = app(RecurrenceTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences'); + $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -99,13 +99,13 @@ class ShowController extends Controller */ public function show(Recurrence $recurrence): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var RecurrenceTransformer $transformer */ $transformer = app(RecurrenceTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($recurrence, $transformer, 'recurrences'); + $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/Recurrence/StoreController.php b/app/Api/V1/Controllers/Models/Recurrence/StoreController.php index 5d56fea11b..617a509817 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/StoreController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/StoreController.php @@ -64,15 +64,15 @@ class StoreController extends Controller */ public function store(StoreRequest $request): JsonResponse { - $data = $request->getAll(); - $recurrence = $this->repository->store($data); - $manager = $this->getManager(); + $data = $request->getAll(); + $recurrence = $this->repository->store($data); + $manager = $this->getManager(); /** @var RecurrenceTransformer $transformer */ $transformer = app(RecurrenceTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($recurrence, $transformer, 'recurrences'); + $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/Recurrence/UpdateController.php b/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php index cd16cfa517..d56c98efb5 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php @@ -62,15 +62,15 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, Recurrence $recurrence): JsonResponse { - $data = $request->getAll(); - $recurrence = $this->repository->update($recurrence, $data); - $manager = $this->getManager(); + $data = $request->getAll(); + $recurrence = $this->repository->update($recurrence, $data); + $manager = $this->getManager(); /** @var RecurrenceTransformer $transformer */ $transformer = app(RecurrenceTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($recurrence, $transformer, 'recurrences'); + $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/DestroyController.php b/app/Api/V1/Controllers/Models/Rule/DestroyController.php index 771990980b..ad0b52e9ad 100644 --- a/app/Api/V1/Controllers/Models/Rule/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Rule/DestroyController.php @@ -45,7 +45,7 @@ class DestroyController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->ruleRepository = app(RuleRepositoryInterface::class); $this->ruleRepository->setUser($user); diff --git a/app/Api/V1/Controllers/Models/Rule/ShowController.php b/app/Api/V1/Controllers/Models/Rule/ShowController.php index d1b3a1921c..a075a0e8be 100644 --- a/app/Api/V1/Controllers/Models/Rule/ShowController.php +++ b/app/Api/V1/Controllers/Models/Rule/ShowController.php @@ -51,7 +51,7 @@ class ShowController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->ruleRepository = app(RuleRepositoryInterface::class); $this->ruleRepository->setUser($user); @@ -71,25 +71,25 @@ class ShowController extends Controller */ public function index(): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of budgets. Count it and split it. - $collection = $this->ruleRepository->getAll(); - $count = $collection->count(); - $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->ruleRepository->getAll(); + $count = $collection->count(); + $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.rules.index').$this->buildParams()); /** @var RuleTransformer $transformer */ $transformer = app(RuleTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($rules, $transformer, 'rules'); + $resource = new FractalCollection($rules, $transformer, 'rules'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -103,13 +103,13 @@ class ShowController extends Controller */ public function show(Rule $rule): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var RuleTransformer $transformer */ $transformer = app(RuleTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($rule, $transformer, 'rules'); + $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/Rule/StoreController.php b/app/Api/V1/Controllers/Models/Rule/StoreController.php index e4fd127f76..fab9191954 100644 --- a/app/Api/V1/Controllers/Models/Rule/StoreController.php +++ b/app/Api/V1/Controllers/Models/Rule/StoreController.php @@ -47,7 +47,7 @@ class StoreController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->ruleRepository = app(RuleRepositoryInterface::class); $this->ruleRepository->setUser($user); @@ -65,14 +65,14 @@ class StoreController extends Controller */ public function store(StoreRequest $request): JsonResponse { - $rule = $this->ruleRepository->store($request->getAll()); - $manager = $this->getManager(); + $rule = $this->ruleRepository->store($request->getAll()); + $manager = $this->getManager(); /** @var RuleTransformer $transformer */ $transformer = app(RuleTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($rule, $transformer, 'rules'); + $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/Rule/TriggerController.php b/app/Api/V1/Controllers/Models/Rule/TriggerController.php index 9caed6296e..fdc855ba53 100644 --- a/app/Api/V1/Controllers/Models/Rule/TriggerController.php +++ b/app/Api/V1/Controllers/Models/Rule/TriggerController.php @@ -53,7 +53,7 @@ class TriggerController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->ruleRepository = app(RuleRepositoryInterface::class); $this->ruleRepository->setUser($user); @@ -69,10 +69,10 @@ class TriggerController extends Controller */ public function testRule(TestRequest $request, Rule $rule): JsonResponse { - $parameters = $request->getTestParameters(); + $parameters = $request->getTestParameters(); /** @var RuleEngineInterface $ruleEngine */ - $ruleEngine = app(RuleEngineInterface::class); + $ruleEngine = app(RuleEngineInterface::class); $ruleEngine->setRules(new Collection([$rule])); // overrule the rule(s) if necessary. @@ -93,17 +93,17 @@ class TriggerController extends Controller $transactions = $ruleEngine->find(); $count = $transactions->count(); - $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page')); $paginator->setPath(route('api.v1.rules.test', [$rule->id]).$this->buildParams()); // resulting list is presented as JSON thing. - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $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/Rule/UpdateController.php b/app/Api/V1/Controllers/Models/Rule/UpdateController.php index 57d9ece59d..16efffe784 100644 --- a/app/Api/V1/Controllers/Models/Rule/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Rule/UpdateController.php @@ -48,7 +48,7 @@ class UpdateController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->ruleRepository = app(RuleRepositoryInterface::class); $this->ruleRepository->setUser($user); @@ -66,15 +66,15 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, Rule $rule): JsonResponse { - $data = $request->getAll(); - $rule = $this->ruleRepository->update($rule, $data); - $manager = $this->getManager(); + $data = $request->getAll(); + $rule = $this->ruleRepository->update($rule, $data); + $manager = $this->getManager(); /** @var RuleTransformer $transformer */ $transformer = app(RuleTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($rule, $transformer, 'rules'); + $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/DestroyController.php b/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php index 1e5facfdd1..67ad164cda 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php @@ -45,7 +45,7 @@ class DestroyController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class); $this->ruleGroupRepository->setUser($user); diff --git a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php b/app/Api/V1/Controllers/Models/RuleGroup/ListController.php index 9827b12bd8..ac881f47c3 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/ListController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/ListController.php @@ -50,7 +50,7 @@ class ListController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class); $this->ruleGroupRepository->setUser($user); @@ -68,24 +68,24 @@ class ListController extends Controller */ public function rules(RuleGroup $group): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of budgets. Count it and split it. - $collection = $this->ruleGroupRepository->getRules($group); - $count = $collection->count(); - $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->ruleGroupRepository->getRules($group); + $count = $collection->count(); + $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.rule-groups.rules', [$group->id]).$this->buildParams()); /** @var RuleTransformer $transformer */ $transformer = app(RuleTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($rules, $transformer, 'rules'); + $resource = new FractalCollection($rules, $transformer, 'rules'); $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 67739a1f8e..bda98d5f41 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/ShowController.php @@ -51,7 +51,7 @@ class ShowController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class); $this->ruleGroupRepository->setUser($user); @@ -70,24 +70,24 @@ class ShowController extends Controller */ public function index(): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of rule groups. Count it and split it. - $collection = $this->ruleGroupRepository->get(); - $count = $collection->count(); - $ruleGroups = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->ruleGroupRepository->get(); + $count = $collection->count(); + $ruleGroups = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($ruleGroups, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($ruleGroups, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.rule-groups.index').$this->buildParams()); /** @var RuleGroupTransformer $transformer */ $transformer = app(RuleGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($ruleGroups, $transformer, 'rule_groups'); + $resource = new FractalCollection($ruleGroups, $transformer, 'rule_groups'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -101,13 +101,13 @@ class ShowController extends Controller */ public function show(RuleGroup $ruleGroup): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var RuleGroupTransformer $transformer */ $transformer = app(RuleGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($ruleGroup, $transformer, 'rule_groups'); + $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 26ce71af29..746cb7a4d6 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/StoreController.php @@ -49,12 +49,12 @@ class StoreController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class); $this->ruleGroupRepository->setUser($user); - $this->accountRepository = app(AccountRepositoryInterface::class); + $this->accountRepository = app(AccountRepositoryInterface::class); $this->accountRepository->setUser($user); return $next($request); @@ -70,14 +70,14 @@ class StoreController extends Controller */ public function store(StoreRequest $request): JsonResponse { - $ruleGroup = $this->ruleGroupRepository->store($request->getAll()); - $manager = $this->getManager(); + $ruleGroup = $this->ruleGroupRepository->store($request->getAll()); + $manager = $this->getManager(); /** @var RuleGroupTransformer $transformer */ $transformer = app(RuleGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($ruleGroup, $transformer, 'rule_groups'); + $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 1cc5133f6d..e3a862dfa4 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php @@ -53,7 +53,7 @@ class TriggerController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class); $this->ruleGroupRepository->setUser($user); @@ -71,14 +71,14 @@ class TriggerController extends Controller */ public function testGroup(TestRequest $request, RuleGroup $group): JsonResponse { - $rules = $this->ruleGroupRepository->getActiveRules($group); + $rules = $this->ruleGroupRepository->getActiveRules($group); if (0 === $rules->count()) { throw new FireflyException('200023: No rules in this rule group.'); } - $parameters = $request->getTestParameters(); + $parameters = $request->getTestParameters(); /** @var RuleEngineInterface $ruleEngine */ - $ruleEngine = app(RuleEngineInterface::class); + $ruleEngine = app(RuleEngineInterface::class); $ruleEngine->setRules($rules); // overrule the rule(s) if necessary. @@ -99,17 +99,17 @@ class TriggerController extends Controller $transactions = $ruleEngine->find(); $count = $transactions->count(); - $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page')); $paginator->setPath(route('api.v1.rule-groups.test', [$group->id]).$this->buildParams()); // resulting list is presented as JSON thing. - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -125,7 +125,7 @@ class TriggerController extends Controller */ public function triggerGroup(TriggerRequest $request, RuleGroup $group): JsonResponse { - $rules = $this->ruleGroupRepository->getActiveRules($group); + $rules = $this->ruleGroupRepository->getActiveRules($group); if (0 === $rules->count()) { throw new FireflyException('200023: No rules in this rule group.'); } diff --git a/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php b/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php index af67753d21..e65a7de47d 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/UpdateController.php @@ -48,7 +48,7 @@ class UpdateController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class); $this->ruleGroupRepository->setUser($user); @@ -66,14 +66,14 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, RuleGroup $ruleGroup): JsonResponse { - $ruleGroup = $this->ruleGroupRepository->update($ruleGroup, $request->getAll()); - $manager = $this->getManager(); + $ruleGroup = $this->ruleGroupRepository->update($ruleGroup, $request->getAll()); + $manager = $this->getManager(); /** @var RuleGroupTransformer $transformer */ $transformer = app(RuleGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($ruleGroup, $transformer, 'rule_groups'); + $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/Tag/DestroyController.php b/app/Api/V1/Controllers/Models/Tag/DestroyController.php index 619c187a67..ffe999a4fe 100644 --- a/app/Api/V1/Controllers/Models/Tag/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Tag/DestroyController.php @@ -45,7 +45,7 @@ class DestroyController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->repository = app(TagRepositoryInterface::class); $this->repository->setUser($user); diff --git a/app/Api/V1/Controllers/Models/Tag/ListController.php b/app/Api/V1/Controllers/Models/Tag/ListController.php index f33414eae2..4bf4156661 100644 --- a/app/Api/V1/Controllers/Models/Tag/ListController.php +++ b/app/Api/V1/Controllers/Models/Tag/ListController.php @@ -56,7 +56,7 @@ class ListController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->repository = app(TagRepositoryInterface::class); $this->repository->setUser($user); @@ -74,22 +74,22 @@ class ListController extends Controller */ public function attachments(Tag $tag): JsonResponse { - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); - $collection = $this->repository->getAttachments($tag); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $collection = $this->repository->getAttachments($tag); $count = $collection->count(); $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.tags.attachments', [$tag->id]).$this->buildParams()); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($attachments, $transformer, 'attachments'); + $resource = new FractalCollection($attachments, $transformer, 'attachments'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -105,19 +105,19 @@ class ListController extends Controller */ public function transactions(Request $request, Tag $tag): JsonResponse { - $pageSize = $this->parameters->get('limit'); - $type = $request->get('type') ?? 'default'; + $pageSize = $this->parameters->get('limit'); + $type = $request->get('type') ?? 'default'; $this->parameters->set('type', $type); - $types = $this->mapTransactionTypes($this->parameters->get('type')); - $manager = $this->getManager(); + $types = $this->mapTransactionTypes($this->parameters->get('type')); + $manager = $this->getManager(); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // filter on tag. @@ -138,15 +138,15 @@ class ListController extends Controller if (null !== $this->parameters->get('end')) { $collector->setEnd($this->parameters->get('end')); } - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.tags.transactions', [$tag->id]).$this->buildParams()); $transactions = $paginator->getCollection(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $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/Tag/ShowController.php b/app/Api/V1/Controllers/Models/Tag/ShowController.php index 93bb735754..8d62cc28e8 100644 --- a/app/Api/V1/Controllers/Models/Tag/ShowController.php +++ b/app/Api/V1/Controllers/Models/Tag/ShowController.php @@ -51,7 +51,7 @@ class ShowController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->repository = app(TagRepositoryInterface::class); $this->repository->setUser($user); @@ -71,24 +71,24 @@ class ShowController extends Controller */ public function index(): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of budgets. Count it and split it. - $collection = $this->repository->get(); - $count = $collection->count(); - $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->get(); + $count = $collection->count(); + $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.tags.index').$this->buildParams()); /** @var TagTransformer $transformer */ $transformer = app(TagTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($rules, $transformer, 'tags'); + $resource = new FractalCollection($rules, $transformer, 'tags'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -102,13 +102,13 @@ class ShowController extends Controller */ public function show(Tag $tag): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var TagTransformer $transformer */ $transformer = app(TagTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($tag, $transformer, 'tags'); + $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 a431ce7f50..a66fbbd231 100644 --- a/app/Api/V1/Controllers/Models/Tag/StoreController.php +++ b/app/Api/V1/Controllers/Models/Tag/StoreController.php @@ -47,7 +47,7 @@ class StoreController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->repository = app(TagRepositoryInterface::class); $this->repository->setUser($user); @@ -65,14 +65,14 @@ class StoreController extends Controller */ public function store(StoreRequest $request): JsonResponse { - $rule = $this->repository->store($request->getAll()); - $manager = $this->getManager(); + $rule = $this->repository->store($request->getAll()); + $manager = $this->getManager(); /** @var TagTransformer $transformer */ $transformer = app(TagTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($rule, $transformer, 'tags'); + $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/Tag/UpdateController.php b/app/Api/V1/Controllers/Models/Tag/UpdateController.php index 54643501b1..f4cda86433 100644 --- a/app/Api/V1/Controllers/Models/Tag/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Tag/UpdateController.php @@ -48,7 +48,7 @@ class UpdateController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->repository = app(TagRepositoryInterface::class); $this->repository->setUser($user); @@ -66,14 +66,14 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, Tag $tag): JsonResponse { - $rule = $this->repository->update($tag, $request->getAll()); - $manager = $this->getManager(); + $rule = $this->repository->update($tag, $request->getAll()); + $manager = $this->getManager(); /** @var TagTransformer $transformer */ $transformer = app(TagTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($rule, $transformer, 'tags'); + $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 87d6293c15..a1780773f1 100644 --- a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php @@ -51,9 +51,9 @@ class DestroyController extends Controller $this->middleware( function ($request, $next) { /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); - $this->repository = app(JournalRepositoryInterface::class); + $this->repository = app(JournalRepositoryInterface::class); $this->repository->setUser($admin); $this->groupRepository = app(TransactionGroupRepository::class); diff --git a/app/Api/V1/Controllers/Models/Transaction/ListController.php b/app/Api/V1/Controllers/Models/Transaction/ListController.php index 3bed690910..cbc9c153b8 100644 --- a/app/Api/V1/Controllers/Models/Transaction/ListController.php +++ b/app/Api/V1/Controllers/Models/Transaction/ListController.php @@ -54,7 +54,7 @@ class ListController extends Controller $this->middleware( function ($request, $next) { /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); $this->journalAPIRepository = app(JournalAPIRepositoryInterface::class); $this->journalAPIRepository->setUser($admin); @@ -72,9 +72,9 @@ class ListController extends Controller */ public function attachments(TransactionGroup $transactionGroup): JsonResponse { - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); - $collection = new Collection(); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $collection = new Collection(); foreach ($transactionGroup->transactionJournals as $transactionJournal) { $collection = $this->journalAPIRepository->getAttachments($transactionJournal)->merge($collection); } @@ -83,14 +83,14 @@ class ListController extends Controller $attachments = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.transactions.attachments', [$transactionGroup->id]).$this->buildParams()); /** @var AttachmentTransformer $transformer */ $transformer = app(AttachmentTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($attachments, $transformer, 'attachments'); + $resource = new FractalCollection($attachments, $transformer, 'attachments'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -104,23 +104,23 @@ class ListController extends Controller */ public function piggyBankEvents(TransactionGroup $transactionGroup): JsonResponse { - $manager = $this->getManager(); - $collection = new Collection(); - $pageSize = $this->parameters->get('limit'); + $manager = $this->getManager(); + $collection = new Collection(); + $pageSize = $this->parameters->get('limit'); foreach ($transactionGroup->transactionJournals as $transactionJournal) { $collection = $this->journalAPIRepository->getPiggyBankEvents($transactionJournal)->merge($collection); } - $count = $collection->count(); - $events = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $count = $collection->count(); + $events = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.transactions.piggy-bank-events', [$transactionGroup->id]).$this->buildParams()); /** @var PiggyBankEventTransformer $transformer */ $transformer = app(PiggyBankEventTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($events, $transformer, 'piggy_bank_events'); + $resource = new FractalCollection($events, $transformer, 'piggy_bank_events'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); // /** @var PiggyBankEventTransformer $transformer */ // $transformer = app(PiggyBankEventTransformer::class); @@ -146,14 +146,14 @@ class ListController extends Controller $journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.transaction-journals.transaction-links', [$transactionJournal->id]).$this->buildParams()); /** @var TransactionLinkTransformer $transformer */ - $transformer = app(TransactionLinkTransformer::class); + $transformer = app(TransactionLinkTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($journalLinks, $transformer, 'transaction_links'); + $resource = new FractalCollection($journalLinks, $transformer, 'transaction_links'); $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/Transaction/ShowController.php b/app/Api/V1/Controllers/Models/Transaction/ShowController.php index 8afe265bf6..7140254beb 100644 --- a/app/Api/V1/Controllers/Models/Transaction/ShowController.php +++ b/app/Api/V1/Controllers/Models/Transaction/ShowController.php @@ -55,19 +55,19 @@ class ShowController extends Controller */ public function index(Request $request): JsonResponse { - $pageSize = $this->parameters->get('limit'); - $type = $request->get('type') ?? 'default'; + $pageSize = $this->parameters->get('limit'); + $type = $request->get('type') ?? 'default'; $this->parameters->set('type', $type); - $types = $this->mapTransactionTypes($this->parameters->get('type')); - $manager = $this->getManager(); + $types = $this->mapTransactionTypes($this->parameters->get('type')); + $manager = $this->getManager(); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // all info needed for the API: @@ -82,15 +82,15 @@ class ShowController extends Controller if (null !== $this->parameters->get('start') || null !== $this->parameters->get('end')) { $collector->setRange($this->parameters->get('start'), $this->parameters->get('end')); } - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.transactions.index').$this->buildParams()); $transactions = $paginator->getCollection(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -115,14 +115,14 @@ class ShowController extends Controller */ public function show(TransactionGroup $transactionGroup): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // filter on transaction group. @@ -137,9 +137,9 @@ class ShowController extends Controller } /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($selectedGroup, $transformer, 'transactions'); + $resource = new Item($selectedGroup, $transformer, 'transactions'); 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 288f80670f..716fa898e3 100644 --- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php +++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php @@ -57,7 +57,7 @@ class StoreController extends Controller $this->middleware( function ($request, $next) { /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); $this->groupRepository = app(TransactionGroupRepositoryInterface::class); $this->groupRepository->setUser($admin); @@ -78,8 +78,8 @@ class StoreController extends Controller public function store(StoreRequest $request): JsonResponse { app('log')->debug('Now in API StoreController::store()'); - $data = $request->getAll(); - $data['user'] = auth()->user()->id; + $data = $request->getAll(); + $data['user'] = auth()->user()->id; Log::channel('audit') ->info('Store new transaction over API.', $data) @@ -104,18 +104,18 @@ class StoreController extends Controller throw new ValidationException($validator); // @phpstan-ignore-line } app('preferences')->mark(); - $applyRules = $data['apply_rules'] ?? true; - $fireWebhooks = $data['fire_webhooks'] ?? true; + $applyRules = $data['apply_rules'] ?? true; + $fireWebhooks = $data['fire_webhooks'] ?? true; event(new StoredTransactionGroup($transactionGroup, $applyRules, $fireWebhooks)); - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // filter on transaction group. @@ -130,9 +130,9 @@ class StoreController extends Controller } /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($selectedGroup, $transformer, 'transactions'); + $resource = new Item($selectedGroup, $transformer, 'transactions'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php index ed9e2fb17a..5f9946b44a 100644 --- a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php @@ -51,7 +51,7 @@ class UpdateController extends Controller $this->middleware( function ($request, $next) { /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); $this->groupRepository = app(TransactionGroupRepositoryInterface::class); $this->groupRepository->setUser($admin); @@ -70,22 +70,22 @@ class UpdateController extends Controller public function update(UpdateRequest $request, TransactionGroup $transactionGroup): JsonResponse { app('log')->debug('Now in update routine for transaction group!'); - $data = $request->getAll(); + $data = $request->getAll(); $transactionGroup = $this->groupRepository->update($transactionGroup, $data); $manager = $this->getManager(); app('preferences')->mark(); - $applyRules = $data['apply_rules'] ?? true; - $fireWebhooks = $data['fire_webhooks'] ?? true; + $applyRules = $data['apply_rules'] ?? true; + $fireWebhooks = $data['fire_webhooks'] ?? true; event(new UpdatedTransactionGroup($transactionGroup, $applyRules, $fireWebhooks)); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // filter on transaction group. @@ -94,15 +94,15 @@ class UpdateController extends Controller ->withAPIInformation() ; - $selectedGroup = $collector->getGroups()->first(); + $selectedGroup = $collector->getGroups()->first(); if (null === $selectedGroup) { throw new NotFoundHttpException(); } /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($selectedGroup, $transformer, 'transactions'); + $resource = new Item($selectedGroup, $transformer, 'transactions'); 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 8f895230cc..2607c280de 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php @@ -73,15 +73,15 @@ class ListController extends Controller */ public function accounts(Request $request, TransactionCurrency $currency): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // read type from URL - $type = $request->get('type') ?? 'all'; + $type = $request->get('type') ?? 'all'; $this->parameters->set('type', $type); // types to get, page size: - $types = $this->mapAccountTypes($this->parameters->get('type')); - $pageSize = $this->parameters->get('limit'); + $types = $this->mapAccountTypes($this->parameters->get('type')); + $pageSize = $this->parameters->get('limit'); // get list of accounts. Count it and split it. /** @var AccountRepositoryInterface $accountRepository */ @@ -89,7 +89,7 @@ class ListController extends Controller $unfiltered = $accountRepository->getAccountsByType($types); // filter list on currency preference: - $collection = $unfiltered->filter( + $collection = $unfiltered->filter( static function (Account $account) use ($currency, $accountRepository) { $currencyId = (int)$accountRepository->getMetaValue($account, 'currency_id'); @@ -97,17 +97,17 @@ class ListController extends Controller } ); - $count = $collection->count(); - $accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $count = $collection->count(); + $accounts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.currencies.accounts', [$currency->code]).$this->buildParams()); /** @var AccountTransformer $transformer */ - $transformer = app(AccountTransformer::class); + $transformer = app(AccountTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($accounts, $transformer, 'accounts'); + $resource = new FractalCollection($accounts, $transformer, 'accounts'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -123,26 +123,26 @@ class ListController extends Controller */ public function availableBudgets(TransactionCurrency $currency): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of available budgets. Count it and split it. /** @var AvailableBudgetRepositoryInterface $abRepository */ - $abRepository = app(AvailableBudgetRepositoryInterface::class); + $abRepository = app(AvailableBudgetRepositoryInterface::class); $collection = $abRepository->getAvailableBudgetsByCurrency($currency); $count = $collection->count(); $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.currencies.available-budgets', [$currency->code]).$this->buildParams()); /** @var AvailableBudgetTransformer $transformer */ - $transformer = app(AvailableBudgetTransformer::class); + $transformer = app(AvailableBudgetTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($availableBudgets, $transformer, 'available_budgets'); + $resource = new FractalCollection($availableBudgets, $transformer, 'available_budgets'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -158,31 +158,31 @@ class ListController extends Controller */ public function bills(TransactionCurrency $currency): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var BillRepositoryInterface $billRepos */ - $billRepos = app(BillRepositoryInterface::class); - $pageSize = $this->parameters->get('limit'); - $unfiltered = $billRepos->getBills(); + $billRepos = app(BillRepositoryInterface::class); + $pageSize = $this->parameters->get('limit'); + $unfiltered = $billRepos->getBills(); // filter and paginate list: - $collection = $unfiltered->filter( + $collection = $unfiltered->filter( static function (Bill $bill) use ($currency) { return $bill->transaction_currency_id === $currency->id; } ); - $count = $collection->count(); - $bills = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $count = $collection->count(); + $bills = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.currencies.bills', [$currency->code]).$this->buildParams()); /** @var BillTransformer $transformer */ $transformer = app(BillTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($bills, $transformer, 'bills'); + $resource = new FractalCollection($bills, $transformer, 'bills'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -210,10 +210,10 @@ class ListController extends Controller $paginator->setPath(route('api.v1.currencies.budget-limits', [$currency->code]).$this->buildParams()); /** @var BudgetLimitTransformer $transformer */ - $transformer = app(BudgetLimitTransformer::class); + $transformer = app(BudgetLimitTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits'); + $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -229,9 +229,9 @@ class ListController extends Controller */ public function recurrences(TransactionCurrency $currency): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); // types to get, page size: - $pageSize = $this->parameters->get('limit'); + $pageSize = $this->parameters->get('limit'); // get list of budgets. Count it and split it. /** @var RecurringRepositoryInterface $recurringRepos */ @@ -239,7 +239,7 @@ class ListController extends Controller $unfiltered = $recurringRepos->getAll(); // filter selection - $collection = $unfiltered->filter( // @phpstan-ignore-line + $collection = $unfiltered->filter( // @phpstan-ignore-line static function (Recurrence $recurrence) use ($currency) { // @phpstan-ignore-line /** @var RecurrenceTransaction $transaction */ foreach ($recurrence->recurrenceTransactions as $transaction) { @@ -251,18 +251,18 @@ class ListController extends Controller return null; } ); - $count = $collection->count(); - $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $count = $collection->count(); + $piggyBanks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.currencies.recurrences', [$currency->code]).$this->buildParams()); /** @var RecurrenceTransformer $transformer */ - $transformer = app(RecurrenceTransformer::class); + $transformer = app(RecurrenceTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences'); + $resource = new FractalCollection($piggyBanks, $transformer, 'recurrences'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -278,15 +278,15 @@ class ListController extends Controller */ public function rules(TransactionCurrency $currency): JsonResponse { - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); // get list of budgets. Count it and split it. /** @var RuleRepositoryInterface $ruleRepos */ - $ruleRepos = app(RuleRepositoryInterface::class); - $unfiltered = $ruleRepos->getAll(); + $ruleRepos = app(RuleRepositoryInterface::class); + $unfiltered = $ruleRepos->getAll(); - $collection = $unfiltered->filter( // @phpstan-ignore-line + $collection = $unfiltered->filter( // @phpstan-ignore-line static function (Rule $rule) use ($currency) { // @phpstan-ignore-line /** @var RuleTrigger $trigger */ foreach ($rule->ruleTriggers as $trigger) { @@ -299,18 +299,18 @@ class ListController extends Controller } ); - $count = $collection->count(); - $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $count = $collection->count(); + $rules = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.rules.index').$this->buildParams()); /** @var RuleTransformer $transformer */ $transformer = app(RuleTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($rules, $transformer, 'rules'); + $resource = new FractalCollection($rules, $transformer, 'rules'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -326,19 +326,19 @@ class ListController extends Controller */ public function transactions(Request $request, TransactionCurrency $currency): JsonResponse { - $pageSize = $this->parameters->get('limit'); - $type = $request->get('type') ?? 'default'; + $pageSize = $this->parameters->get('limit'); + $type = $request->get('type') ?? 'default'; $this->parameters->set('type', $type); - $types = $this->mapTransactionTypes($this->parameters->get('type')); - $manager = $this->getManager(); + $types = $this->mapTransactionTypes($this->parameters->get('type')); + $manager = $this->getManager(); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // filter on currency. @@ -358,15 +358,15 @@ class ListController extends Controller if (null !== $this->parameters->get('end')) { $collector->setEnd($this->parameters->get('end')); } - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.currencies.transactions', [$currency->code]).$this->buildParams()); $transactions = $paginator->getCollection(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $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 b2ed6a1625..363d599869 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/ShowController.php @@ -74,21 +74,21 @@ class ShowController extends Controller */ public function index(): JsonResponse { - $pageSize = $this->parameters->get('limit'); - $collection = $this->repository->getAll(); - $count = $collection->count(); + $pageSize = $this->parameters->get('limit'); + $collection = $this->repository->getAll(); + $count = $collection->count(); // slice them: - $currencies = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); - $paginator = new LengthAwarePaginator($currencies, $count, $pageSize, $this->parameters->get('page')); + $currencies = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $paginator = new LengthAwarePaginator($currencies, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.currencies.index').$this->buildParams()); - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var CurrencyTransformer $transformer */ $transformer = app(CurrencyTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($currencies, $transformer, 'currencies'); + $resource = new FractalCollection($currencies, $transformer, 'currencies'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -114,10 +114,10 @@ class ShowController extends Controller $currency->refreshForUser($user); /** @var CurrencyTransformer $transformer */ - $transformer = app(CurrencyTransformer::class); + $transformer = app(CurrencyTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($currency, $transformer, 'currencies'); + $resource = new Item($currency, $transformer, 'currencies'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } @@ -133,9 +133,9 @@ class ShowController extends Controller public function showDefault(): JsonResponse { /** @var User $user */ - $user = auth()->user(); - $manager = $this->getManager(); - $currency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup); + $user = auth()->user(); + $manager = $this->getManager(); + $currency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup); // update fields with user info. $currency->refreshForUser($user); @@ -144,7 +144,7 @@ class ShowController extends Controller $transformer = app(CurrencyTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($currency, $transformer, 'currencies'); + $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/TransactionCurrency/StoreController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php index 3244d9aba3..fd041a704e 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php @@ -71,22 +71,22 @@ class StoreController extends Controller */ public function store(StoreRequest $request): JsonResponse { - $currency = $this->repository->store($request->getAll()); + $currency = $this->repository->store($request->getAll()); if (true === $request->boolean('default')) { $this->repository->makeDefault($currency); app('preferences')->mark(); } - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $currency->refreshForUser($user); /** @var CurrencyTransformer $transformer */ $transformer = app(CurrencyTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($currency, $transformer, 'currencies'); + $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/TransactionCurrency/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php index ffa8e959be..d7d2288c9a 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php @@ -82,9 +82,9 @@ class UpdateController extends Controller } /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->repository->disable($currency); - $manager = $this->getManager(); + $manager = $this->getManager(); $currency->refreshForUser($user); @@ -92,7 +92,7 @@ class UpdateController extends Controller $transformer = app(CurrencyTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($currency, $transformer, 'currencies'); + $resource = new Item($currency, $transformer, 'currencies'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } @@ -108,20 +108,20 @@ class UpdateController extends Controller public function makeDefault(TransactionCurrency $currency): JsonResponse { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->repository->enable($currency); $this->repository->makeDefault($currency); app('preferences')->mark(); - $manager = $this->getManager(); + $manager = $this->getManager(); $currency->refreshForUser($user); /** @var CurrencyTransformer $transformer */ $transformer = app(CurrencyTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($currency, $transformer, 'currencies'); + $resource = new Item($currency, $transformer, 'currencies'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } @@ -137,10 +137,10 @@ class UpdateController extends Controller public function enable(TransactionCurrency $currency): JsonResponse { $this->repository->enable($currency); - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $currency->refreshForUser($user); @@ -148,7 +148,7 @@ class UpdateController extends Controller $transformer = app(CurrencyTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($currency, $transformer, 'currencies'); + $resource = new Item($currency, $transformer, 'currencies'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } @@ -163,28 +163,28 @@ class UpdateController extends Controller */ public function update(UpdateRequest $request, TransactionCurrency $currency): JsonResponse { - $data = $request->getAll(); + $data = $request->getAll(); /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); // safety catch on currency disablement. - $set = $this->repository->get(); + $set = $this->repository->get(); if (array_key_exists('enabled', $data) && false === $data['enabled'] && 1 === count($set) && $set->first()->id === $currency->id) { return response()->json([], 409); } - $currency = $this->repository->update($currency, $data); + $currency = $this->repository->update($currency, $data); app('preferences')->mark(); - $manager = $this->getManager(); + $manager = $this->getManager(); $currency->refreshForUser($user); /** @var CurrencyTransformer $transformer */ $transformer = app(CurrencyTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($currency, $transformer, 'currencies'); + $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 82fc1d2738..e5c0b5ff46 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php @@ -46,7 +46,7 @@ class DestroyController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->repository = app(LinkTypeRepositoryInterface::class); diff --git a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php index 99e0d04859..f5874f90ae 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/ShowController.php @@ -53,7 +53,7 @@ class ShowController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->repository = app(LinkTypeRepositoryInterface::class); @@ -75,13 +75,13 @@ class ShowController extends Controller public function index(Request $request): JsonResponse { // create some objects: - $manager = $this->getManager(); + $manager = $this->getManager(); // read type from URL - $name = $request->get('name'); + $name = $request->get('name'); // types to get, page size: - $pageSize = $this->parameters->get('limit'); - $linkType = $this->repository->findByName($name); + $pageSize = $this->parameters->get('limit'); + $linkType = $this->repository->findByName($name); // get list of transaction links. Count it and split it. $collection = $this->repository->getJournalLinks($linkType); @@ -89,14 +89,14 @@ class ShowController extends Controller $journalLinks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($journalLinks, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.transaction-links.index').$this->buildParams()); /** @var TransactionLinkTransformer $transformer */ - $transformer = app(TransactionLinkTransformer::class); + $transformer = app(TransactionLinkTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($journalLinks, $transformer, 'transaction_links'); + $resource = new FractalCollection($journalLinks, $transformer, 'transaction_links'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -110,13 +110,13 @@ class ShowController extends Controller */ public function show(TransactionJournalLink $journalLink): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var TransactionLinkTransformer $transformer */ $transformer = app(TransactionLinkTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($journalLink, $transformer, 'transaction_links'); + $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/StoreController.php b/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php index dee4ef45db..f3083cb7fe 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/StoreController.php @@ -54,7 +54,7 @@ class StoreController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->repository = app(LinkTypeRepositoryInterface::class); $this->journalRepository = app(JournalRepositoryInterface::class); @@ -77,22 +77,22 @@ class StoreController extends Controller */ public function store(StoreRequest $request): JsonResponse { - $manager = $this->getManager(); - $data = $request->getAll(); - $inward = $this->journalRepository->find($data['inward_id'] ?? 0); - $outward = $this->journalRepository->find($data['outward_id'] ?? 0); + $manager = $this->getManager(); + $data = $request->getAll(); + $inward = $this->journalRepository->find($data['inward_id'] ?? 0); + $outward = $this->journalRepository->find($data['outward_id'] ?? 0); if (null === $inward || null === $outward) { throw new FireflyException('200024: Source or destination does not exist.'); } $data['direction'] = 'inward'; - $journalLink = $this->repository->storeLink($data, $inward, $outward); + $journalLink = $this->repository->storeLink($data, $inward, $outward); /** @var TransactionLinkTransformer $transformer */ - $transformer = app(TransactionLinkTransformer::class); + $transformer = app(TransactionLinkTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($journalLink, $transformer, 'transaction_links'); + $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 242707baee..289774ad39 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/UpdateController.php @@ -51,7 +51,7 @@ class UpdateController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $this->repository = app(LinkTypeRepositoryInterface::class); $this->journalRepository = app(JournalRepositoryInterface::class); @@ -80,7 +80,7 @@ class UpdateController extends Controller $transformer = app(TransactionLinkTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($journalLink, $transformer, 'transaction_links'); + $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/ListController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php index aa68d371d8..a135a815bf 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ListController.php @@ -72,22 +72,22 @@ class ListController extends Controller */ public function transactions(Request $request, LinkType $linkType): JsonResponse { - $pageSize = $this->parameters->get('limit'); - $type = $request->get('type') ?? 'default'; + $pageSize = $this->parameters->get('limit'); + $type = $request->get('type') ?? 'default'; $this->parameters->set('type', $type); - $types = $this->mapTransactionTypes($this->parameters->get('type')); - $manager = $this->getManager(); + $types = $this->mapTransactionTypes($this->parameters->get('type')); + $manager = $this->getManager(); // whatever is returned by the query, it must be part of these journals: - $journalIds = $this->repository->getJournalIds($linkType); + $journalIds = $this->repository->getJournalIds($linkType); /** @var User $admin */ - $admin = auth()->user(); + $admin = auth()->user(); // use new group collector: /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector ->setUser($admin) // filter on journal IDs. @@ -107,15 +107,15 @@ class ListController extends Controller if (null !== $this->parameters->get('end')) { $collector->setEnd($this->parameters->get('end')); } - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.transactions.index').$this->buildParams()); $transactions = $paginator->getCollection(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($transactions, $transformer, 'transactions'); + $resource = new FractalCollection($transactions, $transformer, 'transactions'); $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/TransactionLinkType/ShowController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php index aa56e344a7..9fa5e2e497 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/ShowController.php @@ -73,23 +73,23 @@ class ShowController extends Controller public function index(): JsonResponse { // create some objects: - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); // get list of accounts. Count it and split it. - $collection = $this->repository->get(); - $count = $collection->count(); - $linkTypes = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->get(); + $count = $collection->count(); + $linkTypes = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($linkTypes, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($linkTypes, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.link-types.index').$this->buildParams()); /** @var LinkTypeTransformer $transformer */ $transformer = app(LinkTypeTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($linkTypes, $transformer, 'link_types'); + $resource = new FractalCollection($linkTypes, $transformer, 'link_types'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -103,13 +103,13 @@ class ShowController extends Controller */ public function show(LinkType $linkType): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var LinkTypeTransformer $transformer */ $transformer = app(LinkTypeTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($linkType, $transformer, 'link_types'); + $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 d2f6037304..c915dd6589 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/StoreController.php @@ -75,23 +75,23 @@ class StoreController extends Controller public function store(StoreRequest $request): JsonResponse { /** @var User $admin */ - $admin = auth()->user(); - $rules = ['name' => 'required']; + $admin = auth()->user(); + $rules = ['name' => 'required']; if (!$this->userRepository->hasRole($admin, 'owner')) { // access denied: $messages = ['name' => '200005: You need the "owner" role to do this.']; \Validator::make([], $rules, $messages)->validate(); } - $data = $request->getAll(); + $data = $request->getAll(); // if currency ID is 0, find the currency by the code: - $linkType = $this->repository->store($data); - $manager = $this->getManager(); + $linkType = $this->repository->store($data); + $manager = $this->getManager(); /** @var LinkTypeTransformer $transformer */ $transformer = app(LinkTypeTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($linkType, $transformer, 'link_types'); + $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 77d25a9634..0b79bd30a1 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/UpdateController.php @@ -80,23 +80,23 @@ class UpdateController extends Controller } /** @var User $admin */ - $admin = auth()->user(); - $rules = ['name' => 'required']; + $admin = auth()->user(); + $rules = ['name' => 'required']; if (!$this->userRepository->hasRole($admin, 'owner')) { $messages = ['name' => '200005: You need the "owner" role to do this.']; \Validator::make([], $rules, $messages)->validate(); } - $data = $request->getAll(); + $data = $request->getAll(); $this->repository->update($linkType, $data); - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var LinkTypeTransformer $transformer */ $transformer = app(LinkTypeTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($linkType, $transformer, 'link_types'); + $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/Search/AccountController.php b/app/Api/V1/Controllers/Search/AccountController.php index 2fa471c634..98204fcef7 100644 --- a/app/Api/V1/Controllers/Search/AccountController.php +++ b/app/Api/V1/Controllers/Search/AccountController.php @@ -63,32 +63,32 @@ class AccountController extends Controller public function search(Request $request): JsonResponse|Response { app('log')->debug('Now in account search()'); - $manager = $this->getManager(); - $query = trim((string)$request->get('query')); - $field = trim((string)$request->get('field')); - $type = $request->get('type') ?? 'all'; + $manager = $this->getManager(); + $query = trim((string)$request->get('query')); + $field = trim((string)$request->get('field')); + $type = $request->get('type') ?? 'all'; if ('' === $query || !in_array($field, $this->validFields, true)) { return response(null, 422); } - $types = $this->mapAccountTypes($type); + $types = $this->mapAccountTypes($type); /** @var AccountSearch $search */ - $search = app(AccountSearch::class); + $search = app(AccountSearch::class); $search->setUser(auth()->user()); $search->setTypes($types); $search->setField($field); $search->setQuery($query); - $accounts = $search->search(); + $accounts = $search->search(); /** @var AccountTransformer $transformer */ $transformer = app(AccountTransformer::class); $transformer->setParameters($this->parameters); - $count = $accounts->count(); - $perPage = 0 === $count ? 1 : $count; - $paginator = new LengthAwarePaginator($accounts, $count, $perPage, 1); + $count = $accounts->count(); + $perPage = 0 === $count ? 1 : $count; + $paginator = new LengthAwarePaginator($accounts, $count, $perPage, 1); - $resource = new FractalCollection($accounts, $transformer, 'accounts'); + $resource = new FractalCollection($accounts, $transformer, 'accounts'); $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/Search/TransactionController.php b/app/Api/V1/Controllers/Search/TransactionController.php index 4930cc1689..962a454253 100644 --- a/app/Api/V1/Controllers/Search/TransactionController.php +++ b/app/Api/V1/Controllers/Search/TransactionController.php @@ -46,27 +46,27 @@ class TransactionController extends Controller */ public function search(Request $request, SearchInterface $searcher): JsonResponse { - $manager = $this->getManager(); - $fullQuery = (string)$request->get('query'); - $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); - $pageSize = $this->parameters->get('limit'); + $manager = $this->getManager(); + $fullQuery = (string)$request->get('query'); + $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); + $pageSize = $this->parameters->get('limit'); $searcher->parseQuery($fullQuery); $searcher->setPage($page); $searcher->setLimit($pageSize); - $groups = $searcher->searchTransactions(); - $parameters = ['search' => $fullQuery]; - $url = route('api.v1.search.transactions').'?'.http_build_query($parameters); + $groups = $searcher->searchTransactions(); + $parameters = ['search' => $fullQuery]; + $url = route('api.v1.search.transactions').'?'.http_build_query($parameters); $groups->setPath($url); $transactions = $groups->getCollection(); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Collection($transactions, $transformer, 'transactions'); + $resource = new Collection($transactions, $transformer, 'transactions'); $resource->setPaginator(new IlluminatePaginatorAdapter($groups)); - $array = $manager->createData($resource)->toArray(); + $array = $manager->createData($resource)->toArray(); return response()->json($array)->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 7c9c6014be..965aaf4343 100644 --- a/app/Api/V1/Controllers/Summary/BasicController.php +++ b/app/Api/V1/Controllers/Summary/BasicController.php @@ -91,10 +91,10 @@ class BasicController extends Controller public function basic(DateRequest $request): JsonResponse { // parameters for boxes: - $dates = $request->getAll(); - $start = $dates['start']; - $end = $dates['end']; - $code = $request->get('currency_code'); + $dates = $request->getAll(); + $start = $dates['start']; + $end = $dates['end']; + $code = $request->get('currency_code'); // balance information: $balanceData = $this->getBalanceInformation($start, $end); @@ -105,10 +105,10 @@ class BasicController extends Controller // $billData = []; // $spentData = []; // $netWorthData = []; - $total = array_merge($balanceData, $billData, $spentData, $netWorthData); + $total = array_merge($balanceData, $billData, $spentData, $netWorthData); // give new keys - $return = []; + $return = []; foreach ($total as $entry) { if (null === $code || ($code === $entry['currency_code'])) { $return[$entry['key']] = $entry; @@ -138,17 +138,17 @@ class BasicController extends Controller private function getBalanceInformation(Carbon $start, Carbon $end): array { // prep some arrays: - $incomes = []; - $expenses = []; - $sums = []; - $return = []; + $incomes = []; + $expenses = []; + $sums = []; + $return = []; // collect income of user using the new group collector. /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); $collector->setRange($start, $end)->setPage($this->parameters->get('page'))->setTypes([TransactionType::DEPOSIT]); - $set = $collector->getExtractedJournals(); + $set = $collector->getExtractedJournals(); /** @var array $transactionJournal */ foreach ($set as $transactionJournal) { @@ -166,7 +166,7 @@ class BasicController extends Controller /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); $collector->setRange($start, $end)->setPage($this->parameters->get('page'))->setTypes([TransactionType::WITHDRAWAL]); - $set = $collector->getExtractedJournals(); + $set = $collector->getExtractedJournals(); /** @var array $transactionJournal */ foreach ($set as $transactionJournal) { @@ -178,7 +178,7 @@ class BasicController extends Controller } // format amounts: - $keys = array_keys($sums); + $keys = array_keys($sums); foreach ($keys as $currencyId) { $currency = $this->currencyRepos->find($currencyId); if (null === $currency) { @@ -237,7 +237,7 @@ class BasicController extends Controller $paidAmount = $this->billRepository->sumPaidInRange($start, $end); $unpaidAmount = $this->billRepository->sumUnpaidInRange($start, $end); - $return = []; + $return = []; /** * @var array $info @@ -298,13 +298,13 @@ class BasicController extends Controller $spentInCurrency = $row['sum']; $leftToSpend = bcadd($amount, $spentInCurrency); - $days = $today->diffInDays($end) + 1; - $perDay = '0'; + $days = $today->diffInDays($end) + 1; + $perDay = '0'; if (0 !== $days && bccomp($leftToSpend, '0') > -1) { $perDay = bcdiv($leftToSpend, (string) $days); } - $return[] = [ + $return[] = [ 'key' => sprintf('left-to-spend-in-%s', $row['currency_code']), 'title' => trans('firefly.box_left_to_spend_in_currency', ['currency' => $row['currency_symbol']]), 'monetary_value' => $leftToSpend, @@ -329,8 +329,8 @@ class BasicController extends Controller private function getNetWorthInfo(Carbon $start, Carbon $end): array { /** @var User $user */ - $user = auth()->user(); - $date = today(config('app.timezone'))->startOfDay(); + $user = auth()->user(); + $date = today(config('app.timezone'))->startOfDay(); // start and end in the future? use $end if ($this->notInDateRange($date, $start, $end)) { /** @var Carbon $date */ @@ -340,12 +340,12 @@ class BasicController extends Controller /** @var NetWorthInterface $netWorthHelper */ $netWorthHelper = app(NetWorthInterface::class); $netWorthHelper->setUser($user); - $allAccounts = $this->accountRepository->getActiveAccountsByType( + $allAccounts = $this->accountRepository->getActiveAccountsByType( [AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::DEBT] ); // filter list on preference of being included. - $filtered = $allAccounts->filter( + $filtered = $allAccounts->filter( function (Account $account) { $includeNetWorth = $this->accountRepository->getMetaValue($account, 'include_net_worth'); @@ -353,13 +353,13 @@ class BasicController extends Controller } ); - $netWorthSet = $netWorthHelper->byAccounts($filtered, $date); - $return = []; + $netWorthSet = $netWorthHelper->byAccounts($filtered, $date); + $return = []; foreach ($netWorthSet as $key => $data) { if ('native' === $key) { continue; } - $amount = $data['balance']; + $amount = $data['balance']; if (0 === bccomp($amount, '0')) { continue; } diff --git a/app/Api/V1/Controllers/System/AboutController.php b/app/Api/V1/Controllers/System/AboutController.php index 20259be481..0b1bb117a9 100644 --- a/app/Api/V1/Controllers/System/AboutController.php +++ b/app/Api/V1/Controllers/System/AboutController.php @@ -69,13 +69,13 @@ class AboutController extends Controller */ public function user(): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var UserTransformer $transformer */ $transformer = app(UserTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item(auth()->user(), $transformer, 'users'); + $resource = new Item(auth()->user(), $transformer, 'users'); return response()->api($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/System/ConfigurationController.php b/app/Api/V1/Controllers/System/ConfigurationController.php index 7b03eeb8b0..7eed5ba624 100644 --- a/app/Api/V1/Controllers/System/ConfigurationController.php +++ b/app/Api/V1/Controllers/System/ConfigurationController.php @@ -125,7 +125,7 @@ class ConfigurationController extends Controller */ public function update(UpdateRequest $request, string $name): JsonResponse { - $rules = ['value' => 'required']; + $rules = ['value' => 'required']; if (!$this->repository->hasRole(auth()->user(), 'owner')) { $messages = ['value' => '200005: You need the "owner" role to do this.']; \Validator::make([], $rules, $messages)->validate(); diff --git a/app/Api/V1/Controllers/System/CronController.php b/app/Api/V1/Controllers/System/CronController.php index 247ed97bf0..397e579ecb 100644 --- a/app/Api/V1/Controllers/System/CronController.php +++ b/app/Api/V1/Controllers/System/CronController.php @@ -41,7 +41,7 @@ class CronController extends Controller */ public function cron(CronRequest $request): JsonResponse { - $config = $request->getAll(); + $config = $request->getAll(); app('log')->debug(sprintf('Now in %s', __METHOD__)); app('log')->debug(sprintf('Date is %s', $config['date']->toIsoString())); @@ -51,7 +51,7 @@ class CronController extends Controller if (true === config('cer.download_enabled')) { $return['exchange_rates'] = $this->exchangeRatesCronJob($config['force'], $config['date']); } - $return['bill_warnings'] = $this->billWarningCronJob($config['force'], $config['date']); + $return['bill_warnings'] = $this->billWarningCronJob($config['force'], $config['date']); return response()->json($return); } diff --git a/app/Api/V1/Controllers/System/UserController.php b/app/Api/V1/Controllers/System/UserController.php index 31a5b98881..b650b2d3c2 100644 --- a/app/Api/V1/Controllers/System/UserController.php +++ b/app/Api/V1/Controllers/System/UserController.php @@ -95,16 +95,16 @@ class UserController extends Controller public function index(): JsonResponse { // user preferences - $pageSize = $this->parameters->get('limit'); - $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $manager = $this->getManager(); // build collection - $collection = $this->repository->all(); - $count = $collection->count(); - $users = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $collection = $this->repository->all(); + $count = $collection->count(); + $users = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($users, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($users, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.users.index').$this->buildParams()); // make resource @@ -112,7 +112,7 @@ class UserController extends Controller $transformer = app(UserTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($users, $transformer, 'users'); + $resource = new FractalCollection($users, $transformer, 'users'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -127,14 +127,14 @@ class UserController extends Controller public function show(User $user): JsonResponse { // make manager - $manager = $this->getManager(); + $manager = $this->getManager(); // make resource /** @var UserTransformer $transformer */ $transformer = app(UserTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($user, $transformer, 'users'); + $resource = new Item($user, $transformer, 'users'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } @@ -147,9 +147,9 @@ class UserController extends Controller */ public function store(UserStoreRequest $request): JsonResponse { - $data = $request->getAll(); - $user = $this->repository->store($data); - $manager = $this->getManager(); + $data = $request->getAll(); + $user = $this->repository->store($data); + $manager = $this->getManager(); // make resource @@ -157,7 +157,7 @@ class UserController extends Controller $transformer = app(UserTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($user, $transformer, 'users'); + $resource = new Item($user, $transformer, 'users'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } @@ -170,7 +170,7 @@ class UserController extends Controller */ public function update(UserUpdateRequest $request, User $user): JsonResponse { - $data = $request->getAll(); + $data = $request->getAll(); // can only update 'blocked' when user is admin. if (!$this->repository->hasRole(auth()->user(), 'owner')) { @@ -178,15 +178,15 @@ class UserController extends Controller unset($data['blocked'], $data['blocked_code']); } - $user = $this->repository->update($user, $data); - $manager = $this->getManager(); + $user = $this->repository->update($user, $data); + $manager = $this->getManager(); // make resource /** @var UserTransformer $transformer */ $transformer = app(UserTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($user, $transformer, 'users'); + $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 b4b72f1fa7..ca61956772 100644 --- a/app/Api/V1/Controllers/User/PreferencesController.php +++ b/app/Api/V1/Controllers/User/PreferencesController.php @@ -61,14 +61,14 @@ class PreferencesController extends Controller $preferences = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($preferences, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($preferences, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.preferences.index').$this->buildParams()); /** @var PreferenceTransformer $transformer */ $transformer = app(PreferenceTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($preferences, $transformer, self::RESOURCE_KEY); + $resource = new FractalCollection($preferences, $transformer, self::RESOURCE_KEY); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -82,13 +82,13 @@ class PreferencesController extends Controller */ public function show(Preference $preference): JsonResponse { - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var PreferenceTransformer $transformer */ $transformer = app(PreferenceTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($preference, $transformer, 'preferences'); + $resource = new Item($preference, $transformer, 'preferences'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } @@ -101,15 +101,15 @@ class PreferencesController extends Controller */ public function store(PreferenceStoreRequest $request): JsonResponse { - $manager = $this->getManager(); - $data = $request->getAll(); - $pref = app('preferences')->set($data['name'], $data['data']); + $manager = $this->getManager(); + $data = $request->getAll(); + $pref = app('preferences')->set($data['name'], $data['data']); /** @var PreferenceTransformer $transformer */ $transformer = app(PreferenceTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($pref, $transformer, 'preferences'); + $resource = new Item($pref, $transformer, 'preferences'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } @@ -122,15 +122,15 @@ class PreferencesController extends Controller */ public function update(PreferenceUpdateRequest $request, Preference $preference): JsonResponse { - $manager = $this->getManager(); - $data = $request->getAll(); - $pref = app('preferences')->set($preference->name, $data['data']); + $manager = $this->getManager(); + $data = $request->getAll(); + $pref = app('preferences')->set($preference->name, $data['data']); /** @var PreferenceTransformer $transformer */ $transformer = app(PreferenceTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($pref, $transformer, 'preferences'); + $resource = new Item($pref, $transformer, 'preferences'); 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 d8e0346937..59c3f352ec 100644 --- a/app/Api/V1/Controllers/Webhook/AttemptController.php +++ b/app/Api/V1/Controllers/Webhook/AttemptController.php @@ -77,21 +77,21 @@ class AttemptController extends Controller } Log::channel('audit')->info(sprintf('User lists webhook attempts of webhook #%d and message #%d.', $webhook->id, $message->id)); - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); - $collection = $this->repository->getAttempts($message); - $count = $collection->count(); - $attempts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $collection = $this->repository->getAttempts($message); + $count = $collection->count(); + $attempts = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($attempts, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($attempts, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.webhooks.attempts.index', [$webhook->id, $message->id]).$this->buildParams()); /** @var WebhookAttemptTransformer $transformer */ $transformer = app(WebhookAttemptTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($attempts, $transformer, 'webhook_attempts'); + $resource = new FractalCollection($attempts, $transformer, 'webhook_attempts'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -122,12 +122,12 @@ class AttemptController extends Controller Log::channel('audit')->info(sprintf('User views single webhook attempt #%d of webhook #%d and message #%d.', $attempt->id, $webhook->id, $message->id)); - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var WebhookAttemptTransformer $transformer */ $transformer = app(WebhookAttemptTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($attempt, $transformer, self::RESOURCE_KEY); + $resource = new Item($attempt, $transformer, self::RESOURCE_KEY); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/Webhook/MessageController.php b/app/Api/V1/Controllers/Webhook/MessageController.php index e175b4cd4c..36d390cf26 100644 --- a/app/Api/V1/Controllers/Webhook/MessageController.php +++ b/app/Api/V1/Controllers/Webhook/MessageController.php @@ -72,22 +72,22 @@ class MessageController extends Controller throw new NotFoundHttpException('Webhooks are not enabled.'); } Log::channel('audit')->info(sprintf('User views messages of webhook #%d.', $webhook->id)); - $manager = $this->getManager(); - $pageSize = $this->parameters->get('limit'); - $collection = $this->repository->getMessages($webhook); + $manager = $this->getManager(); + $pageSize = $this->parameters->get('limit'); + $collection = $this->repository->getMessages($webhook); - $count = $collection->count(); - $messages = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $count = $collection->count(); + $messages = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($messages, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($messages, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.webhooks.messages.index', [$webhook->id]).$this->buildParams()); /** @var WebhookMessageTransformer $transformer */ $transformer = app(WebhookMessageTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($messages, $transformer, 'webhook_messages'); + $resource = new FractalCollection($messages, $transformer, 'webhook_messages'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -114,12 +114,12 @@ class MessageController extends Controller Log::channel('audit')->info(sprintf('User views message #%d of webhook #%d.', $message->id, $webhook->id)); - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var WebhookMessageTransformer $transformer */ $transformer = app(WebhookMessageTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($message, $transformer, self::RESOURCE_KEY); + $resource = new Item($message, $transformer, self::RESOURCE_KEY); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/Webhook/ShowController.php b/app/Api/V1/Controllers/Webhook/ShowController.php index 51420700ed..181da6cdf5 100644 --- a/app/Api/V1/Controllers/Webhook/ShowController.php +++ b/app/Api/V1/Controllers/Webhook/ShowController.php @@ -78,21 +78,21 @@ class ShowController extends Controller } Log::channel('audit')->info('User views all webhooks.'); - $manager = $this->getManager(); - $collection = $this->repository->all(); - $pageSize = $this->parameters->get('limit'); - $count = $collection->count(); - $webhooks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); + $manager = $this->getManager(); + $collection = $this->repository->all(); + $pageSize = $this->parameters->get('limit'); + $count = $collection->count(); + $webhooks = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); // make paginator: - $paginator = new LengthAwarePaginator($webhooks, $count, $pageSize, $this->parameters->get('page')); + $paginator = new LengthAwarePaginator($webhooks, $count, $pageSize, $this->parameters->get('page')); $paginator->setPath(route('api.v1.webhooks.index').$this->buildParams()); /** @var WebhookTransformer $transformer */ $transformer = app(WebhookTransformer::class); $transformer->setParameters($this->parameters); - $resource = new FractalCollection($webhooks, $transformer, self::RESOURCE_KEY); + $resource = new FractalCollection($webhooks, $transformer, self::RESOURCE_KEY); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -113,12 +113,12 @@ class ShowController extends Controller } Log::channel('audit')->info(sprintf('User views webhook #%d.', $webhook->id)); - $manager = $this->getManager(); + $manager = $this->getManager(); /** @var WebhookTransformer $transformer */ $transformer = app(WebhookTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($webhook, $transformer, self::RESOURCE_KEY); + $resource = new Item($webhook, $transformer, self::RESOURCE_KEY); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Controllers/Webhook/StoreController.php b/app/Api/V1/Controllers/Webhook/StoreController.php index 9d11cdeeb3..d9f3e6d2bf 100644 --- a/app/Api/V1/Controllers/Webhook/StoreController.php +++ b/app/Api/V1/Controllers/Webhook/StoreController.php @@ -59,15 +59,15 @@ class StoreController extends Controller */ public function store(CreateRequest $request): JsonResponse { - $data = $request->getData(); + $data = $request->getData(); if(false === config('firefly.allow_webhooks')) { Log::channel('audit')->info('User tries to store new webhook, but webhooks are DISABLED.', $data); throw new NotFoundHttpException('Webhooks are not enabled.'); } - $webhook = $this->repository->store($data); - $manager = $this->getManager(); + $webhook = $this->repository->store($data); + $manager = $this->getManager(); Log::channel('audit')->info('User stores new webhook', $data); @@ -75,7 +75,7 @@ class StoreController extends Controller $transformer = app(WebhookTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($webhook, $transformer, 'webhooks'); + $resource = new Item($webhook, $transformer, 'webhooks'); 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 2131b14bb8..974dc4d2cc 100644 --- a/app/Api/V1/Controllers/Webhook/UpdateController.php +++ b/app/Api/V1/Controllers/Webhook/UpdateController.php @@ -59,15 +59,15 @@ class UpdateController extends Controller */ public function update(Webhook $webhook, UpdateRequest $request): JsonResponse { - $data = $request->getData(); + $data = $request->getData(); if(false === config('firefly.allow_webhooks')) { Log::channel('audit')->info(sprintf('User tries to update webhook #%d, but webhooks are DISABLED.', $webhook->id), $data); throw new NotFoundHttpException('Webhooks are not enabled.'); } - $webhook = $this->repository->update($webhook, $data); - $manager = $this->getManager(); + $webhook = $this->repository->update($webhook, $data); + $manager = $this->getManager(); Log::channel('audit')->info(sprintf('User updates webhook #%d', $webhook->id), $data); @@ -75,7 +75,7 @@ class UpdateController extends Controller $transformer = app(WebhookTransformer::class); $transformer->setParameters($this->parameters); - $resource = new Item($webhook, $transformer, 'webhooks'); + $resource = new Item($webhook, $transformer, 'webhooks'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); } diff --git a/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php b/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php index bcd0cb019c..b5c5fd9240 100644 --- a/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php +++ b/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php @@ -78,11 +78,11 @@ class MoveTransactionsRequest extends FormRequest private function validateMove(Validator $validator): void { - $data = $validator->getData(); - $repository = app(AccountRepositoryInterface::class); + $data = $validator->getData(); + $repository = app(AccountRepositoryInterface::class); $repository->setUser(auth()->user()); - $original = $repository->find((int)$data['original_account']); - $destination = $repository->find((int)$data['destination_account']); + $original = $repository->find((int)$data['original_account']); + $destination = $repository->find((int)$data['destination_account']); // not the same type: if ($original->accountType->type !== $destination->accountType->type) { diff --git a/app/Api/V1/Requests/Data/DateRequest.php b/app/Api/V1/Requests/Data/DateRequest.php index a739f31f63..9ae462409a 100644 --- a/app/Api/V1/Requests/Data/DateRequest.php +++ b/app/Api/V1/Requests/Data/DateRequest.php @@ -45,7 +45,7 @@ class DateRequest extends FormRequest public function getAll(): array { $start = $this->getCarbonDate('start'); - $end = $this->getCarbonDate('end'); + $end = $this->getCarbonDate('end'); if($start->diffInYears($end) > 5) { throw new FireflyException('Date range out of range.'); } diff --git a/app/Api/V1/Requests/Data/Export/ExportRequest.php b/app/Api/V1/Requests/Data/Export/ExportRequest.php index 8016e94209..60b6ecab29 100644 --- a/app/Api/V1/Requests/Data/Export/ExportRequest.php +++ b/app/Api/V1/Requests/Data/Export/ExportRequest.php @@ -40,16 +40,16 @@ class ExportRequest extends FormRequest public function getAll(): array { - $result = [ + $result = [ 'start' => $this->getCarbonDate('start') ?? today(config('app.timezone'))->subYear(), 'end' => $this->getCarbonDate('end') ?? today(config('app.timezone')), 'type' => $this->convertString('type'), ]; - $parts = explode(',', $this->convertString('accounts')); - $repository = app(AccountRepositoryInterface::class); + $parts = explode(',', $this->convertString('accounts')); + $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 e822c2143c..45e4a6d6df 100644 --- a/app/Api/V1/Requests/Insight/GenericRequest.php +++ b/app/Api/V1/Requests/Insight/GenericRequest.php @@ -179,7 +179,7 @@ class GenericRequest extends FormRequest } $repository = app(AccountRepositoryInterface::class); $repository->setUser(auth()->user()); - $array = $this->get('accounts'); + $array = $this->get('accounts'); if (is_array($array)) { foreach ($array as $accountId) { $accountId = (int)$accountId; @@ -198,7 +198,7 @@ class GenericRequest extends FormRequest } $repository = app(BillRepositoryInterface::class); $repository->setUser(auth()->user()); - $array = $this->get('bills'); + $array = $this->get('bills'); if (is_array($array)) { foreach ($array as $billId) { $billId = (int)$billId; @@ -217,7 +217,7 @@ class GenericRequest extends FormRequest } $repository = app(BudgetRepositoryInterface::class); $repository->setUser(auth()->user()); - $array = $this->get('budgets'); + $array = $this->get('budgets'); if (is_array($array)) { foreach ($array as $budgetId) { $budgetId = (int)$budgetId; @@ -236,7 +236,7 @@ class GenericRequest extends FormRequest } $repository = app(CategoryRepositoryInterface::class); $repository->setUser(auth()->user()); - $array = $this->get('categories'); + $array = $this->get('categories'); if (is_array($array)) { foreach ($array as $categoryId) { $categoryId = (int)$categoryId; @@ -255,7 +255,7 @@ class GenericRequest extends FormRequest } $repository = app(TagRepositoryInterface::class); $repository->setUser(auth()->user()); - $array = $this->get('tags'); + $array = $this->get('tags'); if (is_array($array)) { foreach ($array as $tagId) { $tagId = (int)$tagId; diff --git a/app/Api/V1/Requests/Models/Account/StoreRequest.php b/app/Api/V1/Requests/Models/Account/StoreRequest.php index 64de772905..50a76d70e8 100644 --- a/app/Api/V1/Requests/Models/Account/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Account/StoreRequest.php @@ -52,7 +52,7 @@ class StoreRequest extends FormRequest if (null !== $this->get('include_net_worth')) { $includeNetWorth = $this->boolean('include_net_worth'); } - $data = [ + $data = [ 'name' => $this->convertString('name'), 'active' => $active, 'include_net_worth' => $includeNetWorth, @@ -75,7 +75,7 @@ class StoreRequest extends FormRequest 'interest_period' => $this->convertString('interest_period'), ]; // append location information. - $data = $this->appendLocationData($data, null); + $data = $this->appendLocationData($data, null); if ('liability' === $data['account_type_name'] || 'liabilities' === $data['account_type_name']) { $data['account_type_name'] = $this->convertString('liability_type'); diff --git a/app/Api/V1/Requests/Models/Account/UpdateRequest.php b/app/Api/V1/Requests/Models/Account/UpdateRequest.php index 211c968944..ff2ddc8c7f 100644 --- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php @@ -86,7 +86,7 @@ class UpdateRequest extends FormRequest $types = implode(',', array_keys(config('firefly.subTitlesByIdentifier'))); $ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes'))); - $rules = [ + $rules = [ 'name' => sprintf('min:1|max:1024|uniqueAccountForUser:%d', $account->id), 'type' => sprintf('in:%s', $types), 'iban' => ['iban', 'nullable', new UniqueIban($account, $this->convertString('type'))], diff --git a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php index d1c9bbc3ee..00cc6273ee 100644 --- a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php @@ -77,19 +77,19 @@ class StoreRequest extends FormRequest public function rules(): array { return [ - 'type' => 'required|in:withdrawal,transfer,deposit', - 'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title', - 'description' => 'between:1,65000', - 'first_date' => 'required|date', - 'apply_rules' => [new IsBoolean()], - 'active' => [new IsBoolean()], - 'repeat_until' => 'nullable|date', - 'nr_of_repetitions' => 'nullable|numeric|between:1,31', + 'type' => 'required|in:withdrawal,transfer,deposit', + 'title' => 'required|between:1,255|uniqueObjectForUser:recurrences,title', + 'description' => 'between:1,65000', + 'first_date' => 'required|date', + 'apply_rules' => [new IsBoolean()], + 'active' => [new IsBoolean()], + 'repeat_until' => 'nullable|date', + 'nr_of_repetitions' => 'nullable|numeric|between:1,31', - 'repetitions.*.type' => 'required|in:daily,weekly,ndom,monthly,yearly', - 'repetitions.*.moment' => 'between:0,10', - 'repetitions.*.skip' => 'nullable|numeric|between:0,31', - 'repetitions.*.weekend' => 'numeric|min:1|max:4', + 'repetitions.*.type' => 'required|in:daily,weekly,ndom,monthly,yearly', + 'repetitions.*.moment' => 'between:0,10', + 'repetitions.*.skip' => 'nullable|numeric|between:0,31', + 'repetitions.*.weekend' => 'numeric|min:1|max:4', 'transactions.*.description' => 'required|between:1,255', 'transactions.*.amount' => 'required|numeric|gt:0|max:1000000000', @@ -138,7 +138,7 @@ class StoreRequest extends FormRequest */ private function getTransactionData(): array { - $return = []; + $return = []; // transaction data: /** @var null|array $transactions */ @@ -160,7 +160,7 @@ class StoreRequest extends FormRequest */ private function getRepetitionData(): array { - $return = []; + $return = []; // repetition data: /** @var null|array $repetitions */ @@ -171,7 +171,7 @@ class StoreRequest extends FormRequest /** @var array $repetition */ foreach ($repetitions as $repetition) { - $current = []; + $current = []; if (array_key_exists('type', $repetition)) { $current['type'] = $repetition['type']; } diff --git a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php index 80a18cb21d..6efb5f0699 100644 --- a/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php @@ -53,7 +53,7 @@ class UpdateRequest extends FormRequest public function getAll(): array { // this is the way: - $fields = [ + $fields = [ 'title' => ['title', 'convertString'], 'description' => ['description', 'convertString'], 'first_date' => ['first_date', 'convertDateTime'], @@ -63,9 +63,9 @@ class UpdateRequest extends FormRequest 'active' => ['active', 'boolean'], 'notes' => ['notes', 'convertString'], ]; - $reps = $this->getRepetitionData(); - $transactions = $this->getTransactionData(); - $return = [ + $reps = $this->getRepetitionData(); + $transactions = $this->getTransactionData(); + $return = [ 'recurrence' => $this->getAllData($fields), ]; if (null !== $reps) { @@ -85,18 +85,18 @@ class UpdateRequest extends FormRequest $recurrence = $this->route()->parameter('recurrence'); return [ - '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()], - 'repeat_until' => 'nullable|date', - 'nr_of_repetitions' => 'nullable|numeric|between:1,31', + '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()], + 'repeat_until' => 'nullable|date', + 'nr_of_repetitions' => 'nullable|numeric|between:1,31', - 'repetitions.*.type' => 'in:daily,weekly,ndom,monthly,yearly', - 'repetitions.*.moment' => 'between:0,10', - 'repetitions.*.skip' => 'nullable|numeric|between:0,31', - 'repetitions.*.weekend' => 'nullable|numeric|min:1|max:4', + 'repetitions.*.type' => 'in:daily,weekly,ndom,monthly,yearly', + 'repetitions.*.moment' => 'between:0,10', + 'repetitions.*.skip' => 'nullable|numeric|between:0,31', + 'repetitions.*.weekend' => 'nullable|numeric|min:1|max:4', 'transactions.*.description' => 'between:1,255', 'transactions.*.amount' => 'numeric|gt:0|max:1000000000', @@ -147,7 +147,7 @@ class UpdateRequest extends FormRequest */ private function getRepetitionData(): ?array { - $return = []; + $return = []; // repetition data: /** @var null|array $repetitions */ @@ -158,7 +158,7 @@ class UpdateRequest extends FormRequest /** @var array $repetition */ foreach ($repetitions as $repetition) { - $current = []; + $current = []; if (array_key_exists('type', $repetition)) { $current['type'] = $repetition['type']; } @@ -189,7 +189,7 @@ class UpdateRequest extends FormRequest */ private function getTransactionData(): array { - $return = []; + $return = []; // transaction data: /** @var null|array $transactions */ diff --git a/app/Api/V1/Requests/Models/Rule/StoreRequest.php b/app/Api/V1/Requests/Models/Rule/StoreRequest.php index bd74fc0ade..a00485d6a1 100644 --- a/app/Api/V1/Requests/Models/Rule/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Rule/StoreRequest.php @@ -44,7 +44,7 @@ class StoreRequest extends FormRequest */ public function getAll(): array { - $fields = [ + $fields = [ 'title' => ['title', 'convertString'], 'description' => ['description', 'convertString'], 'rule_group_id' => ['rule_group_id', 'convertInteger'], @@ -55,7 +55,7 @@ class StoreRequest extends FormRequest 'stop_processing' => ['stop_processing', 'boolean'], 'active' => ['active', 'boolean'], ]; - $data = $this->getAllData($fields); + $data = $this->getAllData($fields); $data['triggers'] = $this->getRuleTriggers(); $data['actions'] = $this->getRuleActions(); @@ -68,8 +68,8 @@ class StoreRequest extends FormRequest */ public function rules(): array { - $validTriggers = $this->getTriggers(); - $validActions = array_keys(config('firefly.rule-actions')); + $validTriggers = $this->getTriggers(); + $validActions = array_keys(config('firefly.rule-actions')); // some triggers and actions require text: $contextTriggers = implode(',', $this->getTriggersWithContext()); @@ -141,10 +141,10 @@ class StoreRequest extends FormRequest */ protected function atLeastOneActiveTrigger(Validator $validator): void { - $data = $validator->getData(); + $data = $validator->getData(); /** @var null|array|int|string $triggers */ - $triggers = $data['triggers'] ?? []; + $triggers = $data['triggers'] ?? []; // need at least one trigger if (!is_countable($triggers) || 0 === count($triggers)) { return; @@ -170,10 +170,10 @@ class StoreRequest extends FormRequest */ protected function atLeastOneActiveAction(Validator $validator): void { - $data = $validator->getData(); + $data = $validator->getData(); /** @var null|array|int|string $actions */ - $actions = $data['actions'] ?? []; + $actions = $data['actions'] ?? []; // need at least one trigger if (!is_countable($actions) || 0 === count($actions)) { return; diff --git a/app/Api/V1/Requests/Models/Rule/TestRequest.php b/app/Api/V1/Requests/Models/Rule/TestRequest.php index 87598bfa01..e8c466235f 100644 --- a/app/Api/V1/Requests/Models/Rule/TestRequest.php +++ b/app/Api/V1/Requests/Models/Rule/TestRequest.php @@ -64,7 +64,7 @@ class TestRequest extends FormRequest private function getDate(string $field): ?Carbon { - $value = $this->query($field); + $value = $this->query($field); if (is_array($value)) { return null; } diff --git a/app/Api/V1/Requests/Models/Rule/TriggerRequest.php b/app/Api/V1/Requests/Models/Rule/TriggerRequest.php index 3e60816fe6..0fc38b0e96 100644 --- a/app/Api/V1/Requests/Models/Rule/TriggerRequest.php +++ b/app/Api/V1/Requests/Models/Rule/TriggerRequest.php @@ -58,7 +58,7 @@ class TriggerRequest extends FormRequest private function getDate(string $field): ?Carbon { - $value = $this->query($field); + $value = $this->query($field); if (is_array($value)) { return null; } diff --git a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php index 4b033dc014..acdd8d120b 100644 --- a/app/Api/V1/Requests/Models/Rule/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Rule/UpdateRequest.php @@ -45,7 +45,7 @@ class UpdateRequest extends FormRequest */ public function getAll(): array { - $fields = [ + $fields = [ 'title' => ['title', 'convertString'], 'description' => ['description', 'stringWithNewlines'], 'rule_group_id' => ['rule_group_id', 'convertInteger'], @@ -74,11 +74,11 @@ class UpdateRequest extends FormRequest */ public function rules(): array { - $validTriggers = $this->getTriggers(); - $validActions = array_keys(config('firefly.rule-actions')); + $validTriggers = $this->getTriggers(); + $validActions = array_keys(config('firefly.rule-actions')); /** @var Rule $rule */ - $rule = $this->route()->parameter('rule'); + $rule = $this->route()->parameter('rule'); // some triggers and actions require text: $contextTriggers = implode(',', $this->getTriggersWithContext()); diff --git a/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php b/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php index 31a48da49f..b8d125780c 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php @@ -58,7 +58,7 @@ class TestRequest extends FormRequest private function getDate(string $field): ?Carbon { - $value = $this->query($field); + $value = $this->query($field); if (is_array($value)) { return null; } diff --git a/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php b/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php index 830e2145ca..2896495d6d 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php @@ -56,7 +56,7 @@ class TriggerRequest extends FormRequest private function getDate(string $field): ?Carbon { - $value = $this->query($field); + $value = $this->query($field); if (is_array($value)) { return null; } diff --git a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php index 62c011bc08..b0516fc8d7 100644 --- a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php @@ -62,7 +62,7 @@ class UpdateRequest extends FormRequest public function rules(): array { /** @var Tag $tag */ - $tag = $this->route()->parameter('tagOrId'); + $tag = $this->route()->parameter('tagOrId'); // TODO check if uniqueObjectForUser is obsolete $rules = [ 'tag' => 'min:1|max:1024|uniqueObjectForUser:tags,tag,'.$tag->id, diff --git a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php index d6fe2c6bce..0a5127aedc 100644 --- a/app/Api/V1/Requests/Models/Transaction/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/StoreRequest.php @@ -76,82 +76,82 @@ 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()], + 'group_title' => 'between:1,1000|nullable', + '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.*.order' => 'numeric|min:0', + 'transactions.*.type' => 'required|in:withdrawal,deposit,transfer,opening-balance,reconciliation', + 'transactions.*.date' => ['required', new IsDateOrTime()], + 'transactions.*.order' => 'numeric|min:0', // currency info - 'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id|nullable', - 'transactions.*.currency_code' => 'min:3|max:51|exists:transaction_currencies,code|nullable', - 'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id|nullable', - 'transactions.*.foreign_currency_code' => 'min:3|max:51|exists:transaction_currencies,code|nullable', + 'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id|nullable', + 'transactions.*.currency_code' => 'min:3|max:51|exists:transaction_currencies,code|nullable', + 'transactions.*.foreign_currency_id' => 'numeric|exists:transaction_currencies,id|nullable', + 'transactions.*.foreign_currency_code' => 'min:3|max:51|exists:transaction_currencies,code|nullable', // amount - 'transactions.*.amount' => 'required|numeric|gt:0|max:1000000000', - 'transactions.*.foreign_amount' => 'numeric|max:1000000000|gt:0|', + 'transactions.*.amount' => 'required|numeric|gt:0|max:1000000000', + 'transactions.*.foreign_amount' => 'numeric|max:1000000000|gt:0|', // description - 'transactions.*.description' => 'nullable|between:1,1000', + 'transactions.*.description' => 'nullable|between:1,1000', // source of transaction - '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', + '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_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', + '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.*.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.*.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()], // other interesting fields - 'transactions.*.reconciled' => [new IsBoolean()], - 'transactions.*.notes' => 'min:1|max:50000|nullable', - 'transactions.*.tags' => 'between:0,255', + 'transactions.*.reconciled' => [new IsBoolean()], + 'transactions.*.notes' => 'min:1|max:50000|nullable', + 'transactions.*.tags' => 'between:0,255', 'transactions.*.tags.*' => 'between:0,255', // meta info fields - 'transactions.*.internal_reference' => 'min:1|max:255|nullable', - 'transactions.*.external_id' => 'min:1|max:255|nullable', - 'transactions.*.recurrence_id' => 'min:1|max:255|nullable', - 'transactions.*.bunq_payment_id' => 'min:1|max:255|nullable', - 'transactions.*.external_url' => sprintf('min:1|max:255|nullable|url:%s', $validProtocols), + 'transactions.*.internal_reference' => 'min:1|max:255|nullable', + 'transactions.*.external_id' => 'min:1|max:255|nullable', + 'transactions.*.recurrence_id' => 'min:1|max:255|nullable', + 'transactions.*.bunq_payment_id' => 'min:1|max:255|nullable', + 'transactions.*.external_url' => sprintf('min:1|max:255|nullable|url:%s', $validProtocols), // SEPA fields: - 'transactions.*.sepa_cc' => 'min:1|max:255|nullable', - 'transactions.*.sepa_ct_op' => 'min:1|max:255|nullable', - 'transactions.*.sepa_ct_id' => 'min:1|max:255|nullable', - 'transactions.*.sepa_db' => 'min:1|max:255|nullable', - 'transactions.*.sepa_country' => 'min:1|max:255|nullable', - 'transactions.*.sepa_ep' => 'min:1|max:255|nullable', - 'transactions.*.sepa_ci' => 'min:1|max:255|nullable', - 'transactions.*.sepa_batch_id' => 'min:1|max:255|nullable', + 'transactions.*.sepa_cc' => 'min:1|max:255|nullable', + 'transactions.*.sepa_ct_op' => 'min:1|max:255|nullable', + 'transactions.*.sepa_ct_id' => 'min:1|max:255|nullable', + 'transactions.*.sepa_db' => 'min:1|max:255|nullable', + 'transactions.*.sepa_country' => 'min:1|max:255|nullable', + 'transactions.*.sepa_ep' => 'min:1|max:255|nullable', + 'transactions.*.sepa_ci' => 'min:1|max:255|nullable', + 'transactions.*.sepa_batch_id' => 'min:1|max:255|nullable', // dates - 'transactions.*.interest_date' => 'date|nullable', - 'transactions.*.book_date' => 'date|nullable', - 'transactions.*.process_date' => 'date|nullable', - 'transactions.*.due_date' => 'date|nullable', - 'transactions.*.payment_date' => 'date|nullable', - 'transactions.*.invoice_date' => 'date|nullable', + 'transactions.*.interest_date' => 'date|nullable', + 'transactions.*.book_date' => 'date|nullable', + 'transactions.*.process_date' => 'date|nullable', + 'transactions.*.due_date' => 'date|nullable', + 'transactions.*.payment_date' => 'date|nullable', + 'transactions.*.invoice_date' => 'date|nullable', ]; } @@ -204,9 +204,9 @@ class StoreRequest extends FormRequest foreach ($this->get('transactions') as $transaction) { $object = new NullArrayObject($transaction); $return[] = [ - 'type' => $this->clearString($object['type']), - 'date' => $this->dateFromValue($object['date']), - 'order' => $this->integerFromValue((string)$object['order']), + 'type' => $this->clearString($object['type']), + 'date' => $this->dateFromValue($object['date']), + 'order' => $this->integerFromValue((string)$object['order']), 'currency_id' => $this->integerFromValue((string)$object['currency_id']), 'currency_code' => $this->clearString((string)$object['currency_code']), @@ -265,21 +265,21 @@ class StoreRequest extends FormRequest 'bunq_payment_id' => $this->clearString((string)$object['bunq_payment_id']), 'external_url' => $this->clearString((string)$object['external_url']), - 'sepa_cc' => $this->clearString((string)$object['sepa_cc']), - 'sepa_ct_op' => $this->clearString((string)$object['sepa_ct_op']), - 'sepa_ct_id' => $this->clearString((string)$object['sepa_ct_id']), - 'sepa_db' => $this->clearString((string)$object['sepa_db']), - 'sepa_country' => $this->clearString((string)$object['sepa_country']), - 'sepa_ep' => $this->clearString((string)$object['sepa_ep']), - 'sepa_ci' => $this->clearString((string)$object['sepa_ci']), - 'sepa_batch_id' => $this->clearString((string)$object['sepa_batch_id']), + 'sepa_cc' => $this->clearString((string)$object['sepa_cc']), + 'sepa_ct_op' => $this->clearString((string)$object['sepa_ct_op']), + 'sepa_ct_id' => $this->clearString((string)$object['sepa_ct_id']), + 'sepa_db' => $this->clearString((string)$object['sepa_db']), + 'sepa_country' => $this->clearString((string)$object['sepa_country']), + 'sepa_ep' => $this->clearString((string)$object['sepa_ep']), + 'sepa_ci' => $this->clearString((string)$object['sepa_ci']), + 'sepa_batch_id' => $this->clearString((string)$object['sepa_batch_id']), // custom date fields. Must be Carbon objects. Presence is optional. - 'interest_date' => $this->dateFromValue($object['interest_date']), - 'book_date' => $this->dateFromValue($object['book_date']), - 'process_date' => $this->dateFromValue($object['process_date']), - 'due_date' => $this->dateFromValue($object['due_date']), - 'payment_date' => $this->dateFromValue($object['payment_date']), - 'invoice_date' => $this->dateFromValue($object['invoice_date']), + 'interest_date' => $this->dateFromValue($object['interest_date']), + 'book_date' => $this->dateFromValue($object['book_date']), + 'process_date' => $this->dateFromValue($object['process_date']), + 'due_date' => $this->dateFromValue($object['due_date']), + 'payment_date' => $this->dateFromValue($object['payment_date']), + 'invoice_date' => $this->dateFromValue($object['invoice_date']), ]; } diff --git a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php index 9e2912f5d6..501534115f 100644 --- a/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Transaction/UpdateRequest.php @@ -66,11 +66,11 @@ class UpdateRequest extends FormRequest $this->dateFields = ['date', 'interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date']; $this->textareaFields = ['notes']; // not really floats, for validation. - $this->floatFields = ['amount', 'foreign_amount']; - $this->stringFields = ['type', 'currency_code', 'foreign_currency_code', 'description', 'source_name', 'source_iban', 'source_number', 'source_bic', 'destination_name', 'destination_iban', 'destination_number', 'destination_bic', 'budget_name', 'category_name', 'bill_name', 'internal_reference', 'external_id', 'bunq_payment_id', 'sepa_cc', 'sepa_ct_op', 'sepa_ct_id', 'sepa_db', 'sepa_country', 'sepa_ep', 'sepa_ci', 'sepa_batch_id', 'external_url']; - $this->booleanFields = ['reconciled']; - $this->arrayFields = ['tags']; - $data = []; + $this->floatFields = ['amount', 'foreign_amount']; + $this->stringFields = ['type', 'currency_code', 'foreign_currency_code', 'description', 'source_name', 'source_iban', 'source_number', 'source_bic', 'destination_name', 'destination_iban', 'destination_number', 'destination_bic', 'budget_name', 'category_name', 'bill_name', 'internal_reference', 'external_id', 'bunq_payment_id', 'sepa_cc', 'sepa_ct_op', 'sepa_ct_id', 'sepa_db', 'sepa_country', 'sepa_ep', 'sepa_ci', 'sepa_batch_id', 'external_url']; + $this->booleanFields = ['reconciled']; + $this->arrayFields = ['tags']; + $data = []; if ($this->has('transactions')) { $data['transactions'] = $this->getTransactionData(); } @@ -97,76 +97,76 @@ class UpdateRequest extends FormRequest return [ // basic fields for group: - 'group_title' => 'between:1,1000|nullable', - 'apply_rules' => [new IsBoolean()], + 'group_title' => 'between:1,1000|nullable', + 'apply_rules' => [new IsBoolean()], // transaction rules (in array for splits): - 'transactions.*.type' => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation', - 'transactions.*.date' => [new IsDateOrTime()], - 'transactions.*.order' => 'numeric|min:0', + 'transactions.*.type' => 'in:withdrawal,deposit,transfer,opening-balance,reconciliation', + '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 - 'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id|nullable', - 'transactions.*.currency_code' => 'min:3|max:51|exists:transaction_currencies,code|nullable', - 'transactions.*.foreign_currency_id' => 'nullable|numeric|exists:transaction_currencies,id', - 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code', + 'transactions.*.currency_id' => 'numeric|exists:transaction_currencies,id|nullable', + 'transactions.*.currency_code' => 'min:3|max:51|exists:transaction_currencies,code|nullable', + 'transactions.*.foreign_currency_id' => 'nullable|numeric|exists:transaction_currencies,id', + 'transactions.*.foreign_currency_code' => 'nullable|min:3|max:51|exists:transaction_currencies,code', // amount - 'transactions.*.amount' => 'numeric|gt:0|max:100000000000', - 'transactions.*.foreign_amount' => 'nullable|numeric|gte:0|max:1000000000', + 'transactions.*.amount' => 'numeric|gt:0|max:100000000000', + 'transactions.*.foreign_amount' => 'nullable|numeric|gte:0|max:1000000000', // description - 'transactions.*.description' => 'nullable|between:1,1000', + 'transactions.*.description' => 'nullable|between:1,1000', // source of transaction - 'transactions.*.source_id' => ['numeric', 'nullable', new BelongsUser()], - 'transactions.*.source_name' => 'between:1,255|nullable', + '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_name' => 'between:1,255|nullable', + '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(), 'nullable'], - '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.*.budget_id' => ['mustExist:budgets,id', new BelongsUser(), 'nullable'], + '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()], // other interesting fields - 'transactions.*.reconciled' => [new IsBoolean()], - 'transactions.*.notes' => 'min:1|max:50000|nullable', - 'transactions.*.tags' => 'between:0,255|nullable', + 'transactions.*.reconciled' => [new IsBoolean()], + 'transactions.*.notes' => 'min:1|max:50000|nullable', + 'transactions.*.tags' => 'between:0,255|nullable', 'transactions.*.tags.*' => 'between:0,255', // meta info fields - 'transactions.*.internal_reference' => 'min:1|max:255|nullable', - 'transactions.*.external_id' => 'min:1|max:255|nullable', - 'transactions.*.recurrence_id' => 'min:1|max:255|nullable', - 'transactions.*.bunq_payment_id' => 'min:1|max:255|nullable', - 'transactions.*.external_url' => sprintf('min:1|max:255|nullable|url:%s', $validProtocols), + 'transactions.*.internal_reference' => 'min:1|max:255|nullable', + 'transactions.*.external_id' => 'min:1|max:255|nullable', + 'transactions.*.recurrence_id' => 'min:1|max:255|nullable', + 'transactions.*.bunq_payment_id' => 'min:1|max:255|nullable', + 'transactions.*.external_url' => sprintf('min:1|max:255|nullable|url:%s', $validProtocols), // SEPA fields: - 'transactions.*.sepa_cc' => 'min:1|max:255|nullable', - 'transactions.*.sepa_ct_op' => 'min:1|max:255|nullable', - 'transactions.*.sepa_ct_id' => 'min:1|max:255|nullable', - 'transactions.*.sepa_db' => 'min:1|max:255|nullable', - 'transactions.*.sepa_country' => 'min:1|max:255|nullable', - 'transactions.*.sepa_ep' => 'min:1|max:255|nullable', - 'transactions.*.sepa_ci' => 'min:1|max:255|nullable', - 'transactions.*.sepa_batch_id' => 'min:1|max:255|nullable', + 'transactions.*.sepa_cc' => 'min:1|max:255|nullable', + 'transactions.*.sepa_ct_op' => 'min:1|max:255|nullable', + 'transactions.*.sepa_ct_id' => 'min:1|max:255|nullable', + 'transactions.*.sepa_db' => 'min:1|max:255|nullable', + 'transactions.*.sepa_country' => 'min:1|max:255|nullable', + 'transactions.*.sepa_ep' => 'min:1|max:255|nullable', + 'transactions.*.sepa_ci' => 'min:1|max:255|nullable', + 'transactions.*.sepa_batch_id' => 'min:1|max:255|nullable', // dates - 'transactions.*.interest_date' => 'date|nullable', - 'transactions.*.book_date' => 'date|nullable', - 'transactions.*.process_date' => 'date|nullable', - 'transactions.*.due_date' => 'date|nullable', - 'transactions.*.payment_date' => 'date|nullable', - 'transactions.*.invoice_date' => 'date|nullable', + 'transactions.*.interest_date' => 'date|nullable', + 'transactions.*.book_date' => 'date|nullable', + 'transactions.*.process_date' => 'date|nullable', + 'transactions.*.due_date' => 'date|nullable', + 'transactions.*.payment_date' => 'date|nullable', + 'transactions.*.invoice_date' => 'date|nullable', ]; } @@ -213,7 +213,7 @@ class UpdateRequest extends FormRequest private function getTransactionData(): array { app('log')->debug(sprintf('Now in %s', __METHOD__)); - $return = []; + $return = []; /** @var null|array $transactions */ $transactions = $this->get('transactions'); diff --git a/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php index 73f03f71f5..441149ff03 100644 --- a/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php @@ -82,21 +82,21 @@ class StoreRequest extends FormRequest private function validateExistingLink(Validator $validator): void { /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); /** @var LinkTypeRepositoryInterface $repository */ - $repository = app(LinkTypeRepositoryInterface::class); + $repository = app(LinkTypeRepositoryInterface::class); $repository->setUser($user); /** @var JournalRepositoryInterface $journalRepos */ $journalRepos = app(JournalRepositoryInterface::class); $journalRepos->setUser($user); - $data = $validator->getData(); - $inwardId = (int)($data['inward_id'] ?? 0); - $outwardId = (int)($data['outward_id'] ?? 0); - $inward = $journalRepos->find($inwardId); - $outward = $journalRepos->find($outwardId); + $data = $validator->getData(); + $inwardId = (int)($data['inward_id'] ?? 0); + $outwardId = (int)($data['outward_id'] ?? 0); + $inward = $journalRepos->find($inwardId); + $outward = $journalRepos->find($outwardId); if (null === $inward) { $validator->errors()->add('inward_id', 'Invalid inward ID.'); diff --git a/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php index f25a84912c..33b5b766f1 100644 --- a/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php @@ -82,21 +82,21 @@ class UpdateRequest extends FormRequest private function validateUpdate(Validator $validator): void { /** @var TransactionJournalLink $existing */ - $existing = $this->route()->parameter('journalLink'); - $data = $validator->getData(); + $existing = $this->route()->parameter('journalLink'); + $data = $validator->getData(); /** @var LinkTypeRepositoryInterface $repository */ - $repository = app(LinkTypeRepositoryInterface::class); + $repository = app(LinkTypeRepositoryInterface::class); $repository->setUser(auth()->user()); /** @var JournalRepositoryInterface $journalRepos */ $journalRepos = app(JournalRepositoryInterface::class); $journalRepos->setUser(auth()->user()); - $inwardId = $data['inward_id'] ?? $existing->source_id; - $outwardId = $data['outward_id'] ?? $existing->destination_id; - $inward = $journalRepos->find((int)$inwardId); - $outward = $journalRepos->find((int)$outwardId); + $inwardId = $data['inward_id'] ?? $existing->source_id; + $outwardId = $data['outward_id'] ?? $existing->destination_id; + $inward = $journalRepos->find((int)$inwardId); + $outward = $journalRepos->find((int)$outwardId); if (null === $inward) { $inward = $existing->source; } @@ -108,7 +108,7 @@ class UpdateRequest extends FormRequest $validator->errors()->add('outward_id', 'Inward ID must be different from outward ID.'); } - $inDB = $repository->findSpecificLink($existing->linkType, $inward, $outward); + $inDB = $repository->findSpecificLink($existing->linkType, $inward, $outward); if (null === $inDB) { return; } diff --git a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php index 50d19872bd..5c12611879 100644 --- a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php @@ -39,11 +39,11 @@ class CreateRequest extends FormRequest public function getData(): array { - $triggers = Webhook::getTriggersForValidation(); - $responses = Webhook::getResponsesForValidation(); - $deliveries = Webhook::getDeliveriesForValidation(); + $triggers = Webhook::getTriggersForValidation(); + $responses = Webhook::getResponsesForValidation(); + $deliveries = Webhook::getDeliveriesForValidation(); - $fields = [ + $fields = [ 'title' => ['title', 'convertString'], 'active' => ['active', 'boolean'], 'trigger' => ['trigger', 'convertString'], diff --git a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php index ab5b733015..8705c0d655 100644 --- a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php @@ -39,11 +39,11 @@ class UpdateRequest extends FormRequest public function getData(): array { - $triggers = Webhook::getTriggersForValidation(); - $responses = Webhook::getResponsesForValidation(); - $deliveries = Webhook::getDeliveriesForValidation(); + $triggers = Webhook::getTriggersForValidation(); + $responses = Webhook::getResponsesForValidation(); + $deliveries = Webhook::getDeliveriesForValidation(); - $fields = [ + $fields = [ 'title' => ['title', 'convertString'], 'active' => ['active', 'boolean'], 'trigger' => ['trigger', 'convertString'], @@ -53,7 +53,7 @@ class UpdateRequest extends FormRequest ]; // this is the way. - $return = $this->getAllData($fields); + $return = $this->getAllData($fields); if (array_key_exists('trigger', $return)) { $return['trigger'] = $triggers[$return['trigger']] ?? 0; } @@ -82,7 +82,7 @@ class UpdateRequest extends FormRequest $validProtocols = config('firefly.valid_url_protocols'); /** @var Webhook $webhook */ - $webhook = $this->route()->parameter('webhook'); + $webhook = $this->route()->parameter('webhook'); return [ 'title' => sprintf('between:1,512|uniqueObjectForUser:webhooks,title,%d', $webhook->id),