From 63c49f740fbc18f9a9668a7f75d1331163246c76 Mon Sep 17 00:00:00 2001 From: JC5 Date: Fri, 13 Mar 2026 03:55:47 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Auto=20commit=20for=20release=20?= =?UTF-8?q?'develop'=20on=202026-03-13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Autocomplete/AccountController.php | 8 +- .../Autocomplete/BillController.php | 2 +- .../Autocomplete/BudgetController.php | 2 +- .../Autocomplete/CategoryController.php | 2 +- .../Autocomplete/ObjectGroupController.php | 2 +- .../Autocomplete/TagController.php | 2 +- .../TransactionTypeController.php | 2 +- .../V1/Controllers/Chart/BudgetController.php | 2 +- .../Controllers/Chart/CategoryController.php | 4 +- .../Models/Account/ListController.php | 58 ++-- .../Models/Account/ShowController.php | 14 +- .../Models/Attachment/ShowController.php | 16 +- .../Models/AvailableBudget/ShowController.php | 22 +- .../Models/Bill/ListController.php | 50 +-- .../Models/Bill/ShowController.php | 36 +- .../Models/Rule/TriggerController.php | 12 +- .../Models/RuleGroup/TriggerController.php | 12 +- .../Models/UserGroup/IndexController.php | 12 +- .../Controllers/Summary/BasicController.php | 14 +- .../Autocomplete/AutocompleteRequest.php | 2 +- .../Data/Bulk/MoveTransactionsRequest.php | 2 +- app/Api/V1/Requests/Data/DestroyRequest.php | 2 +- .../V1/Requests/Data/Export/ExportRequest.php | 2 +- app/Api/V1/Requests/Data/SameDateRequest.php | 4 +- .../V1/Requests/Insight/GenericRequest.php | 4 +- .../Models/Account/AccountTypeApiRequest.php | 2 +- .../Requests/Models/Budget/UpdateRequest.php | 2 +- .../Requests/Models/Category/StoreRequest.php | 2 +- .../Models/Category/UpdateRequest.php | 2 +- .../StoreByDateRequest.php | 4 +- .../Models/Recurrence/StoreRequest.php | 2 +- .../V1/Requests/Models/Rule/TestRequest.php | 2 +- .../Requests/Models/Rule/TriggerRequest.php | 2 +- .../Requests/Models/RuleGroup/TestRequest.php | 2 +- .../Models/RuleGroup/TriggerRequest.php | 4 +- .../V1/Requests/Models/Tag/UpdateRequest.php | 2 +- .../TransactionLinkType/StoreRequest.php | 2 +- .../TransactionLinkType/UpdateRequest.php | 2 +- .../Requests/Models/Webhook/CreateRequest.php | 2 +- .../Requests/Models/Webhook/UpdateRequest.php | 2 +- app/Api/V1/Requests/System/CronRequest.php | 4 +- .../Correction/CreatesGroupMemberships.php | 2 +- .../Commands/System/CreatesDatabase.php | 2 +- .../Commands/System/CreatesFirstUser.php | 2 +- .../Commands/System/ForcesMigrations.php | 2 +- app/Console/Commands/Tools/ApplyRules.php | 6 +- .../Commands/Tools/ChecksForUpdates.php | 2 +- .../Tools/VerifiesDatabaseConnectionTrait.php | 2 +- .../Upgrade/UpgradesAccountCurrencies.php | 4 +- .../Commands/Upgrade/UpgradesBillsToRules.php | 10 +- .../Commands/Upgrade/UpgradesDatabase.php | 2 +- .../Upgrade/UpgradesRecurrenceMetaData.php | 2 +- app/Exceptions/Handler.php | 18 +- app/Factory/AccountMetaFactory.php | 2 +- app/Factory/CategoryFactory.php | 2 +- app/Factory/TransactionJournalFactory.php | 2 +- .../Chart/Basic/ChartJsGenerator.php | 8 +- .../Report/Budget/MonthReportGenerator.php | 2 +- .../Report/Category/MonthReportGenerator.php | 2 +- .../Report/Tag/MonthReportGenerator.php | 2 +- .../Controllers/Account/CreateController.php | 5 +- .../Controllers/Account/DeleteController.php | 2 +- .../Controllers/Account/EditController.php | 2 +- .../Controllers/Account/ShowController.php | 2 +- app/Http/Controllers/Admin/HomeController.php | 2 +- app/Http/Controllers/Admin/LinkController.php | 10 +- .../Controllers/Admin/UpdateController.php | 3 +- app/Http/Controllers/Admin/UserController.php | 2 +- app/Http/Controllers/AttachmentController.php | 5 +- .../Auth/ForgotPasswordController.php | 2 +- .../Controllers/Auth/RegisterController.php | 5 +- .../Auth/ResetPasswordController.php | 2 +- .../Controllers/Auth/TwoFactorController.php | 3 +- .../Controllers/Bill/CreateController.php | 2 +- .../Controllers/Bill/DeleteController.php | 3 +- app/Http/Controllers/Bill/EditController.php | 2 +- app/Http/Controllers/Bill/IndexController.php | 6 +- app/Http/Controllers/Bill/ShowController.php | 1 - .../Budget/BudgetLimitController.php | 9 +- .../Controllers/Budget/CreateController.php | 2 +- .../Controllers/Budget/DeleteController.php | 3 +- .../Controllers/Budget/IndexController.php | 2 +- .../Controllers/Budget/ShowController.php | 4 +- .../Controllers/Category/CreateController.php | 1 - .../Controllers/Category/DeleteController.php | 1 - .../Controllers/Category/EditController.php | 3 +- .../Controllers/Chart/AccountController.php | 12 +- app/Http/Controllers/Chart/BillController.php | 4 +- .../Controllers/Chart/BudgetController.php | 6 +- .../Controllers/Chart/ReportController.php | 2 +- app/Http/Controllers/DebugController.php | 5 +- .../ExchangeRates/IndexController.php | 2 +- app/Http/Controllers/HomeController.php | 7 +- app/Http/Controllers/JavascriptController.php | 6 +- app/Http/Controllers/Json/BoxController.php | 2 +- .../Controllers/Json/ReconcileController.php | 4 +- .../Controllers/Json/RecurrenceController.php | 4 +- app/Http/Controllers/Json/RuleController.php | 4 +- .../ObjectGroup/DeleteController.php | 2 +- .../ObjectGroup/EditController.php | 3 +- .../ObjectGroup/IndexController.php | 2 +- .../PiggyBank/AmountController.php | 12 +- .../PiggyBank/CreateController.php | 3 +- .../PiggyBank/DeleteController.php | 2 +- .../Controllers/PiggyBank/EditController.php | 1 - .../Controllers/PiggyBank/IndexController.php | 2 +- .../Controllers/PreferencesController.php | 1 - .../Controllers/Profile/MfaController.php | 9 +- app/Http/Controllers/ProfileController.php | 8 +- .../Recurring/CreateController.php | 1 - .../Recurring/DeleteController.php | 3 +- .../Controllers/Recurring/EditController.php | 1 - .../Controllers/Report/BalanceController.php | 4 +- .../Controllers/Report/BudgetController.php | 12 +- .../Controllers/Report/CategoryController.php | 16 +- .../Controllers/Report/DoubleController.php | 4 +- .../Report/OperationsController.php | 4 +- app/Http/Controllers/Report/TagController.php | 16 +- app/Http/Controllers/ReportController.php | 1 - .../Controllers/Rule/CreateController.php | 5 +- .../Controllers/Rule/DeleteController.php | 2 +- app/Http/Controllers/Rule/EditController.php | 7 +- app/Http/Controllers/Rule/IndexController.php | 2 +- .../Controllers/Rule/SelectController.php | 16 +- .../RuleGroup/CreateController.php | 3 +- .../RuleGroup/DeleteController.php | 3 +- .../Controllers/RuleGroup/EditController.php | 3 +- .../RuleGroup/ExecutionController.php | 8 +- app/Http/Controllers/SearchController.php | 4 +- .../Controllers/System/InstallController.php | 4 +- app/Http/Controllers/TagController.php | 8 +- .../Transaction/BulkController.php | 3 +- .../Transaction/ConvertController.php | 4 +- .../Transaction/IndexController.php | 2 +- .../Transaction/LinkController.php | 5 +- .../Transaction/MassController.php | 1 - .../Transaction/ShowController.php | 2 +- .../TransactionCurrency/CreateController.php | 2 +- .../TransactionCurrency/EditController.php | 2 +- .../TransactionCurrency/IndexController.php | 2 +- .../UserGroup/CreateController.php | 2 +- .../Controllers/UserGroup/EditController.php | 2 +- .../Controllers/UserGroup/IndexController.php | 2 +- .../Controllers/Webhooks/DeleteController.php | 2 +- .../Controllers/Webhooks/EditController.php | 2 +- .../Controllers/Webhooks/ShowController.php | 2 +- app/Http/Requests/BudgetIncomeRequest.php | 2 +- app/Http/Requests/BulkEditJournalRequest.php | 2 +- app/Http/Requests/CategoryFormRequest.php | 4 +- .../Requests/ExistingTokenFormRequest.php | 2 +- app/Http/Requests/JournalLinkRequest.php | 2 +- app/Http/Requests/RecurrenceFormRequest.php | 2 +- app/Http/Requests/RuleGroupFormRequest.php | 4 +- .../Requests/SelectTransactionsRequest.php | 2 +- app/Http/Requests/TokenFormRequest.php | 2 +- app/Http/Requests/UserRegistrationRequest.php | 2 +- app/Jobs/CreateRecurringTransactions.php | 2 +- app/Jobs/WarnAboutBills.php | 4 +- .../NotifiesUserAboutFailedRuleAction.php | 2 +- .../SupportsGroupProcessingTrait.php | 2 +- .../Security/System/ChecksForNewVersion.php | 2 +- .../System/HandlesNewUserRegistration.php | 2 +- .../Security/User/StoresNewIpAddress.php | 2 +- .../RecalculatesPrimaryCurrencyAmounts.php | 2 +- app/Models/Account.php | 2 +- app/Models/AuditLogEntry.php | 2 +- app/Models/AutoBudget.php | 2 +- app/Models/AvailableBudget.php | 45 ++- app/Models/Bill.php | 8 +- app/Models/GroupMembership.php | 2 +- app/Models/InvitedUser.php | 2 +- app/Models/LinkType.php | 2 +- app/Models/PiggyBank.php | 4 +- app/Models/Recurrence.php | 2 +- app/Models/RecurrenceMeta.php | 2 +- app/Models/RecurrenceTransactionMeta.php | 2 +- app/Models/Transaction.php | 10 +- app/Models/WebhookMessage.php | 2 +- .../Admin/UnknownUserLoginAttempt.php | 6 +- app/Notifications/Admin/UserRegistration.php | 2 +- app/Notifications/ReturnsSettings.php | 2 +- .../Security/UserFailedLoginAttempt.php | 6 +- .../Test/OwnerTestNotificationEmail.php | 3 +- app/Notifications/User/BillReminder.php | 2 +- app/Notifications/User/NewAccessToken.php | 3 +- .../User/SubscriptionsOverdueReminder.php | 2 +- app/Notifications/User/UserLogin.php | 6 +- .../Account/AccountRepository.php | 2 +- app/Repositories/Account/AccountTasker.php | 6 +- app/Repositories/Bill/BillRepository.php | 2 +- .../Recurring/RecurringRepository.php | 8 +- app/Repositories/Tag/OperationsRepository.php | 2 +- app/Repositories/User/UserRepository.php | 2 +- .../UserGroup/UserGroupRepository.php | 4 +- app/Rules/IsValidSortInstruction.php | 4 +- app/Rules/UniqueAccountNumber.php | 2 +- .../Update/GitHubUpdateRequest.php | 4 +- .../Internal/Support/JournalServiceTrait.php | 6 +- .../Support/RecurringTransactionTrait.php | 4 +- .../Internal/Update/JournalUpdateService.php | 16 +- .../Update/RecurrenceUpdateService.php | 8 +- app/Services/Password/PwndVerifierV2.php | 2 +- app/Support/Amount.php | 2 +- .../Authentication/RemoteUserProvider.php | 2 +- app/Support/Balance.php | 2 +- .../Chart/Budget/FrontpageChartGenerator.php | 6 +- app/Support/ExpandedForm.php | 10 +- app/Support/Form/PiggyBankForm.php | 4 +- .../Http/Api/AccountBalanceGrouped.php | 2 +- app/Support/Http/Controllers/AugumentData.php | 2 +- .../Http/Controllers/ChartGeneration.php | 2 +- app/Support/Http/Controllers/CreateStuff.php | 2 +- app/Support/Http/Controllers/CronRunner.php | 10 +- .../Http/Controllers/PeriodOverview.php | 8 +- .../Http/Controllers/RenderPartialViews.php | 8 +- .../JsonApi/Enrichments/AccountEnrichment.php | 6 +- .../Enrichments/PiggyBankEnrichment.php | 4 +- .../Enrichments/RecurringEnrichment.php | 20 +- .../TransactionGroupEnrichment.php | 2 +- app/Support/Navigation.php | 10 +- app/Support/ParseDateString.php | 6 +- .../Report/Budget/BudgetReportGenerator.php | 6 +- .../Category/CategoryReportGenerator.php | 2 +- app/Support/Request/ConvertsDataTypes.php | 2 +- app/Support/Request/ValidatesWebhooks.php | 2 +- app/Support/Search/OperatorQuerySearch.php | 102 +++--- app/Support/Steam.php | 6 +- app/Support/Twig/General.php | 2 +- app/Support/Twig/Translation.php | 1 - .../Actions/ConvertToDeposit.php | 4 +- .../Actions/ConvertToTransfer.php | 4 +- .../Engine/CustomExpressionLanguage.php | 4 +- .../TransactionGroupTransformer.php | 8 +- app/User.php | 6 +- app/Validation/Account/DepositValidation.php | 4 +- app/Validation/Account/OBValidation.php | 2 +- .../Account/ReconciliationValidation.php | 4 +- app/Validation/Account/TransferValidation.php | 4 +- .../Account/WithdrawalValidation.php | 6 +- app/Validation/RecurrenceValidation.php | 4 +- app/Validation/TransactionValidation.php | 8 +- composer.lock | 97 +++--- config/firefly.php | 4 +- database/factories/AccountFactory.php | 2 +- database/seeders/LinkTypeSeeder.php | 8 +- database/seeders/PermissionSeeder.php | 4 +- .../seeders/TransactionCurrencySeeder.php | 82 ++--- database/seeders/WebhookDataSeeder.php | 6 +- package-lock.json | 316 +++++++++--------- resources/lang/en_US/auth.php | 2 +- resources/lang/en_US/email.php | 4 +- resources/lang/en_US/pagination.php | 2 +- tests/feature/TestCase.php | 2 +- .../Autocomplete/CategoryControllerTest.php | 2 +- .../Autocomplete/PiggyBankControllerTest.php | 2 +- .../Api/Chart/AccountControllerTest.php | 2 +- .../Api/Chart/BalanceControllerTest.php | 2 +- .../Api/Chart/BudgetControllerTest.php | 2 +- .../Api/Chart/CategoryControllerTest.php | 2 +- .../Api/Models/Account/ListControllerTest.php | 6 +- tests/integration/TestCase.php | 4 +- .../unit/Support/NavigationAddPeriodTest.php | 22 +- 262 files changed, 904 insertions(+), 940 deletions(-) diff --git a/app/Api/V1/Controllers/Autocomplete/AccountController.php b/app/Api/V1/Controllers/Autocomplete/AccountController.php index b6e2c9315e..331c0b4cfa 100644 --- a/app/Api/V1/Controllers/Autocomplete/AccountController.php +++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php @@ -80,16 +80,16 @@ final class AccountController extends Controller public function accounts(AutocompleteApiRequest $request): JsonResponse { // Log::debug('Before All.'); - ['types' => $types, 'query' => $query, 'date' => $date, 'limit' => $limit] = $request->attributes->all(); + ['types' => $types, 'query' => $query, 'date' => $date, 'limit' => $limit] = $request->attributes->all(); $date ??= today(config('app.timezone')); // set date to end-of-day for account balance. so it is at $date 23:59:59 $date->endOfDay(); - $return = []; - $result = $this->repository->searchAccount((string) $query, $types, $limit); - $allBalances = Steam::accountsBalancesOptimized($result, $date, $this->primaryCurrency, $this->convertToPrimary); + $return = []; + $result = $this->repository->searchAccount((string) $query, $types, $limit); + $allBalances = Steam::accountsBalancesOptimized($result, $date, $this->primaryCurrency, $this->convertToPrimary); /** @var Account $account */ foreach ($result as $account) { diff --git a/app/Api/V1/Controllers/Autocomplete/BillController.php b/app/Api/V1/Controllers/Autocomplete/BillController.php index c5b4318b64..9ae15abfa1 100644 --- a/app/Api/V1/Controllers/Autocomplete/BillController.php +++ b/app/Api/V1/Controllers/Autocomplete/BillController.php @@ -63,7 +63,7 @@ final class BillController extends Controller public function bills(AutocompleteApiRequest $request): JsonResponse { $result = $this->repository->searchBill($request->attributes->get('query'), $request->attributes->get('limit')); - $filtered = $result->map(static fn (Bill $item): array => ['id' => (string) $item->id, 'name' => $item->name, 'active' => $item->active]); + $filtered = $result->map(static fn (Bill $item): array => ['id' => (string) $item->id, 'name' => $item->name, 'active' => $item->active]); return response()->api($filtered->toArray()); } diff --git a/app/Api/V1/Controllers/Autocomplete/BudgetController.php b/app/Api/V1/Controllers/Autocomplete/BudgetController.php index 2d6708e325..47a3f4afe4 100644 --- a/app/Api/V1/Controllers/Autocomplete/BudgetController.php +++ b/app/Api/V1/Controllers/Autocomplete/BudgetController.php @@ -63,7 +63,7 @@ final class BudgetController extends Controller public function budgets(AutocompleteApiRequest $request): JsonResponse { $result = $this->repository->searchBudget($request->attributes->get('query'), $request->attributes->get('limit')); - $filtered = $result->map(static fn (Budget $item): array => ['id' => (string) $item->id, 'name' => $item->name, 'active' => $item->active]); + $filtered = $result->map(static fn (Budget $item): array => ['id' => (string) $item->id, 'name' => $item->name, 'active' => $item->active]); return response()->api($filtered->toArray()); } diff --git a/app/Api/V1/Controllers/Autocomplete/CategoryController.php b/app/Api/V1/Controllers/Autocomplete/CategoryController.php index adf2e5da03..4f52158cac 100644 --- a/app/Api/V1/Controllers/Autocomplete/CategoryController.php +++ b/app/Api/V1/Controllers/Autocomplete/CategoryController.php @@ -63,7 +63,7 @@ final class CategoryController extends Controller public function categories(AutocompleteApiRequest $request): JsonResponse { $result = $this->repository->searchCategory($request->attributes->get('query'), $request->attributes->get('limit')); - $filtered = $result->map(static fn (Category $item): array => ['id' => (string) $item->id, 'name' => $item->name]); + $filtered = $result->map(static fn (Category $item): array => ['id' => (string) $item->id, 'name' => $item->name]); return response()->api($filtered->toArray()); } diff --git a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php index 22ee0db1c3..373cd79603 100644 --- a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php +++ b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php @@ -67,7 +67,7 @@ final class ObjectGroupController extends Controller /** @var ObjectGroup $objectGroup */ foreach ($result as $objectGroup) { - $return[] = ['id' => (string) $objectGroup->id, 'name' => $objectGroup->title, 'title' => $objectGroup->title]; + $return[] = ['id' => (string) $objectGroup->id, 'name' => $objectGroup->title, 'title' => $objectGroup->title]; } return response()->api($return); diff --git a/app/Api/V1/Controllers/Autocomplete/TagController.php b/app/Api/V1/Controllers/Autocomplete/TagController.php index d62b8793e1..e44a17ce29 100644 --- a/app/Api/V1/Controllers/Autocomplete/TagController.php +++ b/app/Api/V1/Controllers/Autocomplete/TagController.php @@ -63,7 +63,7 @@ final class TagController extends Controller /** @var Tag $tag */ foreach ($result as $tag) { - $array[] = ['id' => (string) $tag->id, 'name' => $tag->tag, 'tag' => $tag->tag]; + $array[] = ['id' => (string) $tag->id, 'name' => $tag->tag, 'tag' => $tag->tag]; } return response()->api($array); diff --git a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php index c34cc83f93..2fbe4188df 100644 --- a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php +++ b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php @@ -62,7 +62,7 @@ final class TransactionTypeController extends Controller /** @var TransactionType $type */ foreach ($types as $type) { // different key for consistency. - $array[] = ['id' => (string) $type->id, 'name' => $type->type, 'type' => $type->type]; + $array[] = ['id' => (string) $type->id, 'name' => $type->type, 'type' => $type->type]; } return response()->api($array); diff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.php index ccc2054345..70c138a458 100644 --- a/app/Api/V1/Controllers/Chart/BudgetController.php +++ b/app/Api/V1/Controllers/Chart/BudgetController.php @@ -220,7 +220,7 @@ final class BudgetController extends Controller 'end_date' => $row['end'], 'yAxisID' => 0, 'type' => 'bar', - 'entries' => ['budgeted' => $row['budgeted'], 'spent' => $row['spent'], 'left' => $row['left'], 'overspent' => $row['overspent']], + 'entries' => ['budgeted' => $row['budgeted'], 'spent' => $row['spent'], 'left' => $row['left'], 'overspent' => $row['overspent']], 'pc_entries' => [ 'budgeted' => $row['pc_budgeted'], 'spent' => $row['pc_spent'], diff --git a/app/Api/V1/Controllers/Chart/CategoryController.php b/app/Api/V1/Controllers/Chart/CategoryController.php index a7b17d2c94..072c473866 100644 --- a/app/Api/V1/Controllers/Chart/CategoryController.php +++ b/app/Api/V1/Controllers/Chart/CategoryController.php @@ -153,8 +153,8 @@ final class CategoryController extends Controller 'end_date' => $end->toAtomString(), 'yAxisID' => 0, 'type' => 'bar', - 'entries' => ['spent' => '0', 'earned' => '0'], - 'pc_entries' => ['spent' => '0', 'earned' => '0'], + 'entries' => ['spent' => '0', 'earned' => '0'], + 'pc_entries' => ['spent' => '0', 'earned' => '0'], ]; // add monies diff --git a/app/Api/V1/Controllers/Models/Account/ListController.php b/app/Api/V1/Controllers/Models/Account/ListController.php index 679b72293f..a6ec7bf804 100644 --- a/app/Api/V1/Controllers/Models/Account/ListController.php +++ b/app/Api/V1/Controllers/Models/Account/ListController.php @@ -70,21 +70,21 @@ final class ListController extends Controller public function attachments(PaginationRequest $request, Account $account): JsonResponse { - $manager = $this->getManager(); - ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all(); - $collection = $this->repository->getAttachments($account); + $manager = $this->getManager(); + ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all(); + $collection = $this->repository->getAttachments($account); - $count = $collection->count(); - $attachments = $collection->slice($offset, $limit); + $count = $collection->count(); + $attachments = $collection->slice($offset, $limit); // make paginator: - $paginator = new LengthAwarePaginator($attachments, $count, $limit, $page); + $paginator = new LengthAwarePaginator($attachments, $count, $limit, $page); $paginator->setPath(route('api.v1.accounts.attachments', [$account->id]).$this->buildParams()); /** @var AttachmentTransformer $transformer */ - $transformer = app(AttachmentTransformer::class); + $transformer = app(AttachmentTransformer::class); - $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); @@ -93,31 +93,31 @@ final class ListController extends Controller public function piggyBanks(PaginationRequest $request, Account $account): JsonResponse { // create some objects: - $manager = $this->getManager(); + $manager = $this->getManager(); - ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all(); + ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all(); // get list of piggy banks. Count it and split it. - $collection = $this->repository->getPiggyBanks($account); - $count = $collection->count(); - $piggyBanks = $collection->slice($offset, $limit); + $collection = $this->repository->getPiggyBanks($account); + $count = $collection->count(); + $piggyBanks = $collection->slice($offset, $limit); // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new PiggyBankEnrichment(); + $admin = auth()->user(); + $enrichment = new PiggyBankEnrichment(); $enrichment->setUser($admin); - $piggyBanks = $enrichment->enrich($piggyBanks); + $piggyBanks = $enrichment->enrich($piggyBanks); // make paginator: - $paginator = new LengthAwarePaginator($piggyBanks, $count, $limit, $page); + $paginator = new LengthAwarePaginator($piggyBanks, $count, $limit, $page); $paginator->setPath(route('api.v1.accounts.piggy-banks', [$account->id]).$this->buildParams()); /** @var PiggyBankTransformer $transformer */ - $transformer = app(PiggyBankTransformer::class); + $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); @@ -128,16 +128,16 @@ final class ListController extends Controller */ public function transactions(PaginationDateRangeRequest $request, Account $account): JsonResponse { - ['limit' => $limit, 'page' => $page, 'start' => $start, 'end' => $end, 'type' => $type] = $request->attributes->all(); - $types = $this->mapTransactionTypes($type ?? 'default'); - $manager = $this->getManager(); + ['limit' => $limit, 'page' => $page, 'start' => $start, 'end' => $end, 'type' => $type] = $request->attributes->all(); + $types = $this->mapTransactionTypes($type ?? 'default'); + $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()->push($account))->withAPIInformation()->setLimit($limit)->setPage($page)->setTypes($types); if (null !== $start) { $collector->setStart($start); @@ -146,18 +146,18 @@ final class ListController extends Controller $collector->setEnd($end); } - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams()); // enrich - $enrichment = new TransactionGroupEnrichment(); + $enrichment = new TransactionGroupEnrichment(); $enrichment->setUser($admin); - $transactions = $enrichment->enrich($paginator->getCollection()); + $transactions = $enrichment->enrich($paginator->getCollection()); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); - $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/Account/ShowController.php b/app/Api/V1/Controllers/Models/Account/ShowController.php index 4a27acc062..ef115a720f 100644 --- a/app/Api/V1/Controllers/Models/Account/ShowController.php +++ b/app/Api/V1/Controllers/Models/Account/ShowController.php @@ -124,22 +124,22 @@ final class ShowController extends Controller // get list of accounts. Count it and split it. $this->repository->resetAccountOrder(); $account->refresh(); - $manager = $this->getManager(); - ['start' => $start, 'end' => $end, 'date' => $date] = $request->attributes->all(); + $manager = $this->getManager(); + ['start' => $start, 'end' => $end, 'date' => $date] = $request->attributes->all(); // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new AccountEnrichment(); + $admin = auth()->user(); + $enrichment = new AccountEnrichment(); $enrichment->setDate($date); $enrichment->setStart($start); $enrichment->setEnd($end); $enrichment->setUser($admin); - $account = $enrichment->enrichSingle($account); + $account = $enrichment->enrichSingle($account); /** @var AccountTransformer $transformer */ - $transformer = app(AccountTransformer::class); - $resource = new Item($account, $transformer, self::RESOURCE_KEY); + $transformer = app(AccountTransformer::class); + $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 be0fbe5710..10e971d6eb 100644 --- a/app/Api/V1/Controllers/Models/Attachment/ShowController.php +++ b/app/Api/V1/Controllers/Models/Attachment/ShowController.php @@ -121,7 +121,7 @@ final class ShowController extends Controller */ public function index(PaginationRequest $request): JsonResponse { - ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all(); + ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all(); if (true === auth()->user()->hasRole('demo')) { Log::channel('audit')->warning(sprintf('Demo user tries to access attachment API in %s', __METHOD__)); @@ -129,21 +129,21 @@ final class ShowController extends Controller throw new NotFoundHttpException(); } - $manager = $this->getManager(); + $manager = $this->getManager(); // get list of attachments. Count it and split it. - $collection = $this->repository->get(); - $count = $collection->count(); - $attachments = $collection->slice($offset, $limit); + $collection = $this->repository->get(); + $count = $collection->count(); + $attachments = $collection->slice($offset, $limit); // make paginator: - $paginator = new LengthAwarePaginator($attachments, $count, $limit, $page); + $paginator = new LengthAwarePaginator($attachments, $count, $limit, $page); $paginator->setPath(route('api.v1.attachments.index').$this->buildParams()); /** @var AttachmentTransformer $transformer */ - $transformer = app(AttachmentTransformer::class); + $transformer = app(AttachmentTransformer::class); - $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); diff --git a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php index 943269b5eb..d97405258b 100644 --- a/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php +++ b/app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php @@ -68,29 +68,29 @@ final class ShowController extends Controller */ public function index(PaginationDateRangeRequest $request): JsonResponse { - $manager = $this->getManager(); - ['limit' => $limit, 'offset' => $offset, 'page' => $page, 'start' => $start, 'end' => $end] = $request->attributes->all(); + $manager = $this->getManager(); + ['limit' => $limit, 'offset' => $offset, 'page' => $page, 'start' => $start, 'end' => $end] = $request->attributes->all(); // get list of available budgets. Count it and split it. - $collection = $this->abRepository->getAvailableBudgetsByDate($start, $end); - $count = $collection->count(); - $availableBudgets = $collection->slice($offset, $limit); + $collection = $this->abRepository->getAvailableBudgetsByDate($start, $end); + $count = $collection->count(); + $availableBudgets = $collection->slice($offset, $limit); // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new AvailableBudgetEnrichment(); + $admin = auth()->user(); + $enrichment = new AvailableBudgetEnrichment(); $enrichment->setUser($admin); - $availableBudgets = $enrichment->enrich($availableBudgets); + $availableBudgets = $enrichment->enrich($availableBudgets); // make paginator: - $paginator = new LengthAwarePaginator($availableBudgets, $count, $limit, $page); + $paginator = new LengthAwarePaginator($availableBudgets, $count, $limit, $page); $paginator->setPath(route('api.v1.available-budgets.index').$this->buildParams()); /** @var AvailableBudgetTransformer $transformer */ - $transformer = app(AvailableBudgetTransformer::class); + $transformer = app(AvailableBudgetTransformer::class); - $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); diff --git a/app/Api/V1/Controllers/Models/Bill/ListController.php b/app/Api/V1/Controllers/Models/Bill/ListController.php index 617bacca10..5256be1cd7 100644 --- a/app/Api/V1/Controllers/Models/Bill/ListController.php +++ b/app/Api/V1/Controllers/Models/Bill/ListController.php @@ -72,21 +72,21 @@ final class ListController extends Controller */ public function attachments(PaginationRequest $request, Bill $bill): JsonResponse { - ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all(); - $manager = $this->getManager(); - $collection = $this->repository->getAttachments($bill); + ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all(); + $manager = $this->getManager(); + $collection = $this->repository->getAttachments($bill); - $count = $collection->count(); - $attachments = $collection->slice($offset, $limit); + $count = $collection->count(); + $attachments = $collection->slice($offset, $limit); // make paginator: - $paginator = new LengthAwarePaginator($attachments, $count, $limit, $page); + $paginator = new LengthAwarePaginator($attachments, $count, $limit, $page); $paginator->setPath(route('api.v1.bills.attachments', [$bill->id]).$this->buildParams()); /** @var AttachmentTransformer $transformer */ - $transformer = app(AttachmentTransformer::class); + $transformer = app(AttachmentTransformer::class); - $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); @@ -100,20 +100,20 @@ final class ListController extends Controller */ public function rules(PaginationRequest $request, Bill $bill): JsonResponse { - ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all(); + ['limit' => $limit, 'offset' => $offset, 'page' => $page] = $request->attributes->all(); - $manager = $this->getManager(); - $collection = $this->repository->getRulesForBill($bill); - $count = $collection->count(); - $rules = $collection->slice($offset, $limit); + $manager = $this->getManager(); + $collection = $this->repository->getRulesForBill($bill); + $count = $collection->count(); + $rules = $collection->slice($offset, $limit); // make paginator: - $paginator = new LengthAwarePaginator($rules, $count, $limit, $page); + $paginator = new LengthAwarePaginator($rules, $count, $limit, $page); $paginator->setPath(route('api.v1.bills.rules', [$bill->id]).$this->buildParams()); /** @var RuleTransformer $transformer */ - $transformer = app(RuleTransformer::class); - $resource = new FractalCollection($rules, $transformer, 'rules'); + $transformer = app(RuleTransformer::class); + $resource = new FractalCollection($rules, $transformer, 'rules'); $resource->setPaginator(new IlluminatePaginatorAdapter($paginator)); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE); @@ -127,16 +127,16 @@ final class ListController extends Controller */ public function transactions(PaginationDateRangeRequest $request, Bill $bill): JsonResponse { - ['limit' => $limit, 'page' => $page, 'types' => $types, 'start' => $start, 'end' => $end] = $request->attributes->all(); + ['limit' => $limit, 'page' => $page, 'types' => $types, 'start' => $start, 'end' => $end] = $request->attributes->all(); - $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) // include source + destination account name and type. @@ -159,18 +159,18 @@ final class ListController extends Controller } // get paginator. - $paginator = $collector->getPaginatedGroups(); + $paginator = $collector->getPaginatedGroups(); $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]).$this->buildParams()); // enrich - $enrichment = new TransactionGroupEnrichment(); + $enrichment = new TransactionGroupEnrichment(); $enrichment->setUser($admin); - $transactions = $enrichment->enrich($paginator->getCollection()); + $transactions = $enrichment->enrich($paginator->getCollection()); /** @var TransactionGroupTransformer $transformer */ - $transformer = app(TransactionGroupTransformer::class); + $transformer = app(TransactionGroupTransformer::class); - $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 1fdb06ea9c..c67d880e1b 100644 --- a/app/Api/V1/Controllers/Models/Bill/ShowController.php +++ b/app/Api/V1/Controllers/Models/Bill/ShowController.php @@ -67,28 +67,28 @@ final class ShowController extends Controller */ public function index(PaginationDateRangeRequest $request): JsonResponse { - ['limit' => $limit, 'offset' => $offset, 'start' => $start, 'end' => $end, 'page' => $page] = $request->attributes->all(); + ['limit' => $limit, 'offset' => $offset, 'start' => $start, 'end' => $end, 'page' => $page] = $request->attributes->all(); $this->repository->correctOrder(); - $bills = $this->repository->getBills(); - $manager = $this->getManager(); - $count = $bills->count(); - $bills = $bills->slice($offset, $limit); - $paginator = new LengthAwarePaginator($bills, $count, $limit, $page); + $bills = $this->repository->getBills(); + $manager = $this->getManager(); + $count = $bills->count(); + $bills = $bills->slice($offset, $limit); + $paginator = new LengthAwarePaginator($bills, $count, $limit, $page); // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new SubscriptionEnrichment(); + $admin = auth()->user(); + $enrichment = new SubscriptionEnrichment(); $enrichment->setUser($admin); $enrichment->setStart($start); $enrichment->setEnd($end); - $bills = $enrichment->enrich($bills); + $bills = $enrichment->enrich($bills); /** @var BillTransformer $transformer */ - $transformer = app(BillTransformer::class); + $transformer = app(BillTransformer::class); - $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); @@ -102,23 +102,23 @@ final class ShowController extends Controller */ public function show(DateRangeRequest $request, Bill $bill): JsonResponse { - ['start' => $start, 'end' => $end] = $request->attributes->all(); + ['start' => $start, 'end' => $end] = $request->attributes->all(); - $manager = $this->getManager(); + $manager = $this->getManager(); // enrich /** @var User $admin */ - $admin = auth()->user(); - $enrichment = new SubscriptionEnrichment(); + $admin = auth()->user(); + $enrichment = new SubscriptionEnrichment(); $enrichment->setUser($admin); $enrichment->setStart($start); $enrichment->setEnd($end); - $bill = $enrichment->enrichSingle($bill); + $bill = $enrichment->enrichSingle($bill); /** @var BillTransformer $transformer */ - $transformer = app(BillTransformer::class); + $transformer = app(BillTransformer::class); - $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/Rule/TriggerController.php b/app/Api/V1/Controllers/Models/Rule/TriggerController.php index e8a55ca5e4..d11279c6b0 100644 --- a/app/Api/V1/Controllers/Models/Rule/TriggerController.php +++ b/app/Api/V1/Controllers/Models/Rule/TriggerController.php @@ -78,15 +78,15 @@ final class TriggerController extends Controller // overrule the rule(s) if necessary. if (array_key_exists('start', $parameters) && null !== $parameters['start']) { // add a range: - $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]); + $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]); } if (array_key_exists('end', $parameters) && null !== $parameters['end']) { // add a range: - $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]); + $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]); } if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) { - $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); + $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); } // file the rule(s) @@ -132,15 +132,15 @@ final class TriggerController extends Controller // overrule the rule(s) if necessary. if (array_key_exists('start', $parameters) && null !== $parameters['start']) { // add a range: - $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]); + $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]); } if (array_key_exists('end', $parameters) && null !== $parameters['end']) { // add a range: - $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]); + $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]); } if (array_key_exists('accounts', $parameters) && is_array($parameters['accounts']) && count($parameters['accounts']) > 0) { - $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); + $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); } // fire the rule(s) diff --git a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php index 9429ed4908..9387ca17db 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php @@ -85,15 +85,15 @@ final class TriggerController extends Controller // overrule the rule(s) if necessary. if (array_key_exists('start', $parameters) && null !== $parameters['start']) { // add a range: - $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]); + $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]); } if (array_key_exists('end', $parameters) && null !== $parameters['end']) { // add a range: - $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]); + $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]); } if (array_key_exists('accounts', $parameters) && '' !== $parameters['accounts']) { - $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); + $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); } // file the rule(s) @@ -146,15 +146,15 @@ final class TriggerController extends Controller // overrule the rule(s) if necessary. if (array_key_exists('start', $parameters) && null !== $parameters['start']) { // add a range: - $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]); + $ruleEngine->addOperator(['type' => 'date_after', 'value' => $parameters['start']->format('Y-m-d')]); } if (array_key_exists('end', $parameters) && null !== $parameters['end']) { // add a range: - $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]); + $ruleEngine->addOperator(['type' => 'date_before', 'value' => $parameters['end']->format('Y-m-d')]); } if (array_key_exists('accounts', $parameters) && is_array($parameters['accounts']) && count($parameters['accounts']) > 0) { - $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); + $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); } // file the rule(s) diff --git a/app/Api/V1/Controllers/Models/UserGroup/IndexController.php b/app/Api/V1/Controllers/Models/UserGroup/IndexController.php index 99acc7464b..54a9fd266e 100644 --- a/app/Api/V1/Controllers/Models/UserGroup/IndexController.php +++ b/app/Api/V1/Controllers/Models/UserGroup/IndexController.php @@ -52,12 +52,12 @@ final class IndexController extends Controller public function index(PaginationRequest $request): JsonResponse { - $administrations = $this->repository->get(); - ['page' => $page, 'limit' => $limit, 'offset' => $offset] = $request->attributes->all(); - $count = $administrations->count(); - $administrations = $administrations->slice($offset, $limit); - $paginator = new LengthAwarePaginator($administrations, $count, $limit, $page); - $transformer = new UserGroupTransformer(); + $administrations = $this->repository->get(); + ['page' => $page, 'limit' => $limit, 'offset' => $offset] = $request->attributes->all(); + $count = $administrations->count(); + $administrations = $administrations->slice($offset, $limit); + $paginator = new LengthAwarePaginator($administrations, $count, $limit, $page); + $transformer = new UserGroupTransformer(); return response()->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))->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 5bcc3c5eb5..055fbd8ea5 100644 --- a/app/Api/V1/Controllers/Summary/BasicController.php +++ b/app/Api/V1/Controllers/Summary/BasicController.php @@ -89,20 +89,20 @@ final class BasicController extends Controller public function basic(BasicRequest $request): JsonResponse { // parameters for boxes: - ['start' => $start, 'end' => $end, 'code' => $code] = $request->attributes->all(); + ['start' => $start, 'end' => $end, 'code' => $code] = $request->attributes->all(); // balance information: - $balanceData = $this->getBalanceInformation($start, $end); - $billData = $this->getSubscriptionInformation($start, $end); - $spentData = $this->getLeftToSpendInfo($start, $end); - $netWorthData = $this->getNetWorthInfo($end); + $balanceData = $this->getBalanceInformation($start, $end); + $billData = $this->getSubscriptionInformation($start, $end); + $spentData = $this->getLeftToSpendInfo($start, $end); + $netWorthData = $this->getNetWorthInfo($end); // $balanceData = []; // $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 ('' === $code || $code === $entry['currency_code']) { $return[$entry['key']] = $entry; diff --git a/app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php b/app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php index 984ff05013..fdd82f2d50 100644 --- a/app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php +++ b/app/Api/V1/Requests/Autocomplete/AutocompleteRequest.php @@ -54,7 +54,7 @@ class AutocompleteRequest extends FormRequest $date = $this->getCarbonDate('date') ?? today(config('app.timezone')); - return ['types' => $array, 'query' => $this->convertString('query'), 'date' => $date->endOfDay()]; + return ['types' => $array, 'query' => $this->convertString('query'), 'date' => $date->endOfDay()]; } public function rules(): array diff --git a/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php b/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php index 77d6fa6f9a..19878771ea 100644 --- a/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php +++ b/app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php @@ -43,7 +43,7 @@ class MoveTransactionsRequest extends FormRequest public function getAll(): array { - return ['original_account' => $this->convertInteger('original_account'), 'destination_account' => $this->convertInteger('destination_account')]; + return ['original_account' => $this->convertInteger('original_account'), 'destination_account' => $this->convertInteger('destination_account')]; } /** diff --git a/app/Api/V1/Requests/Data/DestroyRequest.php b/app/Api/V1/Requests/Data/DestroyRequest.php index a9b5b65396..dc5b77c04c 100644 --- a/app/Api/V1/Requests/Data/DestroyRequest.php +++ b/app/Api/V1/Requests/Data/DestroyRequest.php @@ -56,6 +56,6 @@ class DestroyRequest extends FormRequest .',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers' .',not_assets_liabilities'; - return ['objects' => sprintf('required|max:255|min:1|string|in:%s', $valid), 'unused' => 'in:true,false']; + return ['objects' => sprintf('required|max:255|min:1|string|in:%s', $valid), 'unused' => 'in:true,false']; } } diff --git a/app/Api/V1/Requests/Data/Export/ExportRequest.php b/app/Api/V1/Requests/Data/Export/ExportRequest.php index 76f9f37c6f..f28f59873c 100644 --- a/app/Api/V1/Requests/Data/Export/ExportRequest.php +++ b/app/Api/V1/Requests/Data/Export/ExportRequest.php @@ -72,6 +72,6 @@ class ExportRequest extends FormRequest */ public function rules(): array { - return ['type' => 'in:csv', 'accounts' => 'min:1|max:32768', 'start' => 'date|before:end', 'end' => 'date|after:start']; + return ['type' => 'in:csv', 'accounts' => 'min:1|max:32768', 'start' => 'date|before:end', 'end' => 'date|after:start']; } } diff --git a/app/Api/V1/Requests/Data/SameDateRequest.php b/app/Api/V1/Requests/Data/SameDateRequest.php index 78964bffcf..16c4bab66a 100644 --- a/app/Api/V1/Requests/Data/SameDateRequest.php +++ b/app/Api/V1/Requests/Data/SameDateRequest.php @@ -47,7 +47,7 @@ class SameDateRequest extends FormRequest */ public function getAll(): array { - return ['start' => $this->getCarbonDate('start'), 'end' => $this->getCarbonDate('end')]; + return ['start' => $this->getCarbonDate('start'), 'end' => $this->getCarbonDate('end')]; } /** @@ -55,6 +55,6 @@ class SameDateRequest extends FormRequest */ public function rules(): array { - return ['start' => 'required|date', 'end' => 'required|date|after_or_equal:start']; + return ['start' => 'required|date', 'end' => 'required|date|after_or_equal:start']; } } diff --git a/app/Api/V1/Requests/Insight/GenericRequest.php b/app/Api/V1/Requests/Insight/GenericRequest.php index e8156890d5..7bcfc6c03a 100644 --- a/app/Api/V1/Requests/Insight/GenericRequest.php +++ b/app/Api/V1/Requests/Insight/GenericRequest.php @@ -58,7 +58,7 @@ class GenericRequest extends FormRequest */ public function getAll(): array { - return ['start' => $this->getCarbonDate('start'), 'end' => $this->getCarbonDate('end')]; + return ['start' => $this->getCarbonDate('start'), 'end' => $this->getCarbonDate('end')]; } public function getAssetAccounts(): Collection @@ -169,7 +169,7 @@ class GenericRequest extends FormRequest $this->bills = new Collection(); $this->tags = new Collection(); - return ['start' => 'required|date', 'end' => 'required|date|after_or_equal:start']; + return ['start' => 'required|date', 'end' => 'required|date|after_or_equal:start']; } private function parseAccounts(): void diff --git a/app/Api/V1/Requests/Models/Account/AccountTypeApiRequest.php b/app/Api/V1/Requests/Models/Account/AccountTypeApiRequest.php index d1d543b650..154823ade9 100644 --- a/app/Api/V1/Requests/Models/Account/AccountTypeApiRequest.php +++ b/app/Api/V1/Requests/Models/Account/AccountTypeApiRequest.php @@ -45,7 +45,7 @@ class AccountTypeApiRequest extends ApiRequest } $type = $this->convertString('type', 'all'); - $this->attributes->add(['type' => $type, 'types' => $this->mapAccountTypes($type)]); + $this->attributes->add(['type' => $type, 'types' => $this->mapAccountTypes($type)]); }); } } diff --git a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php index 901058a104..6334bf8961 100644 --- a/app/Api/V1/Requests/Models/Budget/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Budget/UpdateRequest.php @@ -67,7 +67,7 @@ class UpdateRequest extends FormRequest ]; $allData = $this->getAllData($fields); if (array_key_exists('auto_budget_type', $allData)) { - $types = ['none' => 0, 'reset' => 1, 'rollover' => 2, 'adjusted' => 3]; + $types = ['none' => 0, 'reset' => 1, 'rollover' => 2, 'adjusted' => 3]; $allData['auto_budget_type'] = $types[$allData['auto_budget_type']] ?? 0; } diff --git a/app/Api/V1/Requests/Models/Category/StoreRequest.php b/app/Api/V1/Requests/Models/Category/StoreRequest.php index 281065777b..72cf478cff 100644 --- a/app/Api/V1/Requests/Models/Category/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Category/StoreRequest.php @@ -43,7 +43,7 @@ class StoreRequest extends FormRequest */ public function getAll(): array { - return ['name' => $this->convertString('name'), 'notes' => $this->stringWithNewlines('notes')]; + return ['name' => $this->convertString('name'), 'notes' => $this->stringWithNewlines('notes')]; } /** diff --git a/app/Api/V1/Requests/Models/Category/UpdateRequest.php b/app/Api/V1/Requests/Models/Category/UpdateRequest.php index 5e6da5c661..ed56278f5a 100644 --- a/app/Api/V1/Requests/Models/Category/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Category/UpdateRequest.php @@ -44,7 +44,7 @@ class UpdateRequest extends FormRequest */ public function getAll(): array { - $fields = ['name' => ['name', 'convertString'], 'notes' => ['notes', 'stringWithNewlines']]; + $fields = ['name' => ['name', 'convertString'], 'notes' => ['notes', 'stringWithNewlines']]; return $this->getAllData($fields); } diff --git a/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php b/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php index 61bf88c0ae..a88987b120 100644 --- a/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php +++ b/app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php @@ -44,7 +44,7 @@ class StoreByDateRequest extends FormRequest */ public function getAll(): array { - return ['from' => $this->get('from'), 'rates' => $this->get('rates', [])]; + return ['from' => $this->get('from'), 'rates' => $this->get('rates', [])]; } public function getFromCurrency(): TransactionCurrency @@ -59,7 +59,7 @@ class StoreByDateRequest extends FormRequest */ public function rules(): array { - return ['from' => 'required|exists:transaction_currencies,code', 'rates' => 'required|array', 'rates.*' => 'required|numeric|min:0.0000000001']; + return ['from' => 'required|exists:transaction_currencies,code', 'rates' => 'required|array', 'rates.*' => 'required|numeric|min:0.0000000001']; } public function withValidator(Validator $validator): void diff --git a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php index 1476b66391..82877be8ef 100644 --- a/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/StoreRequest.php @@ -69,7 +69,7 @@ class StoreRequest extends FormRequest ]; $recurrence = $this->getAllData($fields); - return ['recurrence' => $recurrence, 'transactions' => $this->getTransactionData(), 'repetitions' => $this->getRepetitionData()]; + return ['recurrence' => $recurrence, 'transactions' => $this->getTransactionData(), 'repetitions' => $this->getRepetitionData()]; } /** diff --git a/app/Api/V1/Requests/Models/Rule/TestRequest.php b/app/Api/V1/Requests/Models/Rule/TestRequest.php index 646515c87a..91c2d62e08 100644 --- a/app/Api/V1/Requests/Models/Rule/TestRequest.php +++ b/app/Api/V1/Requests/Models/Rule/TestRequest.php @@ -41,7 +41,7 @@ class TestRequest extends FormRequest public function getTestParameters(): array { - return ['page' => $this->getPage(), 'start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()]; + return ['page' => $this->getPage(), 'start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()]; } public function rules(): array diff --git a/app/Api/V1/Requests/Models/Rule/TriggerRequest.php b/app/Api/V1/Requests/Models/Rule/TriggerRequest.php index 95497a2c00..2b57bd910c 100644 --- a/app/Api/V1/Requests/Models/Rule/TriggerRequest.php +++ b/app/Api/V1/Requests/Models/Rule/TriggerRequest.php @@ -41,7 +41,7 @@ class TriggerRequest extends FormRequest public function getTriggerParameters(): array { - return ['start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()]; + return ['start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()]; } public function rules(): array diff --git a/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php b/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php index 8620824956..780d858926 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/TestRequest.php @@ -41,7 +41,7 @@ class TestRequest extends FormRequest public function getTestParameters(): array { - return ['start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()]; + return ['start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()]; } public function rules(): array diff --git a/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php b/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php index 5c2c84792c..776c704eaa 100644 --- a/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php +++ b/app/Api/V1/Requests/Models/RuleGroup/TriggerRequest.php @@ -41,12 +41,12 @@ class TriggerRequest extends FormRequest public function getTriggerParameters(): array { - return ['start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()]; + return ['start' => $this->getDate('start'), 'end' => $this->getDate('end'), 'accounts' => $this->getAccounts()]; } public function rules(): array { - return ['start' => 'date|after:1970-01-02|before:2038-01-17', 'end' => 'date|after_or_equal:start|after:1970-01-02|before:2038-01-17']; + return ['start' => 'date|after:1970-01-02|before:2038-01-17', 'end' => 'date|after_or_equal:start|after:1970-01-02|before:2038-01-17']; } private function getAccounts(): array diff --git a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php index a83c6435af..84974c3ca3 100644 --- a/app/Api/V1/Requests/Models/Tag/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Tag/UpdateRequest.php @@ -48,7 +48,7 @@ class UpdateRequest extends FormRequest public function getAll(): array { // This is the way. - $fields = ['tag' => ['tag', 'convertString'], 'date' => ['date', 'date'], 'description' => ['description', 'convertString']]; + $fields = ['tag' => ['tag', 'convertString'], 'date' => ['date', 'date'], 'description' => ['description', 'convertString']]; $data = $this->getAllData($fields); return $this->appendLocationData($data, null); diff --git a/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php b/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php index 983de3b6b0..71bd383107 100644 --- a/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLinkType/StoreRequest.php @@ -43,7 +43,7 @@ class StoreRequest extends FormRequest */ public function getAll(): array { - return ['name' => $this->convertString('name'), 'outward' => $this->convertString('outward'), 'inward' => $this->convertString('inward')]; + return ['name' => $this->convertString('name'), 'outward' => $this->convertString('outward'), 'inward' => $this->convertString('inward')]; } /** diff --git a/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php b/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php index 82ec1a6396..ba206ef83f 100644 --- a/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/TransactionLinkType/UpdateRequest.php @@ -45,7 +45,7 @@ class UpdateRequest extends FormRequest */ public function getAll(): array { - return ['name' => $this->convertString('name'), 'outward' => $this->convertString('outward'), 'inward' => $this->convertString('inward')]; + return ['name' => $this->convertString('name'), 'outward' => $this->convertString('outward'), 'inward' => $this->convertString('inward')]; } /** diff --git a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php index d692646ab2..0a630258d4 100644 --- a/app/Api/V1/Requests/Models/Webhook/CreateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/CreateRequest.php @@ -47,7 +47,7 @@ class CreateRequest extends FormRequest public function getData(): array { - $fields = ['title' => ['title', 'convertString'], 'active' => ['active', 'boolean'], 'url' => ['url', 'convertString']]; + $fields = ['title' => ['title', 'convertString'], 'active' => ['active', 'boolean'], 'url' => ['url', 'convertString']]; $triggers = $this->get('triggers', []); $responses = $this->get('responses', []); $deliveries = $this->get('deliveries', []); diff --git a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php index 02caae4995..cbd0c543a9 100644 --- a/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php +++ b/app/Api/V1/Requests/Models/Webhook/UpdateRequest.php @@ -47,7 +47,7 @@ class UpdateRequest extends FormRequest public function getData(): array { - $fields = ['title' => ['title', 'convertString'], 'active' => ['active', 'boolean'], 'url' => ['url', 'convertString']]; + $fields = ['title' => ['title', 'convertString'], 'active' => ['active', 'boolean'], 'url' => ['url', 'convertString']]; $triggers = $this->get('triggers', []); $responses = $this->get('responses', []); diff --git a/app/Api/V1/Requests/System/CronRequest.php b/app/Api/V1/Requests/System/CronRequest.php index 367b8aaa03..f1d54b9eba 100644 --- a/app/Api/V1/Requests/System/CronRequest.php +++ b/app/Api/V1/Requests/System/CronRequest.php @@ -48,7 +48,7 @@ class CronRequest extends FormRequest */ public function getAll(): array { - $data = ['force' => false, 'date' => today(config('app.timezone'))]; + $data = ['force' => false, 'date' => today(config('app.timezone'))]; if ($this->has('force')) { $data['force'] = $this->boolean('force'); } @@ -68,6 +68,6 @@ class CronRequest extends FormRequest */ public function rules(): array { - return ['force' => 'in:true,false', 'date' => 'nullable|date|after:1970-01-02|before:2038-01-17']; + return ['force' => 'in:true,false', 'date' => 'nullable|date|after:1970-01-02|before:2038-01-17']; } } diff --git a/app/Console/Commands/Correction/CreatesGroupMemberships.php b/app/Console/Commands/Correction/CreatesGroupMemberships.php index fc9481745d..ad332c0cdb 100644 --- a/app/Console/Commands/Correction/CreatesGroupMemberships.php +++ b/app/Console/Commands/Correction/CreatesGroupMemberships.php @@ -66,7 +66,7 @@ class CreatesGroupMemberships extends Command ->first() ; if (null === $membership) { - GroupMembership::create(['user_id' => $user->id, 'user_role_id' => $userRole->id, 'user_group_id' => $userGroup->id]); + GroupMembership::create(['user_id' => $user->id, 'user_role_id' => $userRole->id, 'user_group_id' => $userGroup->id]); } if (null === $user->user_group_id) { $user->user_group_id = $userGroup->id; diff --git a/app/Console/Commands/System/CreatesDatabase.php b/app/Console/Commands/System/CreatesDatabase.php index 9bb5f4a361..d6a8e28752 100644 --- a/app/Console/Commands/System/CreatesDatabase.php +++ b/app/Console/Commands/System/CreatesDatabase.php @@ -54,7 +54,7 @@ class CreatesDatabase extends Command } // try to set up a raw connection: $exists = false; - $dsn = sprintf('mysql:host=%s;port=%d;charset=utf8mb4',config('database.connections.mysql.host'), config('database.connections.mysql.port')); + $dsn = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', config('database.connections.mysql.host'), config('database.connections.mysql.port')); if ('' !== (string) config('database.connections.mysql.unix_socket')) { $dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', config('database.connections.mysql.unix_socket')); diff --git a/app/Console/Commands/System/CreatesFirstUser.php b/app/Console/Commands/System/CreatesFirstUser.php index 63ed750986..0763f9d72c 100644 --- a/app/Console/Commands/System/CreatesFirstUser.php +++ b/app/Console/Commands/System/CreatesFirstUser.php @@ -56,7 +56,7 @@ class CreatesFirstUser extends Command return 1; } - $data = ['blocked' => false, 'blocked_code' => null, 'email' => $this->argument('email'), 'role' => 'owner']; + $data = ['blocked' => false, 'blocked_code' => null, 'email' => $this->argument('email'), 'role' => 'owner']; $password = Str::random(24); $user = $this->repository->store($data); $user->password = Hash::make($password); diff --git a/app/Console/Commands/System/ForcesMigrations.php b/app/Console/Commands/System/ForcesMigrations.php index bbbd6c831a..479031c62e 100644 --- a/app/Console/Commands/System/ForcesMigrations.php +++ b/app/Console/Commands/System/ForcesMigrations.php @@ -78,7 +78,7 @@ class ForcesMigrations extends Command sleep(2); Schema::dropIfExists('migrations'); $this->friendlyLine('Re-run all migrations...'); - Artisan::call('migrate', ['--seed' => true, '--force' => true]); + Artisan::call('migrate', ['--seed' => true, '--force' => true]); sleep(2); $this->friendlyLine(''); $this->friendlyWarning('There is a good chance you just saw a lot of error messages.'); diff --git a/app/Console/Commands/Tools/ApplyRules.php b/app/Console/Commands/Tools/ApplyRules.php index 4f487c0cc2..c318ad0d0e 100644 --- a/app/Console/Commands/Tools/ApplyRules.php +++ b/app/Console/Commands/Tools/ApplyRules.php @@ -121,11 +121,11 @@ class ApplyRules extends Command $filterAccountList[] = $account->id; } $list = implode(',', $filterAccountList); - $ruleEngine->addOperator(['type' => 'account_id', 'value' => $list]); + $ruleEngine->addOperator(['type' => 'account_id', 'value' => $list]); // add the date as a filter: - $ruleEngine->addOperator(['type' => 'date_after', 'value' => $this->startDate->format('Y-m-d')]); - $ruleEngine->addOperator(['type' => 'date_before', 'value' => $this->endDate->format('Y-m-d')]); + $ruleEngine->addOperator(['type' => 'date_after', 'value' => $this->startDate->format('Y-m-d')]); + $ruleEngine->addOperator(['type' => 'date_before', 'value' => $this->endDate->format('Y-m-d')]); // start running rules. $this->friendlyLine(sprintf('Will apply %d rule(s) to your transaction(s).', $count)); diff --git a/app/Console/Commands/Tools/ChecksForUpdates.php b/app/Console/Commands/Tools/ChecksForUpdates.php index 218af2b64e..f9382fef71 100644 --- a/app/Console/Commands/Tools/ChecksForUpdates.php +++ b/app/Console/Commands/Tools/ChecksForUpdates.php @@ -84,7 +84,7 @@ class ChecksForUpdates extends Command } // if running develop, slightly different message. if (str_contains($version, 'develop')) { - $this->friendlyInfo(trans('firefly.update_current_dev_older', ['version' => $version, 'new_version' => $info->getNewVersion()])); + $this->friendlyInfo(trans('firefly.update_current_dev_older', ['version' => $version, 'new_version' => $info->getNewVersion()])); return Command::SUCCESS; } diff --git a/app/Console/Commands/Tools/VerifiesDatabaseConnectionTrait.php b/app/Console/Commands/Tools/VerifiesDatabaseConnectionTrait.php index e5fd504f9a..0f512ab392 100644 --- a/app/Console/Commands/Tools/VerifiesDatabaseConnectionTrait.php +++ b/app/Console/Commands/Tools/VerifiesDatabaseConnectionTrait.php @@ -35,7 +35,7 @@ trait VerifiesDatabaseConnectionTrait { $loops = 30; $loop = 0; - $queries = ['pgsql' => 'SELECT * FROM pg_catalog.pg_tables;', 'sqlite' => 'SELECT name FROM sqlite_schema;', 'mysql' => 'SHOW TABLES;']; + $queries = ['pgsql' => 'SELECT * FROM pg_catalog.pg_tables;', 'sqlite' => 'SELECT name FROM sqlite_schema;', 'mysql' => 'SHOW TABLES;']; $default = config('database.default'); if (!array_key_exists($default, $queries)) { $this->friendlyWarning(sprintf('Cannot validate database connection for "%s"', $default)); diff --git a/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php b/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php index cd33ccd94c..86912917a5 100644 --- a/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php +++ b/app/Console/Commands/Upgrade/UpgradesAccountCurrencies.php @@ -107,7 +107,7 @@ class UpgradesAccountCurrencies extends Command // both 0? set to default currency: if (0 === $accountCurrency && 0 === $obCurrency) { AccountMeta::where('account_id', $account->id)->where('name', 'currency_id')->forceDelete(); - AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $currency->id]); + AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $currency->id]); $this->friendlyInfo(sprintf('Account #%d ("%s") now has a currency setting (%s).', $account->id, $account->name, $currency->code)); ++$this->count; @@ -116,7 +116,7 @@ class UpgradesAccountCurrencies extends Command // account is set to 0, opening balance is not? if (0 === $accountCurrency && $obCurrency > 0) { - AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $obCurrency]); + AccountMeta::create(['account_id' => $account->id, 'name' => 'currency_id', 'data' => $obCurrency]); $this->friendlyInfo(sprintf('Account #%d ("%s") now has a currency setting (#%d).', $account->id, $account->name, $obCurrency)); ++$this->count; diff --git a/app/Console/Commands/Upgrade/UpgradesBillsToRules.php b/app/Console/Commands/Upgrade/UpgradesBillsToRules.php index 2ca31403bb..a1513ad4bf 100644 --- a/app/Console/Commands/Upgrade/UpgradesBillsToRules.php +++ b/app/Console/Commands/Upgrade/UpgradesBillsToRules.php @@ -113,17 +113,17 @@ class UpgradesBillsToRules extends Command 'title' => (string) trans('firefly.rule_for_bill_title', ['name' => $bill->name], $languageString), 'description' => (string) trans('firefly.rule_for_bill_description', ['name' => $bill->name], $languageString), 'trigger' => 'store-journal', - 'triggers' => [['type' => 'description_contains', 'value' => $match]], - 'actions' => [['type' => 'link_to_bill', 'value' => $bill->name]], + 'triggers' => [['type' => 'description_contains', 'value' => $match]], + 'actions' => [['type' => 'link_to_bill', 'value' => $bill->name]], ]; // two triggers or one, depends on bill content: if ($bill->amount_max === $bill->amount_min) { - $newRule['triggers'][] = ['type' => 'amount_exactly', 'value' => $bill->amount_min]; + $newRule['triggers'][] = ['type' => 'amount_exactly', 'value' => $bill->amount_min]; } if ($bill->amount_max !== $bill->amount_min) { - $newRule['triggers'][] = ['type' => 'amount_less', 'value' => $bill->amount_max]; - $newRule['triggers'][] = ['type' => 'amount_more', 'value' => $bill->amount_min]; + $newRule['triggers'][] = ['type' => 'amount_less', 'value' => $bill->amount_max]; + $newRule['triggers'][] = ['type' => 'amount_more', 'value' => $bill->amount_min]; } $this->ruleRepository->store($newRule); diff --git a/app/Console/Commands/Upgrade/UpgradesDatabase.php b/app/Console/Commands/Upgrade/UpgradesDatabase.php index 1b13a60d1f..c81956ac81 100644 --- a/app/Console/Commands/Upgrade/UpgradesDatabase.php +++ b/app/Console/Commands/Upgrade/UpgradesDatabase.php @@ -95,7 +95,7 @@ class UpgradesDatabase extends Command private function callInitialCommands(): void { $this->call('firefly-iii:verify-database-connection'); - $this->call('migrate', ['--seed' => true, '--force' => true, '--no-interaction' => true]); + $this->call('migrate', ['--seed' => true, '--force' => true, '--no-interaction' => true]); $this->call('upgrade:600-pgsql-sequences'); $this->call('upgrade:480-decrypt-all'); } diff --git a/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php b/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php index f08ccc97b1..1be87e4fbd 100644 --- a/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php +++ b/app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php @@ -94,7 +94,7 @@ class UpgradesRecurrenceMetaData extends Command $value = json_encode($array, JSON_THROW_ON_ERROR); } - RecurrenceTransactionMeta::create(['rt_id' => $firstTransaction->id, 'name' => $meta->name, 'value' => $value]); + RecurrenceTransactionMeta::create(['rt_id' => $firstTransaction->id, 'name' => $meta->name, 'value' => $value]); $meta->forceDelete(); return 1; diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 2789d6da34..339223ac27 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -117,40 +117,40 @@ class Handler extends ExceptionHandler // JSON error: Log::debug('Return JSON not found error.'); - return response()->json(['message' => 'Resource not found', 'exception' => 'NotFoundHttpException'], 404); + return response()->json(['message' => 'Resource not found', 'exception' => 'NotFoundHttpException'], 404); } if ($e instanceof AuthorizationException && $expectsJson) { // somehow Laravel handler does not catch this: Log::debug('Return JSON unauthorized error.'); - return response()->json(['message' => $e->getMessage(), 'exception' => 'AuthorizationException'], 401); + return response()->json(['message' => $e->getMessage(), 'exception' => 'AuthorizationException'], 401); } if ($e instanceof AuthenticationException && $expectsJson) { // somehow Laravel handler does not catch this: Log::debug('Return JSON unauthenticated error.'); - return response()->json(['message' => $e->getMessage(), 'exception' => 'AuthenticationException'], 401); + return response()->json(['message' => $e->getMessage(), 'exception' => 'AuthenticationException'], 401); } if ($e instanceof OAuthServerException && $expectsJson) { Log::debug('Return JSON OAuthServerException.'); // somehow Laravel handler does not catch this: - return response()->json(['message' => $e->getMessage(), 'exception' => 'OAuthServerException'], 401); + return response()->json(['message' => $e->getMessage(), 'exception' => 'OAuthServerException'], 401); } if ($e instanceof BadRequestHttpException) { Log::debug('Return JSON BadRequestHttpException.'); - return response()->json(['message' => $e->getMessage(), 'exception' => 'HttpException'], 400); + return response()->json(['message' => $e->getMessage(), 'exception' => 'HttpException'], 400); } if ($e instanceof BadHttpHeaderException) { // is always API exception. Log::debug('Return JSON BadHttpHeaderException.'); - return response()->json(['message' => $e->getMessage(), 'exception' => 'BadHttpHeaderException'], $e->statusCode); + return response()->json(['message' => $e->getMessage(), 'exception' => 'BadHttpHeaderException'], $e->statusCode); } if (($e instanceof ValidationException || $e instanceof NumberFormatException) && $expectsJson) { $errorCode = 422; @@ -197,14 +197,14 @@ class Handler extends ExceptionHandler Log::debug('Return Firefly III database exception view.'); $isDebug = config('app.debug'); - return response()->view('errors.DatabaseException', ['exception' => $e, 'debug' => $isDebug], 500); + return response()->view('errors.DatabaseException', ['exception' => $e, 'debug' => $isDebug], 500); } if ($e instanceof FireflyException || $e instanceof ErrorException || $e instanceof OAuthServerException) { Log::debug('Return Firefly III error view.'); $isDebug = config('app.debug'); - return response()->view('errors.FireflyException', ['exception' => $e, 'debug' => $isDebug], 500); + return response()->view('errors.FireflyException', ['exception' => $e, 'debug' => $isDebug], 500); } Log::debug(sprintf('Error "%s" has no Firefly III treatment, parent will handle.', $e::class)); @@ -228,7 +228,7 @@ class Handler extends ExceptionHandler return; } - $userData = ['id' => 0, 'email' => 'unknown@example.com']; + $userData = ['id' => 0, 'email' => 'unknown@example.com']; if (auth()->check()) { $userData['id'] = auth()->user()->id; $userData['email'] = auth()->user()->email; diff --git a/app/Factory/AccountMetaFactory.php b/app/Factory/AccountMetaFactory.php index b8f7b3e8ff..3cf94a4f0c 100644 --- a/app/Factory/AccountMetaFactory.php +++ b/app/Factory/AccountMetaFactory.php @@ -53,7 +53,7 @@ class AccountMetaFactory } // if $data has field and $entry is null, create new one: if (null === $entry) { - return $this->create(['account_id' => $account->id, 'name' => $field, 'data' => $value]); + return $this->create(['account_id' => $account->id, 'name' => $field, 'data' => $value]); } // if $data has field and $entry is not null, update $entry: diff --git a/app/Factory/CategoryFactory.php b/app/Factory/CategoryFactory.php index 847728d2f3..ba27c486e9 100644 --- a/app/Factory/CategoryFactory.php +++ b/app/Factory/CategoryFactory.php @@ -75,7 +75,7 @@ class CategoryFactory } try { - return Category::create(['user_id' => $this->user->id, 'user_group_id' => $this->user->user_group_id, 'name' => $categoryName]); + return Category::create(['user_id' => $this->user->id, 'user_group_id' => $this->user->user_group_id, 'name' => $categoryName]); } catch (QueryException $e) { Log::error($e->getMessage()); Log::error($e->getTraceAsString()); diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index 064d7e5d57..1ac24dc68d 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -188,7 +188,7 @@ class TransactionJournalFactory protected function storeMeta(TransactionJournal $journal, array $data, string $field): void { - $set = ['journal' => $journal, 'name' => $field, 'data' => (string) ($data[$field] ?? '')]; + $set = ['journal' => $journal, 'name' => $field, 'data' => (string) ($data[$field] ?? '')]; if (array_key_exists($field, $data) && $data[$field] instanceof Carbon) { $data[$field]->setTimezone(config('app.timezone')); Log::debug(sprintf('%s Date: %s (%s)', $field, $data[$field], $data[$field]->timezone->getName())); diff --git a/app/Generator/Chart/Basic/ChartJsGenerator.php b/app/Generator/Chart/Basic/ChartJsGenerator.php index 40e1feddc4..9604c55c82 100644 --- a/app/Generator/Chart/Basic/ChartJsGenerator.php +++ b/app/Generator/Chart/Basic/ChartJsGenerator.php @@ -39,7 +39,7 @@ class ChartJsGenerator implements GeneratorInterface */ public function multiCurrencyPieChart(array $data): array { - $chartData = ['datasets' => [0 => []], 'labels' => []]; + $chartData = ['datasets' => [0 => []], 'labels' => []]; $amounts = array_column($data, 'amount'); $next = next($amounts); @@ -117,7 +117,7 @@ class ChartJsGenerator implements GeneratorInterface unset($first, $labels); foreach ($data as $set) { - $currentSet = ['label' => $set['label'] ?? '(no label)', 'type' => $set['type'] ?? 'line', 'data' => array_values($set['entries'])]; + $currentSet = ['label' => $set['label'] ?? '(no label)', 'type' => $set['type'] ?? 'line', 'data' => array_values($set['entries'])]; if (array_key_exists('yAxisID', $set)) { $currentSet['yAxisID'] = $set['yAxisID']; } @@ -143,7 +143,7 @@ class ChartJsGenerator implements GeneratorInterface */ public function pieChart(array $data): array { - $chartData = ['datasets' => [0 => []], 'labels' => []]; + $chartData = ['datasets' => [0 => []], 'labels' => []]; // sort by value, keep keys. // different sort when values are positive and when they're negative. @@ -178,7 +178,7 @@ class ChartJsGenerator implements GeneratorInterface return [ 'count' => 1, 'labels' => array_keys($data), // take ALL labels from the first set. - 'datasets' => [['label' => $setLabel, 'data' => array_values($data)]], + 'datasets' => [['label' => $setLabel, 'data' => array_values($data)]], ]; } } diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index 65dcf1d64b..6b3d860e46 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -55,7 +55,7 @@ class MonthReportGenerator implements ReportGeneratorInterface $budgetIds = implode(',', $this->budgets->pluck('id')->toArray()); try { - $result = view('reports.budget.month', ['accountIds' => $accountIds, 'budgetIds' => $budgetIds]) + $result = view('reports.budget.month', ['accountIds' => $accountIds, 'budgetIds' => $budgetIds]) ->with('start', $this->start) ->with('end', $this->end) ->with('budgets', $this->budgets) diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index 61d4827295..a8c300049f 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -58,7 +58,7 @@ class MonthReportGenerator implements ReportGeneratorInterface // render! try { - return view('reports.category.month', ['accountIds' => $accountIds, 'categoryIds' => $categoryIds, 'reportType' => $reportType]) + return view('reports.category.month', ['accountIds' => $accountIds, 'categoryIds' => $categoryIds, 'reportType' => $reportType]) ->with('start', $this->start) ->with('end', $this->end) ->with('categories', $this->categories) diff --git a/app/Generator/Report/Tag/MonthReportGenerator.php b/app/Generator/Report/Tag/MonthReportGenerator.php index d1af280e97..4e439dd0c2 100644 --- a/app/Generator/Report/Tag/MonthReportGenerator.php +++ b/app/Generator/Report/Tag/MonthReportGenerator.php @@ -63,7 +63,7 @@ class MonthReportGenerator implements ReportGeneratorInterface // render! try { - $result = view('reports.tag.month', ['accountIds' => $accountIds, 'reportType' => $reportType, 'tagIds' => $tagIds]) + $result = view('reports.tag.month', ['accountIds' => $accountIds, 'reportType' => $reportType, 'tagIds' => $tagIds]) ->with('start', $this->start) ->with('end', $this->end) ->with('tags', $this->tags) diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index 08c74626ad..4f500a4a06 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/app/Http/Controllers/Account/CreateController.php @@ -34,11 +34,8 @@ use FireflyIII\Support\Http\Controllers\ModelInformation; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; -use Psr\Container\ContainerExceptionInterface; -use Psr\Container\NotFoundExceptionInterface; /** * Class CreateController @@ -87,7 +84,7 @@ final class CreateController extends Controller 'zoom_level' => $hasOldInput ? old('location_zoom_level') : config('firefly.default_location.zoom_level'), 'has_location' => $hasOldInput && 'true' === old('location_has_location'), ]]; - $liabilityDirections = ['debit' => trans('firefly.liability_direction_debit'), 'credit' => trans('firefly.liability_direction_credit')]; + $liabilityDirections = ['debit' => trans('firefly.liability_direction_debit'), 'credit' => trans('firefly.liability_direction_credit')]; // interest calculation periods: $interestPeriods = []; diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php index 78b02d4687..7250456812 100644 --- a/app/Http/Controllers/Account/DeleteController.php +++ b/app/Http/Controllers/Account/DeleteController.php @@ -80,7 +80,7 @@ final class DeleteController extends Controller // put previous url in session $this->rememberPreviousUrl('accounts.delete.url'); - return view('accounts.delete', ['account' => $account, 'subTitle' => $subTitle, 'accountList' => $accountList, 'objectType' => $objectType]); + return view('accounts.delete', ['account' => $account, 'subTitle' => $subTitle, 'accountList' => $accountList, 'objectType' => $objectType]); } /** diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php index 5f614799a8..0fe8a0d5eb 100644 --- a/app/Http/Controllers/Account/EditController.php +++ b/app/Http/Controllers/Account/EditController.php @@ -103,7 +103,7 @@ final class EditController extends Controller 'has_location' => $hasLocation || 'true' === old('location_has_location'), ]]; - $liabilityDirections = ['debit' => trans('firefly.liability_direction_debit'), 'credit' => trans('firefly.liability_direction_credit')]; + $liabilityDirections = ['debit' => trans('firefly.liability_direction_debit'), 'credit' => trans('firefly.liability_direction_credit')]; // interest calculation periods: $interestPeriods = []; diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 87aa2a1cf4..3cd5f9d1f8 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -121,7 +121,7 @@ final class ShowController extends Controller $currency = $accountCurrency ?? $this->primaryCurrency; $fStart = $start->isoFormat($this->monthAndDayFormat); $fEnd = $end->isoFormat($this->monthAndDayFormat); - $subTitle = (string) trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]); + $subTitle = (string) trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]); $chartUrl = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]); $firstTransaction = $this->repository->oldestJournalDate($account) ?? $start; diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 32bc369eec..34ee63ece0 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -65,6 +65,6 @@ final class HomeController extends Controller $email = $pref->data; } - return view('settings.index', ['title' => $title, 'mainTitleIcon' => $mainTitleIcon, 'email' => $email]); + return view('settings.index', ['title' => $title, 'mainTitleIcon' => $mainTitleIcon, 'email' => $email]); } } diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php index c1d8736738..34b2a278c4 100644 --- a/app/Http/Controllers/Admin/LinkController.php +++ b/app/Http/Controllers/Admin/LinkController.php @@ -77,7 +77,7 @@ final class LinkController extends Controller $this->rememberPreviousUrl('link-types.create.url'); } - return view('settings.link.create', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]); + return view('settings.link.create', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]); } /** @@ -110,7 +110,7 @@ final class LinkController extends Controller // put previous url in session $this->rememberPreviousUrl('link-types.delete.url'); - return view('settings.link.delete', ['linkType' => $linkType, 'subTitle' => $subTitle, 'moveTo' => $moveTo, 'count' => $count]); + return view('settings.link.delete', ['linkType' => $linkType, 'subTitle' => $subTitle, 'moveTo' => $moveTo, 'count' => $count]); } /** @@ -152,7 +152,7 @@ final class LinkController extends Controller } $request->session()->forget('link-types.edit.fromUpdate'); - return view('settings.link.edit', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'linkType' => $linkType]); + return view('settings.link.edit', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'linkType' => $linkType]); } /** @@ -171,7 +171,7 @@ final class LinkController extends Controller $linkType->journalCount = $this->repository->countJournals($linkType); }); - return view('settings.link.index', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'linkTypes' => $linkTypes]); + return view('settings.link.index', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'linkTypes' => $linkTypes]); } /** @@ -237,7 +237,7 @@ final class LinkController extends Controller return redirect(route('settings.links.index')); } - $data = ['name' => $request->convertString('name'), 'inward' => $request->convertString('inward'), 'outward' => $request->convertString('outward')]; + $data = ['name' => $request->convertString('name'), 'inward' => $request->convertString('inward'), 'outward' => $request->convertString('outward')]; $this->repository->update($linkType, $data); Log::channel('audit')->info(sprintf('User update link type #%d.', $linkType->id), $data); diff --git a/app/Http/Controllers/Admin/UpdateController.php b/app/Http/Controllers/Admin/UpdateController.php index 6f6d4829db..583bccfa29 100644 --- a/app/Http/Controllers/Admin/UpdateController.php +++ b/app/Http/Controllers/Admin/UpdateController.php @@ -31,7 +31,6 @@ use FireflyIII\Support\Facades\FireflyConfig; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\View\View; /** @@ -123,7 +122,7 @@ final class UpdateController extends Controller if ($release->isNewVersionAvailable()) { // if running develop, slightly different message. if (str_contains(config('firefly.version'), 'develop')) { - $message = trans('firefly.update_current_dev_older', ['version' => config('firefly.version'), 'new_version' => $release->getNewVersion()]); + $message = trans('firefly.update_current_dev_older', ['version' => config('firefly.version'), 'new_version' => $release->getNewVersion()]); } if (!str_contains(config('firefly.version'), 'develop')) { $message = trans('firefly.update_new_version_alert', [ diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index e3592895a1..036f241a66 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -79,7 +79,7 @@ final class UserController extends Controller $subTitle = (string) trans('firefly.delete_user', ['email' => $user->email]); - return view('settings.users.delete', ['user' => $user, 'subTitle' => $subTitle]); + return view('settings.users.delete', ['user' => $user, 'subTitle' => $subTitle]); } public function deleteInvite(InvitedUser $invitedUser): JsonResponse diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index fe3f1be502..7b5378544c 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -32,7 +32,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Http\Response as LaravelResponse; -use Illuminate\Routing\Redirector; use Illuminate\View\View; /** @@ -71,7 +70,7 @@ final class AttachmentController extends Controller // put previous url in session $this->rememberPreviousUrl('attachments.delete.url'); - return view('attachments.delete', ['attachment' => $attachment, 'subTitle' => $subTitle]); + return view('attachments.delete', ['attachment' => $attachment, 'subTitle' => $subTitle]); } /** @@ -141,7 +140,7 @@ final class AttachmentController extends Controller $preFilled = ['notes' => $this->repository->getNoteText($attachment)]; $request->session()->flash('preFilled', $preFilled); - return view('attachments.edit', ['attachment' => $attachment, 'subTitleIcon' => $subTitleIcon, 'subTitle' => $subTitle]); + return view('attachments.edit', ['attachment' => $attachment, 'subTitleIcon' => $subTitleIcon, 'subTitle' => $subTitle]); } /** diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 8b55d41ed1..13873ebe9f 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -130,7 +130,7 @@ final class ForgotPasswordController extends Controller $allowRegistration = false; } - return view('auth.passwords.email')->with(['allowRegistration' => $allowRegistration, 'pageTitle' => $pageTitle]); + return view('auth.passwords.email')->with(['allowRegistration' => $allowRegistration, 'pageTitle' => $pageTitle]); } /** diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 5f9fa01f96..965df84ea6 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -36,7 +36,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Foundation\Auth\RegistersUsers; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; use Psr\Container\ContainerExceptionInterface; @@ -135,7 +134,7 @@ final class RegisterController extends Controller $email = $request->old('email'); - return view('auth.register', ['isDemoSite' => $isDemoSite, 'email' => $email, 'pageTitle' => $pageTitle, 'inviteCode' => $inviteCode]); + return view('auth.register', ['isDemoSite' => $isDemoSite, 'email' => $email, 'pageTitle' => $pageTitle, 'inviteCode' => $inviteCode]); } /** @@ -161,7 +160,7 @@ final class RegisterController extends Controller $email = $request?->old('email'); - return view('auth.register', ['isDemoSite' => $isDemoSite, 'email' => $email, 'pageTitle' => $pageTitle]); + return view('auth.register', ['isDemoSite' => $isDemoSite, 'email' => $email, 'pageTitle' => $pageTitle]); } /** diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index f20986fa60..fa2c8f15d9 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -85,7 +85,7 @@ final class ResetPasswordController extends Controller return view('errors.error', ['message' => $message]); } - $rules = ['token' => 'required', 'email' => 'required|email', 'password' => 'required|confirmed|min:16|secure_password']; + $rules = ['token' => 'required', 'email' => 'required|email', 'password' => 'required|confirmed|min:16|secure_password']; $this->validate($request, $rules, $this->validationErrorMessages()); diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php index 032ea7cdf9..9da470e811 100644 --- a/app/Http/Controllers/Auth/TwoFactorController.php +++ b/app/Http/Controllers/Auth/TwoFactorController.php @@ -35,7 +35,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use PragmaRX\Google2FALaravel\Support\Authenticator; use Psr\Container\ContainerExceptionInterface; @@ -56,7 +55,7 @@ final class TwoFactorController extends Controller $siteOwner = config('firefly.site_owner'); $title = (string) trans('firefly.two_factor_forgot_title'); - return view('auth.lost-two-factor', ['user' => $user, 'siteOwner' => $siteOwner, 'title' => $title]); + return view('auth.lost-two-factor', ['user' => $user, 'siteOwner' => $siteOwner, 'title' => $title]); } /** diff --git a/app/Http/Controllers/Bill/CreateController.php b/app/Http/Controllers/Bill/CreateController.php index 5fbf7b1a00..48c3e970cd 100644 --- a/app/Http/Controllers/Bill/CreateController.php +++ b/app/Http/Controllers/Bill/CreateController.php @@ -81,7 +81,7 @@ final class CreateController extends Controller } $request->session()->forget('bills.create.fromStore'); - return view('bills.create', ['periods' => $periods, 'subTitle' => $subTitle]); + return view('bills.create', ['periods' => $periods, 'subTitle' => $subTitle]); } /** diff --git a/app/Http/Controllers/Bill/DeleteController.php b/app/Http/Controllers/Bill/DeleteController.php index 43a95ee92c..5a819264c9 100644 --- a/app/Http/Controllers/Bill/DeleteController.php +++ b/app/Http/Controllers/Bill/DeleteController.php @@ -31,7 +31,6 @@ use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\View\View; /** @@ -70,7 +69,7 @@ final class DeleteController extends Controller $this->rememberPreviousUrl('bills.delete.url'); $subTitle = (string) trans('firefly.delete_bill', ['name' => $bill->name]); - return view('bills.delete', ['bill' => $bill, 'subTitle' => $subTitle]); + return view('bills.delete', ['bill' => $bill, 'subTitle' => $subTitle]); } /** diff --git a/app/Http/Controllers/Bill/EditController.php b/app/Http/Controllers/Bill/EditController.php index 081043c1e6..94d719d06b 100644 --- a/app/Http/Controllers/Bill/EditController.php +++ b/app/Http/Controllers/Bill/EditController.php @@ -102,7 +102,7 @@ final class EditController extends Controller $request->session()->flash('preFilled', $preFilled); $request->session()->forget('bills.edit.fromUpdate'); - return view('bills.edit', ['subTitle' => $subTitle, 'periods' => $periods, 'rules' => $rules, 'bill' => $bill, 'preFilled' => $preFilled]); + return view('bills.edit', ['subTitle' => $subTitle, 'periods' => $periods, 'rules' => $rules, 'bill' => $bill, 'preFilled' => $preFilled]); } /** diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.php index 4026a7100f..07947c2c85 100644 --- a/app/Http/Controllers/Bill/IndexController.php +++ b/app/Http/Controllers/Bill/IndexController.php @@ -113,7 +113,7 @@ final class IndexController extends Controller $rules = $this->repository->getRulesForBills($collection); // make bill groups: - $bills = [0 => ['object_group_id' => 0, 'object_group_title' => (string) trans('firefly.default_group_title_name'), 'bills' => []]]; // the index is the order, not the ID. + $bills = [0 => ['object_group_id' => 0, 'object_group_title' => (string) trans('firefly.default_group_title_name'), 'bills' => []]]; // the index is the order, not the ID. /** @var Bill $bill */ foreach ($collection as $bill) { @@ -144,7 +144,7 @@ final class IndexController extends Controller $totals = $this->getTotals($sums); $today = now()->startOfDay(); - return view('bills.index', ['bills' => $bills, 'sums' => $sums, 'total' => $total, 'totals' => $totals, 'today' => $today]); + return view('bills.index', ['bills' => $bills, 'sums' => $sums, 'total' => $total, 'totals' => $totals, 'today' => $today]); } /** @@ -172,7 +172,7 @@ final class IndexController extends Controller Log::debug(sprintf('Amount per period for bill #%d "%s"', $bill['id'], $bill['name'])); Log::debug(sprintf('Average is %s', $avg)); // calculate amount per year: - $multiplies = ['yearly' => '1', 'half-year' => '2', 'quarterly' => '4', 'monthly' => '12', 'weekly' => '52.17', 'daily' => '365.24']; + $multiplies = ['yearly' => '1', 'half-year' => '2', 'quarterly' => '4', 'monthly' => '12', 'weekly' => '52.17', 'daily' => '365.24']; $yearAmount = bcmul($avg, bcdiv($multiplies[$bill['repeat_freq']], (string) ($bill['skip'] + 1))); Log::debug(sprintf('Amount per year is %s (%s * %s / %s)', $yearAmount, $avg, $multiplies[$bill['repeat_freq']], (string) ($bill['skip'] + 1))); diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.php index e8e3f1be28..d4c8ba8a0f 100644 --- a/app/Http/Controllers/Bill/ShowController.php +++ b/app/Http/Controllers/Bill/ShowController.php @@ -39,7 +39,6 @@ use FireflyIII\User; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Collection; use Illuminate\View\View; use League\Fractal\Manager; diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php index 92f809c6ea..c7b431bfbc 100644 --- a/app/Http/Controllers/Budget/BudgetLimitController.php +++ b/app/Http/Controllers/Budget/BudgetLimitController.php @@ -42,7 +42,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use Illuminate\View\View; @@ -100,7 +99,7 @@ final class BudgetLimitController extends Controller return true; }); - return view('budgets.budget-limits.create', ['start' => $start, 'end' => $end, 'currencies' => $currencies, 'budget' => $budget]); + return view('budgets.budget-limits.create', ['start' => $start, 'end' => $end, 'currencies' => $currencies, 'budget' => $budget]); } public function delete(BudgetLimit $budgetLimit): RedirectResponse @@ -118,7 +117,7 @@ final class BudgetLimitController extends Controller { $notes = $this->blRepository->getNoteText($budgetLimit); - return view('budgets.budget-limits.edit', ['budgetLimit' => $budgetLimit, 'notes' => $notes]); + return view('budgets.budget-limits.edit', ['budgetLimit' => $budgetLimit, 'notes' => $notes]); } /** @@ -128,7 +127,7 @@ final class BudgetLimitController extends Controller { $notes = $this->blRepository->getNoteText($budgetLimit); - return view('budgets.budget-limits.show', ['budgetLimit' => $budgetLimit, 'notes' => $notes]); + return view('budgets.budget-limits.show', ['budgetLimit' => $budgetLimit, 'notes' => $notes]); } /** @@ -259,7 +258,7 @@ final class BudgetLimitController extends Controller $notes = substr($notes, 0, 32768); } - $limit = $this->blRepository->update($budgetLimit, ['amount' => $amount, 'notes' => $notes]); + $limit = $this->blRepository->update($budgetLimit, ['amount' => $amount, 'notes' => $notes]); Preferences::mark(); $array = $limit->toArray(); diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php index 5693a8f5a4..21194aeea5 100644 --- a/app/Http/Controllers/Budget/CreateController.php +++ b/app/Http/Controllers/Budget/CreateController.php @@ -100,7 +100,7 @@ final class CreateController extends Controller $request->session()->forget('budgets.create.fromStore'); $subTitle = (string) trans('firefly.create_new_budget'); - return view('budgets.create', ['subTitle' => $subTitle, 'autoBudgetTypes' => $autoBudgetTypes, 'autoBudgetPeriods' => $autoBudgetPeriods]); + return view('budgets.create', ['subTitle' => $subTitle, 'autoBudgetTypes' => $autoBudgetTypes, 'autoBudgetPeriods' => $autoBudgetPeriods]); } /** diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php index f8d7d198da..156dcefcc0 100644 --- a/app/Http/Controllers/Budget/DeleteController.php +++ b/app/Http/Controllers/Budget/DeleteController.php @@ -31,7 +31,6 @@ use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\View\View; /** @@ -70,7 +69,7 @@ final class DeleteController extends Controller // put previous url in session $this->rememberPreviousUrl('budgets.delete.url'); - return view('budgets.delete', ['budget' => $budget, 'subTitle' => $subTitle]); + return view('budgets.delete', ['budget' => $budget, 'subTitle' => $subTitle]); } /** diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index df97ae1fa5..a5eb4be4d4 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -300,7 +300,7 @@ final class IndexController extends Controller private function getSums(array $budgets): array { - $sums = ['budgeted' => [], 'spent' => [], 'left' => []]; + $sums = ['budgeted' => [], 'spent' => [], 'left' => []]; /** @var array $budget */ foreach ($budgets as $budget) { diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index ad67075dc7..69214929e1 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -113,7 +113,7 @@ final class ShowController extends Controller $groups = $collector->getPaginatedGroups(); $groups->setPath(route('budgets.no-budget')); - return view('budgets.no-budget', ['groups' => $groups, 'subTitle' => $subTitle, 'periods' => $periods, 'start' => $start, 'end' => $end]); + return view('budgets.no-budget', ['groups' => $groups, 'subTitle' => $subTitle, 'periods' => $periods, 'start' => $start, 'end' => $end]); } /** @@ -147,7 +147,7 @@ final class ShowController extends Controller $groups = $collector->getPaginatedGroups(); $groups->setPath(route('budgets.no-budget-all')); - return view('budgets.no-budget', ['groups' => $groups, 'subTitle' => $subTitle, 'start' => $start, 'end' => $end]); + return view('budgets.no-budget', ['groups' => $groups, 'subTitle' => $subTitle, 'start' => $start, 'end' => $end]); } /** diff --git a/app/Http/Controllers/Category/CreateController.php b/app/Http/Controllers/Category/CreateController.php index 3d4b01570b..c2ddbbef18 100644 --- a/app/Http/Controllers/Category/CreateController.php +++ b/app/Http/Controllers/Category/CreateController.php @@ -33,7 +33,6 @@ use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; diff --git a/app/Http/Controllers/Category/DeleteController.php b/app/Http/Controllers/Category/DeleteController.php index 1e337f849c..0a7be08309 100644 --- a/app/Http/Controllers/Category/DeleteController.php +++ b/app/Http/Controllers/Category/DeleteController.php @@ -31,7 +31,6 @@ use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\View\View; /** diff --git a/app/Http/Controllers/Category/EditController.php b/app/Http/Controllers/Category/EditController.php index 490a1b097c..bfb4b25613 100644 --- a/app/Http/Controllers/Category/EditController.php +++ b/app/Http/Controllers/Category/EditController.php @@ -33,7 +33,6 @@ use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; @@ -79,7 +78,7 @@ final class EditController extends Controller $preFilled = ['notes' => $request->old('notes') ?? $this->repository->getNoteText($category)]; - return view('categories.edit', ['category' => $category, 'subTitle' => $subTitle, 'preFilled' => $preFilled]); + return view('categories.edit', ['category' => $category, 'subTitle' => $subTitle, 'preFilled' => $preFilled]); } /** diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 43c9b49550..a901c3ffe0 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -271,8 +271,8 @@ final class AccountController extends Controller foreach ($result as $row) { $budgetId = $row['budget_id']; $name = $names[$budgetId]; - $label = (string) trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]); - $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']]; + $label = (string) trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]); + $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']]; } $data = $this->generator->multiCurrencyPieChart($chartData); @@ -354,8 +354,8 @@ final class AccountController extends Controller foreach ($result as $row) { $categoryId = $row['category_id']; $name = $names[$categoryId] ?? '(unknown)'; - $label = (string) trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]); - $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']]; + $label = (string) trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]); + $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']]; } $data = $this->generator->multiCurrencyPieChart($chartData); @@ -465,8 +465,8 @@ final class AccountController extends Controller foreach ($result as $row) { $categoryId = $row['category_id']; $name = $names[$categoryId] ?? '(unknown)'; - $label = (string) trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]); - $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']]; + $label = (string) trans('firefly.name_in_currency', ['name' => $name, 'currency' => $row['currency_name']]); + $chartData[$label] = ['amount' => $row['total'], 'currency_symbol' => $row['currency_symbol'], 'currency_code' => $row['currency_code']]; } $data = $this->generator->multiCurrencyPieChart($chartData); $cache->store($data); diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php index a21475a114..a586c1efa9 100644 --- a/app/Http/Controllers/Chart/BillController.php +++ b/app/Http/Controllers/Chart/BillController.php @@ -74,7 +74,7 @@ final class BillController extends Controller foreach ($paid as $info) { $amount = $info['sum']; $label = (string) trans('firefly.paid_in_currency', ['currency' => $info['name']]); - $chartData[$label] = ['amount' => $amount, 'currency_symbol' => $info['symbol'], 'currency_code' => $info['code']]; + $chartData[$label] = ['amount' => $amount, 'currency_symbol' => $info['symbol'], 'currency_code' => $info['code']]; } /** @@ -83,7 +83,7 @@ final class BillController extends Controller foreach ($unpaid as $info) { $amount = $info['sum']; $label = (string) trans('firefly.unpaid_in_currency', ['currency' => $info['name']]); - $chartData[$label] = ['amount' => $amount, 'currency_symbol' => $info['symbol'], 'currency_code' => $info['code']]; + $chartData[$label] = ['amount' => $amount, 'currency_symbol' => $info['symbol'], 'currency_code' => $info['code']]; } $data = $this->generator->multiCurrencyPieChart($chartData); diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 70b31b50a3..f4b32fe5c5 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -257,7 +257,7 @@ final class BudgetController extends Controller $amount = $journal['foreign_amount']; } - $result[$key] ??= ['amount' => '0', 'currency_symbol' => $symbol, 'currency_code' => $code, 'currency_name' => $name]; + $result[$key] ??= ['amount' => '0', 'currency_symbol' => $symbol, 'currency_code' => $code, 'currency_name' => $name]; $result[$key]['amount'] = bcadd((string) $amount, $result[$key]['amount']); } @@ -341,7 +341,7 @@ final class BudgetController extends Controller $amount = $journal['foreign_amount']; } - $result[$key] ??= ['amount' => '0', 'currency_symbol' => $symbol, 'currency_code' => $code, 'currency_name' => $name]; + $result[$key] ??= ['amount' => '0', 'currency_symbol' => $symbol, 'currency_code' => $code, 'currency_name' => $name]; $result[$key]['amount'] = bcadd((string) $amount, $result[$key]['amount']); } @@ -427,7 +427,7 @@ final class BudgetController extends Controller $amount = $journal['foreign_amount']; } - $result[$key] ??= ['amount' => '0', 'currency_symbol' => $symbol, 'currency_code' => $code, 'currency_name' => $name]; + $result[$key] ??= ['amount' => '0', 'currency_symbol' => $symbol, 'currency_code' => $code, 'currency_name' => $name]; $result[$key]['amount'] = bcadd((string) $amount, $result[$key]['amount']); } diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 4b27ed75c0..80d491661b 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -193,7 +193,7 @@ final class ReportController extends Controller 'currency_name' => $currencyName, 'currency_decimal_places' => $currencyDecimalPlaces, ]; - $data[$currencyId][$period] ??= ['period' => $period, 'spent' => '0', 'earned' => '0']; + $data[$currencyId][$period] ??= ['period' => $period, 'spent' => '0', 'earned' => '0']; // in our outgoing? $key = 'spent'; diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index fcff7d4bf4..548cf9ec10 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -43,7 +43,6 @@ use FireflyIII\User; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; @@ -164,7 +163,7 @@ final class DebugController extends Controller $logContent = 'Truncated from this point <----|'.substr($logContent, -16384); } - return view('debug', ['table' => $table, 'now' => $now, 'logContent' => $logContent]); + return view('debug', ['table' => $table, 'now' => $now, 'logContent' => $logContent]); } public function routes(Request $request): never @@ -285,7 +284,7 @@ final class DebugController extends Controller $app = $this->getAppInfo(); $user = $this->getUserInfo(); - return (string) view('partials.debug-table', ['system' => $system, 'docker' => $docker, 'app' => $app, 'user' => $user]); + return (string) view('partials.debug-table', ['system' => $system, 'docker' => $docker, 'app' => $app, 'user' => $user]); } private function getAppInfo(): array diff --git a/app/Http/Controllers/ExchangeRates/IndexController.php b/app/Http/Controllers/ExchangeRates/IndexController.php index e0ba7765da..4b79d66b5d 100644 --- a/app/Http/Controllers/ExchangeRates/IndexController.php +++ b/app/Http/Controllers/ExchangeRates/IndexController.php @@ -58,6 +58,6 @@ final class IndexController extends Controller public function rates(TransactionCurrency $from, TransactionCurrency $to): View { - return view('exchange-rates.rates', ['from' => $from, 'to' => $to]); + return view('exchange-rates.rates', ['from' => $from, 'to' => $to]); } } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 6d361190e6..1ebd16cd29 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -91,7 +91,7 @@ final class HomeController extends Controller $label = $request->get('label'); $isCustomRange = false; - Log::debug('dateRange: Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]); + Log::debug('dateRange: Received dateRange', ['start' => $stringStart, 'end' => $stringEnd, 'label' => $request->get('label')]); // check if the label is "everything" or "Custom range" which will betray // a possible problem with the budgets. if ($label === (string) trans('firefly.everything') || $label === (string) trans('firefly.customRange')) { @@ -122,7 +122,6 @@ final class HomeController extends Controller */ public function index(AccountRepositoryInterface $repository): mixed { - $types = config('firefly.accountTypesByIdentifier.asset'); $count = $repository->count($types); Log::channel('audit')->info('User visits homepage.'); @@ -174,7 +173,7 @@ final class HomeController extends Controller $collector = app(GroupCollectorInterface::class); $collector->setAccounts(new Collection()->push($account))->withAccountInformation()->setRange($start, $end)->setLimit(10)->setPage(1); $set = $collector->getExtractedJournals(); - $transactions[] = ['transactions' => $set, 'account' => $account]; + $transactions[] = ['transactions' => $set, 'account' => $account]; } /** @var User $user */ @@ -205,6 +204,6 @@ final class HomeController extends Controller $user = auth()->user(); event(new SystemRequestedVersionCheck($user)); - return view('index', ['subTitle' => $subTitle, 'start' => $start, 'end' => $end, 'pageTitle' => $pageTitle]); + return view('index', ['subTitle' => $subTitle, 'start' => $start, 'end' => $end, 'pageTitle' => $pageTitle]); } } diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 2cf17dcf6c..1b85c7b770 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -66,7 +66,7 @@ final class JavascriptController extends Controller $accountId = $account->id; $currency = (int) $repository->getMetaValue($account, 'currency_id'); $currency = 0 === $currency ? $this->primaryCurrency->id : $currency; - $entry = ['preferredCurrency' => $currency, 'name' => $account->name]; + $entry = ['preferredCurrency' => $currency, 'name' => $account->name]; $data['accounts'][$accountId] = $entry; } @@ -84,7 +84,7 @@ final class JavascriptController extends Controller /** @var TransactionCurrency $currency */ foreach ($currencies as $currency) { $currencyId = $currency->id; - $entry = ['name' => $currency->name, 'code' => $currency->code, 'symbol' => $currency->symbol]; + $entry = ['name' => $currency->name, 'code' => $currency->code, 'symbol' => $currency->symbol]; $data['currencies'][$currencyId] = $entry; } @@ -139,7 +139,7 @@ final class JavascriptController extends Controller /** @var Carbon $end */ $end = clone session('end', today(config('app.timezone'))->endOfMonth()); - $data = ['start' => $start->format('Y-m-d'), 'end' => $end->format('Y-m-d')]; + $data = ['start' => $start->format('Y-m-d'), 'end' => $end->format('Y-m-d')]; return response()->view('v2.javascript.variables', $data)->header('Content-Type', 'text/javascript'); } diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php index 623dcbd35e..8c3ad67a1e 100644 --- a/app/Http/Controllers/Json/BoxController.php +++ b/app/Http/Controllers/Json/BoxController.php @@ -130,7 +130,7 @@ final class BoxController extends Controller $expenses[$this->primaryCurrency->id] = Amount::formatAnything($this->primaryCurrency, '0', false); } - $response = ['incomes' => $incomes, 'expenses' => $expenses, 'sums' => $sums, 'size' => count($sums), 'preferred' => $currency->id]; + $response = ['incomes' => $incomes, 'expenses' => $expenses, 'sums' => $sums, 'size' => count($sums), 'preferred' => $currency->id]; $cache->store($response); return response()->json($response); diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index 0e98caec5a..75dc1b5e54 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -157,7 +157,7 @@ final class ReconcileController extends Controller throw new FireflyException($view, 0, $e); } - $return = ['post_url' => $route, 'html' => $view]; + $return = ['post_url' => $route, 'html' => $view]; return response()->json($return); } @@ -244,7 +244,7 @@ final class ReconcileController extends Controller throw new FireflyException($html, 0, $e); } - return response()->json(['html' => $html, 'startBalance' => $startBalance, 'endBalance' => $endBalance]); + return response()->json(['html' => $html, 'startBalance' => $startBalance, 'endBalance' => $endBalance]); } private function processJournal(Account $account, TransactionCurrency $currency, array $journal, string $amount): string diff --git a/app/Http/Controllers/Json/RecurrenceController.php b/app/Http/Controllers/Json/RecurrenceController.php index b5c1e61f0f..81527aa3eb 100644 --- a/app/Http/Controllers/Json/RecurrenceController.php +++ b/app/Http/Controllers/Json/RecurrenceController.php @@ -181,7 +181,7 @@ final class RecurrenceController extends Controller $yearly = sprintf('yearly,%s', $date->format('Y-m-d')); $yearlyDate = $date->isoFormat((string) trans('config.month_and_day_no_year_js', [], $locale)); $result = [ - 'daily' => ['label' => (string) trans('firefly.recurring_daily'), 'selected' => str_starts_with($preSelected, 'daily')], + 'daily' => ['label' => (string) trans('firefly.recurring_daily'), 'selected' => str_starts_with($preSelected, 'daily')], $weekly => [ 'label' => (string) trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek]), 'selected' => str_starts_with($preSelected, 'weekly'), @@ -191,7 +191,7 @@ final class RecurrenceController extends Controller 'selected' => str_starts_with($preSelected, 'monthly'), ], $ndom => [ - 'label' => (string) trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $date->weekOfMonth]), + 'label' => (string) trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $date->weekOfMonth]), 'selected' => str_starts_with($preSelected, 'ndom'), ], $yearly => [ diff --git a/app/Http/Controllers/Json/RuleController.php b/app/Http/Controllers/Json/RuleController.php index bdac5794e0..71f9a5a0de 100644 --- a/app/Http/Controllers/Json/RuleController.php +++ b/app/Http/Controllers/Json/RuleController.php @@ -51,7 +51,7 @@ final class RuleController extends Controller } try { - $view = view('rules.partials.action', ['actions' => $actions, 'count' => $count])->render(); + $view = view('rules.partials.action', ['actions' => $actions, 'count' => $count])->render(); } catch (Throwable $e) { Log::error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage())); Log::error($e->getTraceAsString()); @@ -81,7 +81,7 @@ final class RuleController extends Controller asort($triggers); try { - $view = view('rules.partials.trigger', ['triggers' => $triggers, 'count' => $count])->render(); + $view = view('rules.partials.trigger', ['triggers' => $triggers, 'count' => $count])->render(); } catch (Throwable $e) { Log::error(sprintf('Cannot render rules.partials.trigger: %s', $e->getMessage())); Log::error($e->getTraceAsString()); diff --git a/app/Http/Controllers/ObjectGroup/DeleteController.php b/app/Http/Controllers/ObjectGroup/DeleteController.php index 8bc49ff4fa..6ec65c24da 100644 --- a/app/Http/Controllers/ObjectGroup/DeleteController.php +++ b/app/Http/Controllers/ObjectGroup/DeleteController.php @@ -67,7 +67,7 @@ final class DeleteController extends Controller // put previous url in session $this->rememberPreviousUrl('object-groups.delete.url'); - return view('object-groups.delete', ['objectGroup' => $objectGroup, 'subTitle' => $subTitle, 'piggyBanks' => $piggyBanks]); + return view('object-groups.delete', ['objectGroup' => $objectGroup, 'subTitle' => $subTitle, 'piggyBanks' => $piggyBanks]); } /** diff --git a/app/Http/Controllers/ObjectGroup/EditController.php b/app/Http/Controllers/ObjectGroup/EditController.php index b4b82f1fea..05976e40c7 100644 --- a/app/Http/Controllers/ObjectGroup/EditController.php +++ b/app/Http/Controllers/ObjectGroup/EditController.php @@ -32,7 +32,6 @@ use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\View; use Illuminate\Http\RedirectResponse; -use Illuminate\Routing\Redirector; /** * Class EditController @@ -71,7 +70,7 @@ final class EditController extends Controller } session()->forget('object-groups.edit.fromUpdate'); - return view('object-groups.edit', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'objectGroup' => $objectGroup]); + return view('object-groups.edit', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'objectGroup' => $objectGroup]); } /** diff --git a/app/Http/Controllers/ObjectGroup/IndexController.php b/app/Http/Controllers/ObjectGroup/IndexController.php index 14a5a4786c..dc432504ca 100644 --- a/app/Http/Controllers/ObjectGroup/IndexController.php +++ b/app/Http/Controllers/ObjectGroup/IndexController.php @@ -64,7 +64,7 @@ final class IndexController extends Controller $subTitle = (string) trans('firefly.object_groups_index'); $objectGroups = $this->repository->get(); - return view('object-groups.index', ['subTitle' => $subTitle, 'objectGroups' => $objectGroups]); + return view('object-groups.index', ['subTitle' => $subTitle, 'objectGroups' => $objectGroups]); } /** diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.php index 45c2954382..e78956e733 100644 --- a/app/Http/Controllers/PiggyBank/AmountController.php +++ b/app/Http/Controllers/PiggyBank/AmountController.php @@ -98,7 +98,7 @@ final class AmountController extends Controller } $total = (float) $total; // intentional float. - return view('piggy-banks.add', ['piggyBank' => $piggyBank, 'accounts' => $accounts, 'total' => $total]); + return view('piggy-banks.add', ['piggyBank' => $piggyBank, 'accounts' => $accounts, 'total' => $total]); } /** @@ -127,7 +127,7 @@ final class AmountController extends Controller $total = bcadd($total, $leftOnAccount); } - return view('piggy-banks.add-mobile', ['piggyBank' => $piggyBank, 'total' => $total, 'accounts' => $accounts]); + return view('piggy-banks.add-mobile', ['piggyBank' => $piggyBank, 'total' => $total, 'accounts' => $accounts]); } /** @@ -247,10 +247,10 @@ final class AmountController extends Controller { $accounts = []; foreach ($piggyBank->accounts as $account) { - $accounts[] = ['account' => $account, 'saved_so_far' => $this->piggyRepos->getCurrentAmount($piggyBank, $account)]; + $accounts[] = ['account' => $account, 'saved_so_far' => $this->piggyRepos->getCurrentAmount($piggyBank, $account)]; } - return view('piggy-banks.remove', ['piggyBank' => $piggyBank, 'accounts' => $accounts]); + return view('piggy-banks.remove', ['piggyBank' => $piggyBank, 'accounts' => $accounts]); } /** @@ -262,9 +262,9 @@ final class AmountController extends Controller { $accounts = []; foreach ($piggyBank->accounts as $account) { - $accounts[] = ['account' => $account, 'saved_so_far' => $this->piggyRepos->getCurrentAmount($piggyBank, $account)]; + $accounts[] = ['account' => $account, 'saved_so_far' => $this->piggyRepos->getCurrentAmount($piggyBank, $account)]; } - return view('piggy-banks.remove-mobile', ['piggyBank' => $piggyBank, 'accounts' => $accounts]); + return view('piggy-banks.remove-mobile', ['piggyBank' => $piggyBank, 'accounts' => $accounts]); } } diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php index 03e908e816..dfd408387a 100644 --- a/app/Http/Controllers/PiggyBank/CreateController.php +++ b/app/Http/Controllers/PiggyBank/CreateController.php @@ -33,7 +33,6 @@ use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; @@ -84,7 +83,7 @@ final class CreateController extends Controller } session()->forget('piggy-banks.create.fromStore'); - return view('piggy-banks.create', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'preFilled' => $preFilled]); + return view('piggy-banks.create', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'preFilled' => $preFilled]); } /** diff --git a/app/Http/Controllers/PiggyBank/DeleteController.php b/app/Http/Controllers/PiggyBank/DeleteController.php index 973b1047fe..dd29ee11fa 100644 --- a/app/Http/Controllers/PiggyBank/DeleteController.php +++ b/app/Http/Controllers/PiggyBank/DeleteController.php @@ -68,7 +68,7 @@ final class DeleteController extends Controller // put previous url in session $this->rememberPreviousUrl('piggy-banks.delete.url'); - return view('piggy-banks.delete', ['piggyBank' => $piggyBank, 'subTitle' => $subTitle]); + return view('piggy-banks.delete', ['piggyBank' => $piggyBank, 'subTitle' => $subTitle]); } /** diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.php index 6bba3f3bd6..56780433f5 100644 --- a/app/Http/Controllers/PiggyBank/EditController.php +++ b/app/Http/Controllers/PiggyBank/EditController.php @@ -33,7 +33,6 @@ use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Steam; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; diff --git a/app/Http/Controllers/PiggyBank/IndexController.php b/app/Http/Controllers/PiggyBank/IndexController.php index 3b183ddb3e..fc571cd0b4 100644 --- a/app/Http/Controllers/PiggyBank/IndexController.php +++ b/app/Http/Controllers/PiggyBank/IndexController.php @@ -89,7 +89,7 @@ final class IndexController extends Controller ksort($piggyBanks); - return view('piggy-banks.index', ['piggyBanks' => $piggyBanks, 'accounts' => $accounts]); + return view('piggy-banks.index', ['piggyBanks' => $piggyBanks, 'accounts' => $accounts]); } /** diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 1e29905f47..f20cea2280 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -40,7 +40,6 @@ use FireflyIII\User; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; use JsonException; diff --git a/app/Http/Controllers/Profile/MfaController.php b/app/Http/Controllers/Profile/MfaController.php index 613f690515..3bc5cb6e8c 100644 --- a/app/Http/Controllers/Profile/MfaController.php +++ b/app/Http/Controllers/Profile/MfaController.php @@ -38,7 +38,6 @@ use FireflyIII\User; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Cookie; use Illuminate\Support\Facades\Log; use Illuminate\View\View; @@ -144,7 +143,7 @@ final class MfaController extends Controller $subTitle = (string) trans('firefly.mfa_index_title'); $subTitleIcon = 'fa-calculator'; - return view('profile.mfa.disable-mfa')->with(['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'enabledMFA' => $enabledMFA]); + return view('profile.mfa.disable-mfa')->with(['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'enabledMFA' => $enabledMFA]); } /** @@ -212,7 +211,7 @@ final class MfaController extends Controller Preferences::set('temp-mfa-secret', $secret); - return view('profile.mfa.enable-mfa', ['image' => $image, 'secret' => $secret]); + return view('profile.mfa.enable-mfa', ['image' => $image, 'secret' => $secret]); } /** @@ -234,7 +233,7 @@ final class MfaController extends Controller // verify password. $password = $request->get('password'); - if (!auth()->validate(['email' => $user->email, 'password' => $password])) { + if (!auth()->validate(['email' => $user->email, 'password' => $password])) { session()->flash('error', 'Bad user pw, no MFA for you!'); return redirect(route('profile.mfa.index')); @@ -286,7 +285,7 @@ final class MfaController extends Controller $subTitleIcon = 'fa-calculator'; $enabledMFA = null !== auth()->user()->mfa_secret; - return view('profile.mfa.index')->with(['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'enabledMFA' => $enabledMFA]); + return view('profile.mfa.index')->with(['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'enabledMFA' => $enabledMFA]); } /** diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index fe37c93acb..c70797ec74 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -100,7 +100,7 @@ final class ProfileController extends Controller $subTitle = (string) trans('firefly.change_your_email'); $subTitleIcon = 'fa-envelope'; - return view('profile.change-email', ['title' => $title, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'email' => $email]); + return view('profile.change-email', ['title' => $title, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'email' => $email]); } /** @@ -120,7 +120,7 @@ final class ProfileController extends Controller $subTitle = (string) trans('firefly.change_your_password'); $subTitleIcon = 'fa-key'; - return view('profile.change-password', ['title' => $title, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]); + return view('profile.change-password', ['title' => $title, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]); } /** @@ -173,7 +173,7 @@ final class ProfileController extends Controller $subTitle = (string) trans('firefly.delete_account'); $subTitleIcon = 'fa-trash'; - return view('profile.delete-account', ['title' => $title, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]); + return view('profile.delete-account', ['title' => $title, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]); } /** @@ -350,7 +350,7 @@ final class ProfileController extends Controller return redirect(route('profile.index')); } - $creds = ['email' => auth()->user()->email, 'password' => $request->get('password')]; + $creds = ['email' => auth()->user()->email, 'password' => $request->get('password')]; if (Auth::once($creds)) { Auth::logoutOtherDevices($request->get('password')); session()->flash('info', (string) trans('firefly.other_sessions_logged_out')); diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php index 56d1781f97..f4f7f4eb38 100644 --- a/app/Http/Controllers/Recurring/CreateController.php +++ b/app/Http/Controllers/Recurring/CreateController.php @@ -38,7 +38,6 @@ use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php index da06d2a63f..2417c4ed42 100644 --- a/app/Http/Controllers/Recurring/DeleteController.php +++ b/app/Http/Controllers/Recurring/DeleteController.php @@ -31,7 +31,6 @@ use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\View\View; /** @@ -72,7 +71,7 @@ final class DeleteController extends Controller $journalsCreated = $this->repository->getTransactions($recurrence)->count(); - return view('recurring.delete', ['recurrence' => $recurrence, 'subTitle' => $subTitle, 'journalsCreated' => $journalsCreated]); + return view('recurring.delete', ['recurrence' => $recurrence, 'subTitle' => $subTitle, 'journalsCreated' => $journalsCreated]); } /** diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index f62b70d291..649c889be7 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -42,7 +42,6 @@ use FireflyIII\User; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php index b51be4e560..63fada0b43 100644 --- a/app/Http/Controllers/Report/BalanceController.php +++ b/app/Http/Controllers/Report/BalanceController.php @@ -66,11 +66,11 @@ final class BalanceController extends Controller */ public function general(Collection $accounts, Carbon $start, Carbon $end) { - $report = ['budgets' => [], 'accounts' => []]; + $report = ['budgets' => [], 'accounts' => []]; /** @var Account $account */ foreach ($accounts as $account) { - $report['accounts'][$account->id] = ['id' => $account->id, 'name' => $account->name, 'iban' => $account->iban, 'sum' => '0']; + $report['accounts'][$account->id] = ['id' => $account->id, 'name' => $account->name, 'iban' => $account->iban, 'sum' => '0']; } $budgets = $this->repository->getBudgets(); diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php index 5691a50098..cd99b43068 100644 --- a/app/Http/Controllers/Report/BudgetController.php +++ b/app/Http/Controllers/Report/BudgetController.php @@ -82,7 +82,7 @@ final class BudgetController extends Controller $generator->accountPerBudget(); $report = $generator->getReport(); - return view('reports.budget.partials.account-per-budget', ['report' => $report, 'budgets' => $budgets]); + return view('reports.budget.partials.account-per-budget', ['report' => $report, 'budgets' => $budgets]); } /** @@ -97,7 +97,7 @@ final class BudgetController extends Controller /** @var Account $account */ foreach ($accounts as $account) { $accountId = $account->id; - $report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; + $report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; } // loop expenses. @@ -129,7 +129,7 @@ final class BudgetController extends Controller } } - return view('reports.budget.partials.accounts', ['sums' => $sums, 'report' => $report]); + return view('reports.budget.partials.accounts', ['sums' => $sums, 'report' => $report]); } /** @@ -195,7 +195,7 @@ final class BudgetController extends Controller /** @var Budget $budget */ foreach ($budgets as $budget) { $budgetId = $budget->id; - $report[$budgetId] ??= ['name' => $budget->name, 'id' => $budget->id, 'currencies' => []]; + $report[$budgetId] ??= ['name' => $budget->name, 'id' => $budget->id, 'currencies' => []]; } foreach ($spent as $currency) { $currencyId = $currency['currency_id']; @@ -243,7 +243,7 @@ final class BudgetController extends Controller } } - return view('reports.budget.partials.budgets', ['sums' => $sums, 'report' => $report]); + return view('reports.budget.partials.budgets', ['sums' => $sums, 'report' => $report]); } /** @@ -330,7 +330,7 @@ final class BudgetController extends Controller } try { - $result = view('reports.partials.budget-period', ['report' => $report, 'periods' => $periods])->render(); + $result = view('reports.partials.budget-period', ['report' => $report, 'periods' => $periods])->render(); } catch (Throwable $e) { Log::error(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage())); Log::error($e->getTraceAsString()); diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index 6e087d2be4..7b8e79975b 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -76,7 +76,7 @@ final class CategoryController extends Controller /** @var Account $account */ foreach ($accounts as $account) { $accountId = $account->id; - $report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; + $report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; } // loop expenses. @@ -143,7 +143,7 @@ final class CategoryController extends Controller } } - return view('reports.category.partials.account-per-category', ['report' => $report, 'categories' => $categories]); + return view('reports.category.partials.account-per-category', ['report' => $report, 'categories' => $categories]); } /** @@ -161,7 +161,7 @@ final class CategoryController extends Controller /** @var Account $account */ foreach ($accounts as $account) { $accountId = $account->id; - $report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; + $report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; } // loop expenses. @@ -240,7 +240,7 @@ final class CategoryController extends Controller } } - return view('reports.category.partials.accounts', ['sums' => $sums, 'report' => $report]); + return view('reports.category.partials.accounts', ['sums' => $sums, 'report' => $report]); } /** @@ -358,7 +358,7 @@ final class CategoryController extends Controller /** @var Category $category */ foreach ($categories as $category) { $categoryId = $category->id; - $report[$categoryId] ??= ['name' => $category->name, 'id' => $category->id, 'currencies' => []]; + $report[$categoryId] ??= ['name' => $category->name, 'id' => $category->id, 'currencies' => []]; } foreach ($spent as $currency) { $currencyId = $currency['currency_id']; @@ -444,7 +444,7 @@ final class CategoryController extends Controller } } - return view('reports.category.partials.categories', ['sums' => $sums, 'report' => $report]); + return view('reports.category.partials.categories', ['sums' => $sums, 'report' => $report]); } /** @@ -510,7 +510,7 @@ final class CategoryController extends Controller $report = $data; try { - $result = view('reports.partials.category-period', ['report' => $report, 'periods' => $periods])->render(); + $result = view('reports.partials.category-period', ['report' => $report, 'periods' => $periods])->render(); } catch (Throwable $e) { Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); $result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage()); @@ -582,7 +582,7 @@ final class CategoryController extends Controller $report = $data; try { - $result = view('reports.partials.category-period', ['report' => $report, 'periods' => $periods])->render(); + $result = view('reports.partials.category-period', ['report' => $report, 'periods' => $periods])->render(); } catch (Throwable $e) { Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage())); $result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage()); diff --git a/app/Http/Controllers/Report/DoubleController.php b/app/Http/Controllers/Report/DoubleController.php index 31a0cdb66e..c92e8b33ff 100644 --- a/app/Http/Controllers/Report/DoubleController.php +++ b/app/Http/Controllers/Report/DoubleController.php @@ -275,7 +275,7 @@ final class DoubleController extends Controller } } - return view('reports.double.partials.accounts', ['sums' => $sums, 'report' => $report]); + return view('reports.double.partials.accounts', ['sums' => $sums, 'report' => $report]); } /** @@ -370,7 +370,7 @@ final class DoubleController extends Controller } } - return view('reports.double.partials.accounts-per-asset', ['sums' => $sums, 'report' => $report]); + return view('reports.double.partials.accounts-per-asset', ['sums' => $sums, 'report' => $report]); } /** diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php index 8ab086b837..e55f14fcf8 100644 --- a/app/Http/Controllers/Report/OperationsController.php +++ b/app/Http/Controllers/Report/OperationsController.php @@ -77,7 +77,7 @@ final class OperationsController extends Controller $type = 'expense-entry'; try { - $result = view('reports.partials.income-expenses', ['report' => $report, 'type' => $type])->render(); + $result = view('reports.partials.income-expenses', ['report' => $report, 'type' => $type])->render(); } catch (Throwable $e) { Log::error(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage())); Log::error($e->getTraceAsString()); @@ -111,7 +111,7 @@ final class OperationsController extends Controller $type = 'income-entry'; try { - $result = view('reports.partials.income-expenses', ['report' => $report, 'type' => $type])->render(); + $result = view('reports.partials.income-expenses', ['report' => $report, 'type' => $type])->render(); } catch (Throwable $e) { Log::error(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage())); Log::error($e->getTraceAsString()); diff --git a/app/Http/Controllers/Report/TagController.php b/app/Http/Controllers/Report/TagController.php index 8656d57f34..6fc5bd65fe 100644 --- a/app/Http/Controllers/Report/TagController.php +++ b/app/Http/Controllers/Report/TagController.php @@ -70,7 +70,7 @@ final class TagController extends Controller /** @var Account $account */ foreach ($accounts as $account) { $accountId = $account->id; - $report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; + $report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; } // loop expenses. @@ -90,7 +90,7 @@ final class TagController extends Controller 'tags' => [], ]; - $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tagId] ??= ['spent' => '0', 'earned' => '0', 'sum' => '0']; + $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tagId] ??= ['spent' => '0', 'earned' => '0', 'sum' => '0']; $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tagId]['spent'] = bcadd( $report[$sourceAccountId]['currencies'][$currencyId]['tags'][$tagId]['spent'], (string) $journal['amount'] @@ -118,7 +118,7 @@ final class TagController extends Controller 'currency_decimal_places' => $currency['currency_decimal_places'], 'tags' => [], ]; - $report[$destinationId]['currencies'][$currencyId]['tags'][$tagId] ??= ['spent' => '0', 'earned' => '0', 'sum' => '0']; + $report[$destinationId]['currencies'][$currencyId]['tags'][$tagId] ??= ['spent' => '0', 'earned' => '0', 'sum' => '0']; $report[$destinationId]['currencies'][$currencyId]['tags'][$tagId]['earned'] = bcadd( $report[$destinationId]['currencies'][$currencyId]['tags'][$tagId]['earned'], (string) $journal['amount'] @@ -131,7 +131,7 @@ final class TagController extends Controller } } - return view('reports.tag.partials.account-per-tag', ['report' => $report, 'tags' => $tags]); + return view('reports.tag.partials.account-per-tag', ['report' => $report, 'tags' => $tags]); } /** @@ -149,7 +149,7 @@ final class TagController extends Controller /** @var Account $account */ foreach ($accounts as $account) { $accountId = $account->id; - $report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; + $report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; } // loop expenses. @@ -228,7 +228,7 @@ final class TagController extends Controller } } - return view('reports.tag.partials.accounts', ['sums' => $sums, 'report' => $report]); + return view('reports.tag.partials.accounts', ['sums' => $sums, 'report' => $report]); } /** @@ -346,7 +346,7 @@ final class TagController extends Controller /** @var Tag $tag */ foreach ($tags as $tag) { $tagId = $tag->id; - $report[$tagId] ??= ['name' => $tag->tag, 'id' => $tag->id, 'currencies' => []]; + $report[$tagId] ??= ['name' => $tag->tag, 'id' => $tag->id, 'currencies' => []]; } foreach ($spent as $currency) { $currencyId = $currency['currency_id']; @@ -436,7 +436,7 @@ final class TagController extends Controller } } - return view('reports.tag.partials.tags', ['sums' => $sums, 'report' => $report]); + return view('reports.tag.partials.tags', ['sums' => $sums, 'report' => $report]); } /** diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 0181ab2eb3..aa923a6d6d 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -37,7 +37,6 @@ use FireflyIII\Support\Http\Controllers\RenderPartialViews; use Illuminate\Contracts\View\Factory; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; -use Illuminate\Routing\Redirector; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use Illuminate\View\View; diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php index bdcedba501..6ae063ab5c 100644 --- a/app/Http/Controllers/Rule/CreateController.php +++ b/app/Http/Controllers/Rule/CreateController.php @@ -40,7 +40,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\View\View; /** @@ -95,13 +94,13 @@ final class CreateController extends Controller if (count($words) > 0) { session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => implode('', $words)])); foreach ($words as $word) { - $operators[] = ['type' => 'description_contains', 'value' => $word]; + $operators[] = ['type' => 'description_contains', 'value' => $word]; } } if (count($excludedWords) > 0) { session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => implode('', $excludedWords)])); foreach ($excludedWords as $excludedWord) { - $operators[] = ['type' => '-description_contains', 'value' => $excludedWord]; + $operators[] = ['type' => '-description_contains', 'value' => $excludedWord]; } } $oldTriggers = $this->parseFromOperators($operators); diff --git a/app/Http/Controllers/Rule/DeleteController.php b/app/Http/Controllers/Rule/DeleteController.php index bc420f1a4a..4975c863c3 100644 --- a/app/Http/Controllers/Rule/DeleteController.php +++ b/app/Http/Controllers/Rule/DeleteController.php @@ -69,7 +69,7 @@ final class DeleteController extends Controller // put previous url in session $this->rememberPreviousUrl('rules.delete.url'); - return view('rules.rule.delete', ['rule' => $rule, 'subTitle' => $subTitle]); + return view('rules.rule.delete', ['rule' => $rule, 'subTitle' => $subTitle]); } /** diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php index 6426e031ab..6a6146445e 100644 --- a/app/Http/Controllers/Rule/EditController.php +++ b/app/Http/Controllers/Rule/EditController.php @@ -37,7 +37,6 @@ use FireflyIII\Support\Search\SearchInterface; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; use Throwable; @@ -94,13 +93,13 @@ final class EditController extends Controller if (count($words) > 0) { session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => implode('', $words)])); foreach ($words as $word) { - $operators[] = ['type' => 'description_contains', 'value' => $word]; + $operators[] = ['type' => 'description_contains', 'value' => $word]; } } if (count($excludedWords) > 0) { session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => implode('', $excludedWords)])); foreach ($excludedWords as $excludedWord) { - $operators[] = ['type' => '-description_contains', 'value' => $excludedWord]; + $operators[] = ['type' => '-description_contains', 'value' => $excludedWord]; } } $oldTriggers = $this->parseFromOperators($operators); @@ -130,7 +129,7 @@ final class EditController extends Controller // get rule trigger for update / store-journal: $primaryTrigger = $this->ruleRepos->getPrimaryTrigger($rule); - $subTitle = (string) trans('firefly.edit_rule', ['nr' => $rule->order, 'title' => $rule->title]); + $subTitle = (string) trans('firefly.edit_rule', ['nr' => $rule->order, 'title' => $rule->title]); // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('rules.edit.fromUpdate')) { diff --git a/app/Http/Controllers/Rule/IndexController.php b/app/Http/Controllers/Rule/IndexController.php index 9be63ba5a0..28492aeeae 100644 --- a/app/Http/Controllers/Rule/IndexController.php +++ b/app/Http/Controllers/Rule/IndexController.php @@ -87,7 +87,7 @@ final class IndexController extends Controller { $route = route('search.index'); $query = $this->ruleRepos->getSearchQuery($rule); - $route = sprintf('%s?%s', $route, http_build_query(['search' => $query, 'rule' => $rule->id])); + $route = sprintf('%s?%s', $route, http_build_query(['search' => $query, 'rule' => $rule->id])); return redirect($route); } diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.php index e5d10a9cfc..6291467285 100644 --- a/app/Http/Controllers/Rule/SelectController.php +++ b/app/Http/Controllers/Rule/SelectController.php @@ -80,15 +80,15 @@ final class SelectController extends Controller // add date operators. if (null !== $request->get('start')) { $startDate = new Carbon($request->get('start')); - $newRuleEngine->addOperator(['type' => 'date_after', 'value' => $startDate->format('Y-m-d')]); + $newRuleEngine->addOperator(['type' => 'date_after', 'value' => $startDate->format('Y-m-d')]); } if (null !== $request->get('end')) { $endDate = new Carbon($request->get('end')); - $newRuleEngine->addOperator(['type' => 'date_before', 'value' => $endDate->format('Y-m-d')]); + $newRuleEngine->addOperator(['type' => 'date_before', 'value' => $endDate->format('Y-m-d')]); } // add extra operators: - $newRuleEngine->addOperator(['type' => 'account_id', 'value' => $accounts]); + $newRuleEngine->addOperator(['type' => 'account_id', 'value' => $accounts]); // set rules: $newRuleEngine->setRules(new Collection()->push($rule)); @@ -113,7 +113,7 @@ final class SelectController extends Controller // does the user have shared accounts? $subTitle = (string) trans('firefly.apply_rule_selection', ['title' => $rule->title]); - return view('rules.rule.select-transactions', ['rule' => $rule, 'subTitle' => $subTitle]); + return view('rules.rule.select-transactions', ['rule' => $rule, 'subTitle' => $subTitle]); } /** @@ -136,7 +136,7 @@ final class SelectController extends Controller // warn if nothing. if (0 === count($textTriggers)) { - return response()->json(['html' => '', 'warning' => (string) trans('firefly.warning_no_valid_triggers')]); + return response()->json(['html' => '', 'warning' => (string) trans('firefly.warning_no_valid_triggers')]); } foreach ($textTriggers as $textTrigger) { @@ -185,7 +185,7 @@ final class SelectController extends Controller throw new FireflyException($view, 0, $exception); } - return response()->json(['html' => $view, 'warning' => $warning]); + return response()->json(['html' => $view, 'warning' => $warning]); } /** @@ -199,7 +199,7 @@ final class SelectController extends Controller $triggers = $rule->ruleTriggers; if (0 === count($triggers)) { - return response()->json(['html' => '', 'warning' => (string) trans('firefly.warning_no_valid_triggers')]); + return response()->json(['html' => '', 'warning' => (string) trans('firefly.warning_no_valid_triggers')]); } // create new rule engine: $newRuleEngine = app(RuleEngineInterface::class); @@ -227,6 +227,6 @@ final class SelectController extends Controller throw new FireflyException($message, 0, $exception); } - return response()->json(['html' => $view, 'warning' => $warning]); + return response()->json(['html' => $view, 'warning' => $warning]); } } diff --git a/app/Http/Controllers/RuleGroup/CreateController.php b/app/Http/Controllers/RuleGroup/CreateController.php index 0de5cf5a2e..bcb762dcf7 100644 --- a/app/Http/Controllers/RuleGroup/CreateController.php +++ b/app/Http/Controllers/RuleGroup/CreateController.php @@ -30,7 +30,6 @@ use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; -use Illuminate\Routing\Redirector; use Illuminate\View\View; /** @@ -74,7 +73,7 @@ final class CreateController extends Controller } session()->forget('rule-groups.create.fromStore'); - return view('rules.rule-group.create', ['subTitleIcon' => $subTitleIcon, 'subTitle' => $subTitle]); + return view('rules.rule-group.create', ['subTitleIcon' => $subTitleIcon, 'subTitle' => $subTitle]); } /** diff --git a/app/Http/Controllers/RuleGroup/DeleteController.php b/app/Http/Controllers/RuleGroup/DeleteController.php index 1dca508078..024d6605a5 100644 --- a/app/Http/Controllers/RuleGroup/DeleteController.php +++ b/app/Http/Controllers/RuleGroup/DeleteController.php @@ -31,7 +31,6 @@ use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\View\View; /** @@ -71,7 +70,7 @@ final class DeleteController extends Controller // put previous url in session $this->rememberPreviousUrl('rule-groups.delete.url'); - return view('rules.rule-group.delete', ['ruleGroup' => $ruleGroup, 'subTitle' => $subTitle]); + return view('rules.rule-group.delete', ['ruleGroup' => $ruleGroup, 'subTitle' => $subTitle]); } /** diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.php index 28c973b564..d36157e0ed 100644 --- a/app/Http/Controllers/RuleGroup/EditController.php +++ b/app/Http/Controllers/RuleGroup/EditController.php @@ -33,7 +33,6 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\View\View; /** @@ -78,7 +77,7 @@ final class EditController extends Controller session()->forget('rule-groups.edit.fromUpdate'); session()->flash('preFilled', $preFilled); - return view('rules.rule-group.edit', ['ruleGroup' => $ruleGroup, 'subTitle' => $subTitle]); + return view('rules.rule-group.edit', ['ruleGroup' => $ruleGroup, 'subTitle' => $subTitle]); } /** diff --git a/app/Http/Controllers/RuleGroup/ExecutionController.php b/app/Http/Controllers/RuleGroup/ExecutionController.php index a6883c45f8..0017fdaafb 100644 --- a/app/Http/Controllers/RuleGroup/ExecutionController.php +++ b/app/Http/Controllers/RuleGroup/ExecutionController.php @@ -84,15 +84,15 @@ final class ExecutionController extends Controller // add date operators. if (null !== $request->get('start')) { $startDate = new Carbon($request->get('start')); - $newRuleEngine->addOperator(['type' => 'date_after', 'value' => $startDate->format('Y-m-d')]); + $newRuleEngine->addOperator(['type' => 'date_after', 'value' => $startDate->format('Y-m-d')]); } if (null !== $request->get('end')) { $endDate = new Carbon($request->get('end')); - $newRuleEngine->addOperator(['type' => 'date_before', 'value' => $endDate->format('Y-m-d')]); + $newRuleEngine->addOperator(['type' => 'date_before', 'value' => $endDate->format('Y-m-d')]); } // add extra operators: - $newRuleEngine->addOperator(['type' => 'account_id', 'value' => $accounts]); + $newRuleEngine->addOperator(['type' => 'account_id', 'value' => $accounts]); // set rules: $rules = $this->ruleGroupRepository->getActiveRules($ruleGroup); @@ -116,6 +116,6 @@ final class ExecutionController extends Controller { $subTitle = (string) trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]); - return view('rules.rule-group.select-transactions', ['ruleGroup' => $ruleGroup, 'subTitle' => $subTitle]); + return view('rules.rule-group.select-transactions', ['ruleGroup' => $ruleGroup, 'subTitle' => $subTitle]); } } diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 3287c2f109..7d658abb3e 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -128,7 +128,7 @@ final class SearchController extends Controller $groups->setPath($url); try { - $html = view('search.search', ['groups' => $groups, 'hasPages' => $hasPages, 'searchTime' => $searchTime])->render(); + $html = view('search.search', ['groups' => $groups, 'hasPages' => $hasPages, 'searchTime' => $searchTime])->render(); } catch (Throwable $e) { Log::error(sprintf('Cannot render search.search: %s', $e->getMessage())); Log::error($e->getTraceAsString()); @@ -137,6 +137,6 @@ final class SearchController extends Controller throw new FireflyException($html, 0, $e); } - return response()->json(['count' => $groups->count(), 'html' => $html]); + return response()->json(['count' => $groups->count(), 'html' => $html]); } } diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index dd27fc6936..832909f84e 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -59,7 +59,7 @@ final class InstallController extends Controller // there are 5 initial commands // Check 4 places: InstallController, Docker image, UpgradeDatabase, composer.json 'firefly-iii:create-database' => [], - 'migrate' => ['--seed' => true, '--force' => true], + 'migrate' => ['--seed' => true, '--force' => true], 'generate-keys' => [], // an exception :( 'firefly-iii:upgrade-database' => [], 'firefly-iii:set-latest-version' => ['--james-is-cool' => true], @@ -102,7 +102,7 @@ final class InstallController extends Controller public function runCommand(Request $request): JsonResponse { $requestIndex = (int) $request->get('index'); - $response = ['hasNextCommand' => false, 'done' => true, 'previous' => null, 'error' => false, 'errorMessage' => null]; + $response = ['hasNextCommand' => false, 'done' => true, 'previous' => null, 'error' => false, 'errorMessage' => null]; Log::debug(sprintf('Will now run commands. Request index is %d', $requestIndex)); $indexes = array_keys($this->upgradeCommands); diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 29ac17e82b..5ed3a8e5bd 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -95,7 +95,7 @@ final class TagController extends Controller } session()->forget('tags.create.fromStore'); - return view('tags.create', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'locations' => $locations]); + return view('tags.create', ['subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'locations' => $locations]); } /** @@ -110,7 +110,7 @@ final class TagController extends Controller // put previous url in session $this->rememberPreviousUrl('tags.delete.url'); - return view('tags.delete', ['tag' => $tag, 'subTitle' => $subTitle]); + return view('tags.delete', ['tag' => $tag, 'subTitle' => $subTitle]); } /** @@ -155,7 +155,7 @@ final class TagController extends Controller } session()->forget('tags.edit.fromUpdate'); - return view('tags.edit', ['tag' => $tag, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'locations' => $locations]); + return view('tags.edit', ['tag' => $tag, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon, 'locations' => $locations]); } /** @@ -187,7 +187,7 @@ final class TagController extends Controller } $count = $repository->count(); - return view('tags.index', ['tags' => $tags, 'count' => $count]); + return view('tags.index', ['tags' => $tags, 'count' => $count]); } public function massDestroy(Request $request): RedirectResponse diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index c6f7a9b6a5..5c0e872966 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -36,7 +36,6 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Support\Facades\Preferences; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; -use Illuminate\Routing\Redirector; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Log; use Illuminate\View\View; @@ -84,7 +83,7 @@ final class BulkController extends Controller $budgetRepos = app(BudgetRepositoryInterface::class); $budgetList = app('expandedform')->makeSelectListWithEmpty($budgetRepos->getActiveBudgets()); - return view('transactions.bulk.edit', ['journals' => $journals, 'subTitle' => $subTitle, 'budgetList' => $budgetList]); + return view('transactions.bulk.edit', ['journals' => $journals, 'subTitle' => $subTitle, 'budgetList' => $budgetList]); } /** diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index 266f2256b6..29be4fda26 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -193,8 +193,8 @@ final class ConvertController extends Controller $sourceName = '' === $sourceName ? null : (string) $sourceName; $destinationId = '' === $destinationId || null === $destinationId ? null : (int) $destinationId; $destinationName = '' === $destinationName ? null : (string) $destinationName; - $validSource = $validator->validateSource(['id' => $sourceId, 'name' => $sourceName]); - $validDestination = $validator->validateDestination(['id' => $destinationId, 'name' => $destinationName]); + $validSource = $validator->validateSource(['id' => $sourceId, 'name' => $sourceName]); + $validDestination = $validator->validateDestination(['id' => $destinationId, 'name' => $destinationName]); if (false === $validSource) { throw new FireflyException(sprintf(trans('firefly.convert_invalid_source'), $journal->id)); diff --git a/app/Http/Controllers/Transaction/IndexController.php b/app/Http/Controllers/Transaction/IndexController.php index b11c67c82a..e09f0d3025 100644 --- a/app/Http/Controllers/Transaction/IndexController.php +++ b/app/Http/Controllers/Transaction/IndexController.php @@ -98,7 +98,7 @@ final class IndexController extends Controller [$start, $end] = $end < $start ? [$end, $start] : [$start, $end]; $startStr = $start->isoFormat($this->monthAndDayFormat); $endStr = $end->isoFormat($this->monthAndDayFormat); - $subTitle = (string) trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]); + $subTitle = (string) trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]); $path = route('transactions.index', [$objectType, $start->format('Y-m-d'), $end->format('Y-m-d')]); $firstJournal = $this->repository->firstNull(); $startPeriod = $firstJournal instanceof TransactionJournal ? $firstJournal->date : new Carbon(); diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php index 2e42cce48b..5bba56d499 100644 --- a/app/Http/Controllers/Transaction/LinkController.php +++ b/app/Http/Controllers/Transaction/LinkController.php @@ -34,7 +34,6 @@ use FireflyIII\Support\Facades\Steam; use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View; @@ -75,7 +74,7 @@ final class LinkController extends Controller $subTitle = (string) trans('breadcrumbs.delete_journal_link'); $this->rememberPreviousUrl('journal_links.delete.url'); - return view('transactions.links.delete', ['link' => $link, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]); + return view('transactions.links.delete', ['link' => $link, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]); } /** @@ -98,7 +97,7 @@ final class LinkController extends Controller { $linkTypes = $this->repository->get(); - return view('transactions.links.modal', ['journal' => $journal, 'linkTypes' => $linkTypes]); + return view('transactions.links.modal', ['journal' => $journal, 'linkTypes' => $linkTypes]); } /** diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 23796e3cee..775fbd676a 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -43,7 +43,6 @@ use FireflyIII\Services\Internal\Update\JournalUpdateService; use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Steam; use Illuminate\Http\RedirectResponse; -use Illuminate\Routing\Redirector; use Illuminate\Support\Facades\Log; use Illuminate\View\View as IlluminateView; use InvalidArgumentException; diff --git a/app/Http/Controllers/Transaction/ShowController.php b/app/Http/Controllers/Transaction/ShowController.php index 4c47d1571e..df0b9fe158 100644 --- a/app/Http/Controllers/Transaction/ShowController.php +++ b/app/Http/Controllers/Transaction/ShowController.php @@ -165,7 +165,7 @@ final class ShowController extends Controller private function getAccounts(array $group): array { - $accounts = ['source' => [], 'destination' => []]; + $accounts = ['source' => [], 'destination' => []]; foreach ($group['transactions'] as $transaction) { $accounts['source'][] = [ diff --git a/app/Http/Controllers/TransactionCurrency/CreateController.php b/app/Http/Controllers/TransactionCurrency/CreateController.php index 321b58a6c0..9abc826cc2 100644 --- a/app/Http/Controllers/TransactionCurrency/CreateController.php +++ b/app/Http/Controllers/TransactionCurrency/CreateController.php @@ -89,7 +89,7 @@ final class CreateController extends Controller Log::channel('audit')->info('Create new currency.'); - return view('currencies.create', ['subTitleIcon' => $subTitleIcon, 'subTitle' => $subTitle]); + return view('currencies.create', ['subTitleIcon' => $subTitleIcon, 'subTitle' => $subTitle]); } /** diff --git a/app/Http/Controllers/TransactionCurrency/EditController.php b/app/Http/Controllers/TransactionCurrency/EditController.php index 26c62bf1d1..f3b6fadc27 100644 --- a/app/Http/Controllers/TransactionCurrency/EditController.php +++ b/app/Http/Controllers/TransactionCurrency/EditController.php @@ -102,7 +102,7 @@ final class EditController extends Controller } $request->session()->forget('currencies.edit.fromUpdate'); - return view('currencies.edit', ['currency' => $currency, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]); + return view('currencies.edit', ['currency' => $currency, 'subTitle' => $subTitle, 'subTitleIcon' => $subTitleIcon]); } /** diff --git a/app/Http/Controllers/TransactionCurrency/IndexController.php b/app/Http/Controllers/TransactionCurrency/IndexController.php index 68523fad38..3ccdbe29e7 100644 --- a/app/Http/Controllers/TransactionCurrency/IndexController.php +++ b/app/Http/Controllers/TransactionCurrency/IndexController.php @@ -93,6 +93,6 @@ final class IndexController extends Controller $isOwner = false; } - return view('currencies.index', ['currencies' => $currencies, 'isOwner' => $isOwner]); + return view('currencies.index', ['currencies' => $currencies, 'isOwner' => $isOwner]); } } diff --git a/app/Http/Controllers/UserGroup/CreateController.php b/app/Http/Controllers/UserGroup/CreateController.php index 59197dfda1..2e77cb33bf 100644 --- a/app/Http/Controllers/UserGroup/CreateController.php +++ b/app/Http/Controllers/UserGroup/CreateController.php @@ -42,6 +42,6 @@ final class CreateController extends Controller $mainTitleIcon = 'fa-book'; Log::debug(sprintf('Now at %s', __METHOD__)); - return view('administrations.create')->with(['title' => $title, 'subTitle' => $subTitle, 'mainTitleIcon' => $mainTitleIcon]); + return view('administrations.create')->with(['title' => $title, 'subTitle' => $subTitle, 'mainTitleIcon' => $mainTitleIcon]); } } diff --git a/app/Http/Controllers/UserGroup/EditController.php b/app/Http/Controllers/UserGroup/EditController.php index 7340b934fd..123fb1b612 100644 --- a/app/Http/Controllers/UserGroup/EditController.php +++ b/app/Http/Controllers/UserGroup/EditController.php @@ -43,6 +43,6 @@ final class EditController extends Controller $mainTitleIcon = 'fa-book'; Log::debug(sprintf('Now at %s', __METHOD__)); - return view('administrations.edit')->with(['title' => $title, 'subTitle' => $subTitle, 'mainTitleIcon' => $mainTitleIcon]); + return view('administrations.edit')->with(['title' => $title, 'subTitle' => $subTitle, 'mainTitleIcon' => $mainTitleIcon]); } } diff --git a/app/Http/Controllers/UserGroup/IndexController.php b/app/Http/Controllers/UserGroup/IndexController.php index 8a02f67fbb..57d17ff506 100644 --- a/app/Http/Controllers/UserGroup/IndexController.php +++ b/app/Http/Controllers/UserGroup/IndexController.php @@ -44,6 +44,6 @@ final class IndexController extends Controller $mainTitleIcon = 'fa-book'; Log::debug(sprintf('Now at %s', __METHOD__)); - return view('administrations.index')->with(['title' => $title, 'subTitle' => $subTitle, 'mainTitleIcon' => $mainTitleIcon]); + return view('administrations.index')->with(['title' => $title, 'subTitle' => $subTitle, 'mainTitleIcon' => $mainTitleIcon]); } } diff --git a/app/Http/Controllers/Webhooks/DeleteController.php b/app/Http/Controllers/Webhooks/DeleteController.php index 2309d28cac..e3b5931a9b 100644 --- a/app/Http/Controllers/Webhooks/DeleteController.php +++ b/app/Http/Controllers/Webhooks/DeleteController.php @@ -66,6 +66,6 @@ final class DeleteController extends Controller $subTitle = (string) trans('firefly.delete_webhook', ['title' => $webhook->title]); $this->rememberPreviousUrl('webhooks.delete.url'); - return view('webhooks.delete', ['webhook' => $webhook, 'subTitle' => $subTitle]); + return view('webhooks.delete', ['webhook' => $webhook, 'subTitle' => $subTitle]); } } diff --git a/app/Http/Controllers/Webhooks/EditController.php b/app/Http/Controllers/Webhooks/EditController.php index 8f5efb73cd..aa2de85122 100644 --- a/app/Http/Controllers/Webhooks/EditController.php +++ b/app/Http/Controllers/Webhooks/EditController.php @@ -65,6 +65,6 @@ final class EditController extends Controller $subTitle = (string) trans('firefly.edit_webhook', ['title' => $webhook->title]); $this->rememberPreviousUrl('webhooks.edit.url'); - return view('webhooks.edit', ['webhook' => $webhook, 'subTitle' => $subTitle]); + return view('webhooks.edit', ['webhook' => $webhook, 'subTitle' => $subTitle]); } } diff --git a/app/Http/Controllers/Webhooks/ShowController.php b/app/Http/Controllers/Webhooks/ShowController.php index 9a6dbadadb..30f71d79c7 100644 --- a/app/Http/Controllers/Webhooks/ShowController.php +++ b/app/Http/Controllers/Webhooks/ShowController.php @@ -64,6 +64,6 @@ final class ShowController extends Controller Log::channel('audit')->info(sprintf('User visits webhook #%d page.', $webhook->id)); $subTitle = (string) trans('firefly.show_webhook', ['title' => $webhook->title]); - return view('webhooks.show', ['webhook' => $webhook, 'subTitle' => $subTitle]); + return view('webhooks.show', ['webhook' => $webhook, 'subTitle' => $subTitle]); } } diff --git a/app/Http/Requests/BudgetIncomeRequest.php b/app/Http/Requests/BudgetIncomeRequest.php index 70edfb063a..5e10753e49 100644 --- a/app/Http/Requests/BudgetIncomeRequest.php +++ b/app/Http/Requests/BudgetIncomeRequest.php @@ -44,7 +44,7 @@ class BudgetIncomeRequest extends FormRequest public function rules(): array { // fixed - return ['amount' => ['required', new IsValidPositiveAmount()], 'start' => 'required|date|before:end', 'end' => 'required|date|after:start']; + return ['amount' => ['required', new IsValidPositiveAmount()], 'start' => 'required|date|before:end', 'end' => 'required|date|after:start']; } public function withValidator(Validator $validator): void diff --git a/app/Http/Requests/BulkEditJournalRequest.php b/app/Http/Requests/BulkEditJournalRequest.php index ab58ec53fa..16114324dd 100644 --- a/app/Http/Requests/BulkEditJournalRequest.php +++ b/app/Http/Requests/BulkEditJournalRequest.php @@ -45,7 +45,7 @@ class BulkEditJournalRequest extends FormRequest public function rules(): array { // fixed - return ['journals.*' => 'required|belongsToUser:transaction_journals,id', 'tags_action' => 'in:no_nothing,do_replace,do_append']; + return ['journals.*' => 'required|belongsToUser:transaction_journals,id', 'tags_action' => 'in:no_nothing,do_replace,do_append']; } public function withValidator(Validator $validator): void diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php index a716a8d502..93ab081178 100644 --- a/app/Http/Requests/CategoryFormRequest.php +++ b/app/Http/Requests/CategoryFormRequest.php @@ -45,7 +45,7 @@ class CategoryFormRequest extends FormRequest */ public function getCategoryData(): array { - return ['name' => $this->convertString('name'), 'notes' => $this->stringWithNewlines('notes')]; + return ['name' => $this->convertString('name'), 'notes' => $this->stringWithNewlines('notes')]; } /** @@ -63,7 +63,7 @@ class CategoryFormRequest extends FormRequest } // fixed - return ['name' => $nameRule, 'notes' => 'min:1|max:32768|nullable']; + return ['name' => $nameRule, 'notes' => 'min:1|max:32768|nullable']; } public function withValidator(Validator $validator): void diff --git a/app/Http/Requests/ExistingTokenFormRequest.php b/app/Http/Requests/ExistingTokenFormRequest.php index 4a1c842f6a..3be5efa3fc 100644 --- a/app/Http/Requests/ExistingTokenFormRequest.php +++ b/app/Http/Requests/ExistingTokenFormRequest.php @@ -43,7 +43,7 @@ class ExistingTokenFormRequest extends FormRequest public function rules(): array { // fixed - return ['password' => 'required|currentPassword', 'code' => 'required|existingMfaCode']; + return ['password' => 'required|currentPassword', 'code' => 'required|existingMfaCode']; } public function withValidator(Validator $validator): void diff --git a/app/Http/Requests/JournalLinkRequest.php b/app/Http/Requests/JournalLinkRequest.php index 791b1ccc4a..23d711b5cd 100644 --- a/app/Http/Requests/JournalLinkRequest.php +++ b/app/Http/Requests/JournalLinkRequest.php @@ -73,7 +73,7 @@ class JournalLinkRequest extends FormRequest $string = implode(',', $combinations); // fixed - return ['link_type' => sprintf('required|in:%s', $string), 'opposing' => 'belongsToUser:transaction_journals']; + return ['link_type' => sprintf('required|in:%s', $string), 'opposing' => 'belongsToUser:transaction_journals']; } public function withValidator(Validator $validator): void diff --git a/app/Http/Requests/RecurrenceFormRequest.php b/app/Http/Requests/RecurrenceFormRequest.php index f4941e3cd8..293551a908 100644 --- a/app/Http/Requests/RecurrenceFormRequest.php +++ b/app/Http/Requests/RecurrenceFormRequest.php @@ -320,7 +320,7 @@ class RecurrenceFormRequest extends FormRequest private function parseRepetitionData(): array { $value = $this->convertString('repetition_type'); - $return = ['type' => '', 'moment' => '']; + $return = ['type' => '', 'moment' => '']; if ('daily' === $value) { $return['type'] = $value; diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index 5335755ea7..307a92f24c 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -51,7 +51,7 @@ class RuleGroupFormRequest extends FormRequest $active = $this->boolean('active'); } - return ['title' => $this->convertString('title'), 'description' => $this->stringWithNewlines('description'), 'active' => $active]; + return ['title' => $this->convertString('title'), 'description' => $this->stringWithNewlines('description'), 'active' => $active]; } /** @@ -68,7 +68,7 @@ class RuleGroupFormRequest extends FormRequest $titleRule = 'required|min:1|max:255|uniqueObjectForUser:rule_groups,title,'.$ruleGroup->id; } - return ['title' => $titleRule, 'description' => 'min:1|max:32768|nullable', 'active' => [new IsBoolean()]]; + return ['title' => $titleRule, 'description' => 'min:1|max:32768|nullable', 'active' => [new IsBoolean()]]; } public function withValidator(Validator $validator): void diff --git a/app/Http/Requests/SelectTransactionsRequest.php b/app/Http/Requests/SelectTransactionsRequest.php index d0b12a0f1e..044fd35d95 100644 --- a/app/Http/Requests/SelectTransactionsRequest.php +++ b/app/Http/Requests/SelectTransactionsRequest.php @@ -42,7 +42,7 @@ class SelectTransactionsRequest extends FormRequest */ public function rules(): array { - return ['accounts' => 'required', 'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts']; + return ['accounts' => 'required', 'accounts.*' => 'required|exists:accounts,id|belongsToUser:accounts']; } public function withValidator(Validator $validator): void diff --git a/app/Http/Requests/TokenFormRequest.php b/app/Http/Requests/TokenFormRequest.php index 9ab1e5bdf8..580b787587 100644 --- a/app/Http/Requests/TokenFormRequest.php +++ b/app/Http/Requests/TokenFormRequest.php @@ -43,7 +43,7 @@ class TokenFormRequest extends FormRequest public function rules(): array { // fixed - return ['password' => 'required|currentPassword', 'code' => 'required|2faCode']; + return ['password' => 'required|currentPassword', 'code' => 'required|2faCode']; } public function withValidator(Validator $validator): void diff --git a/app/Http/Requests/UserRegistrationRequest.php b/app/Http/Requests/UserRegistrationRequest.php index fa27d6531d..a4106f84ec 100644 --- a/app/Http/Requests/UserRegistrationRequest.php +++ b/app/Http/Requests/UserRegistrationRequest.php @@ -52,7 +52,7 @@ class UserRegistrationRequest extends FormRequest public function rules(): array { // fixed - return ['email' => 'email|required', 'password' => 'confirmed|secure_password']; + return ['email' => 'email|required', 'password' => 'confirmed|secure_password']; } public function withValidator(Validator $validator): void diff --git a/app/Jobs/CreateRecurringTransactions.php b/app/Jobs/CreateRecurringTransactions.php index c20c71eaff..b5b1e354cc 100644 --- a/app/Jobs/CreateRecurringTransactions.php +++ b/app/Jobs/CreateRecurringTransactions.php @@ -238,7 +238,7 @@ class CreateRecurringTransactions implements ShouldQueue 'identifier' => $index, 'recurrence_id' => $recurrence->id, 'order' => $index, - 'notes' => (string) trans('firefly.created_from_recurrence', ['id' => $recurrence->id, 'title' => $recurrence->title]), + 'notes' => (string) trans('firefly.created_from_recurrence', ['id' => $recurrence->id, 'title' => $recurrence->title]), 'tags' => $this->repository->getTags($transaction), 'piggy_bank_id' => $this->repository->getPiggyBank($transaction), 'piggy_bank_name' => null, diff --git a/app/Jobs/WarnAboutBills.php b/app/Jobs/WarnAboutBills.php index 595bcd22f9..97ae390ac2 100644 --- a/app/Jobs/WarnAboutBills.php +++ b/app/Jobs/WarnAboutBills.php @@ -86,7 +86,7 @@ class WarnAboutBills implements ShouldQueue Log::debug(sprintf('Now checking bill #%d ("%s")', $bill->id, $bill->name)); $dates = $this->getDates($bill); if ($this->needsOverdueAlert($dates)) { - $overdue[] = ['bill' => $bill, 'dates' => $dates]; + $overdue[] = ['bill' => $bill, 'dates' => $dates]; } if ($this->hasDateFields($bill)) { if ($this->needsWarning($bill, 'end_date')) { @@ -128,7 +128,7 @@ class WarnAboutBills implements ShouldQueue /** @var Bill $single */ $single = $enrichment->enrichSingle($bill); - return ['pay_dates' => $single->meta['pay_dates'] ?? [], 'paid_dates' => $single->meta['paid_dates'] ?? []]; + return ['pay_dates' => $single->meta['pay_dates'] ?? [], 'paid_dates' => $single->meta['paid_dates'] ?? []]; } private function getDiff(Bill $bill, string $field): int diff --git a/app/Listeners/Model/Rule/NotifiesUserAboutFailedRuleAction.php b/app/Listeners/Model/Rule/NotifiesUserAboutFailedRuleAction.php index 5989c6a3d7..759e061d9c 100644 --- a/app/Listeners/Model/Rule/NotifiesUserAboutFailedRuleAction.php +++ b/app/Listeners/Model/Rule/NotifiesUserAboutFailedRuleAction.php @@ -52,7 +52,7 @@ class NotifiesUserAboutFailedRuleAction implements ShouldQueue $groupId = is_array($journal) ? $journal['transaction_group_id'] : $journal->transaction_group_id; $groupTitle = is_array($journal) ? $journal['description'] ?? '' : $journal->description ?? ''; - $mainMessage = trans('rules.main_message', ['rule' => $rule->title, 'action' => $ruleAction->action_type, 'group' => $groupId, 'error' => $error]); + $mainMessage = trans('rules.main_message', ['rule' => $rule->title, 'action' => $ruleAction->action_type, 'group' => $groupId, 'error' => $error]); $groupLink = route('transactions.show', [$groupId]); $ruleTitle = $rule->title; $ruleLink = route('rules.edit', [$rule->id]); diff --git a/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php b/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php index 693efdbdc6..d21f57b306 100644 --- a/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php +++ b/app/Listeners/Model/TransactionGroup/SupportsGroupProcessingTrait.php @@ -57,7 +57,7 @@ trait SupportsGroupProcessingTrait $newRuleEngine->setRuleGroups($groups); foreach ($array as $journalId) { $newRuleEngine->removeOperator('journal_id'); - $newRuleEngine->addOperator(['type' => 'journal_id', 'value' => $journalId]); + $newRuleEngine->addOperator(['type' => 'journal_id', 'value' => $journalId]); $newRuleEngine->fire(); } diff --git a/app/Listeners/Security/System/ChecksForNewVersion.php b/app/Listeners/Security/System/ChecksForNewVersion.php index ab55cb330f..4524f504af 100644 --- a/app/Listeners/Security/System/ChecksForNewVersion.php +++ b/app/Listeners/Security/System/ChecksForNewVersion.php @@ -85,7 +85,7 @@ class ChecksForNewVersion implements ShouldQueue if ($release->isNewVersionAvailable()) { // if running develop, slightly different message. if (str_contains(config('firefly.version'), 'develop')) { - $message = trans('firefly.update_current_dev_older', ['version' => config('firefly.version'), 'new_version' => $release->getNewVersion()]); + $message = trans('firefly.update_current_dev_older', ['version' => config('firefly.version'), 'new_version' => $release->getNewVersion()]); } if (!str_contains(config('firefly.version'), 'develop')) { $message = trans('firefly.update_new_version_alert', [ diff --git a/app/Listeners/Security/System/HandlesNewUserRegistration.php b/app/Listeners/Security/System/HandlesNewUserRegistration.php index e7be808c9c..f85201f19d 100644 --- a/app/Listeners/Security/System/HandlesNewUserRegistration.php +++ b/app/Listeners/Security/System/HandlesNewUserRegistration.php @@ -105,7 +105,7 @@ class HandlesNewUserRegistration implements ShouldQueue if (null === $role) { throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?'); } - GroupMembership::create(['user_id' => $user->id, 'user_group_id' => $group->id, 'user_role_id' => $role->id]); + GroupMembership::create(['user_id' => $user->id, 'user_group_id' => $group->id, 'user_role_id' => $role->id]); $user->user_group_id = $group->id; $user->save(); } diff --git a/app/Listeners/Security/User/StoresNewIpAddress.php b/app/Listeners/Security/User/StoresNewIpAddress.php index 9f2d1c6e16..6105d160b2 100644 --- a/app/Listeners/Security/User/StoresNewIpAddress.php +++ b/app/Listeners/Security/User/StoresNewIpAddress.php @@ -66,7 +66,7 @@ class StoresNewIpAddress implements ShouldQueue } // add to array if not the case: if (false === $inArray) { - $preference[] = ['ip' => $ip, 'time' => now(config('app.timezone'))->format('Y-m-d H:i:s'), 'notified' => false]; + $preference[] = ['ip' => $ip, 'time' => now(config('app.timezone'))->format('Y-m-d H:i:s'), 'notified' => false]; } $preference = array_values($preference); diff --git a/app/Listeners/System/RecalculatesPrimaryCurrencyAmounts.php b/app/Listeners/System/RecalculatesPrimaryCurrencyAmounts.php index 535bc89228..14bf4ade23 100644 --- a/app/Listeners/System/RecalculatesPrimaryCurrencyAmounts.php +++ b/app/Listeners/System/RecalculatesPrimaryCurrencyAmounts.php @@ -151,7 +151,7 @@ class RecalculatesPrimaryCurrencyAmounts ->where(static function (Builder $q): void { $q->whereNotNull('native_amount')->orWhereNotNull('native_foreign_amount'); }) - ->update(['native_amount' => null, 'native_foreign_amount' => null]) + ->update(['native_amount' => null, 'native_foreign_amount' => null]) ; Log::debug(sprintf('Reset %d transactions.', $success)); } diff --git a/app/Models/Account.php b/app/Models/Account.php index efe411b75f..8c62e4ae1f 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -44,7 +44,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * @property AccountType $accountType - * @property User $user + * @property User $user */ #[ObservedBy([DeletedAccountObserver::class])] class Account extends Model diff --git a/app/Models/AuditLogEntry.php b/app/Models/AuditLogEntry.php index 300c01911f..2f4de55712 100644 --- a/app/Models/AuditLogEntry.php +++ b/app/Models/AuditLogEntry.php @@ -52,7 +52,7 @@ class AuditLogEntry extends Model protected function casts(): array { - return ['before' => 'array', 'after' => 'array', 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime']; + return ['before' => 'array', 'after' => 'array', 'created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime']; } protected function changerId(): Attribute diff --git a/app/Models/AutoBudget.php b/app/Models/AutoBudget.php index a56676b19f..315e43daa6 100644 --- a/app/Models/AutoBudget.php +++ b/app/Models/AutoBudget.php @@ -41,7 +41,7 @@ class AutoBudget extends Model use ReturnsIntegerIdTrait; use SoftDeletes; - protected $casts = ['amount' => 'string', 'native_amount' => 'string']; + protected $casts = ['amount' => 'string', 'native_amount' => 'string']; protected $fillable = ['budget_id', 'amount', 'period', 'native_amount']; public function budget(): BelongsTo diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index a497806942..060fb1e374 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -46,37 +46,36 @@ class AvailableBudget extends Model use ReturnsIntegerUserIdTrait; use SoftDeletes; - protected $fillable - = [ - 'user_id', - 'user_group_id', - 'transaction_currency_id', - 'amount', - 'start_date', - 'end_date', - 'start_date_tz', - 'end_date_tz', - 'native_amount', - ]; + protected $fillable = [ + 'user_id', + 'user_group_id', + 'transaction_currency_id', + 'amount', + 'start_date', + 'end_date', + 'start_date_tz', + 'end_date_tz', + 'native_amount', + ]; /** * Route binder. Converts the key in the URL to the specified object (or throw 404). * * @throws NotFoundHttpException */ - public static function routeBinder(self | string $value): self + public static function routeBinder(self|string $value): self { if ($value instanceof self) { - $value = (int)$value->id; + $value = (int) $value->id; } if (auth()->check()) { - $availableBudgetId = (int)$value; + $availableBudgetId = (int) $value; /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); /** @var null|AvailableBudget $availableBudget */ - $availableBudget = $user->availableBudgets()->find($availableBudgetId); + $availableBudget = $user->availableBudgets()->find($availableBudgetId); if (null !== $availableBudget) { return $availableBudget; } @@ -97,7 +96,7 @@ class AvailableBudget extends Model protected function amount(): Attribute { - return Attribute::make(get: static fn($value): string => (string)$value); + return Attribute::make(get: static fn ($value): string => (string) $value); } protected function casts(): array @@ -119,21 +118,21 @@ class AvailableBudget extends Model protected function endDate(): Attribute { return Attribute::make( - get: static fn(string $value): Carbon => Carbon::parse($value), - set: static fn(Carbon $value): string => $value->format('Y-m-d') + get: static fn (string $value): Carbon => Carbon::parse($value), + set: static fn (Carbon $value): string => $value->format('Y-m-d') ); } protected function startDate(): Attribute { return Attribute::make( - get: static fn(string $value): Carbon => Carbon::parse($value), - set: static fn(Carbon $value): string => $value->format('Y-m-d') + get: static fn (string $value): Carbon => Carbon::parse($value), + set: static fn (Carbon $value): string => $value->format('Y-m-d') ); } protected function transactionCurrencyId(): Attribute { - return Attribute::make(get: static fn($value): int => (int)$value); + return Attribute::make(get: static fn ($value): int => (int) $value); } } diff --git a/app/Models/Bill.php b/app/Models/Bill.php index e90b3bf62a..50cccc6ad1 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -40,10 +40,10 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @property Carbon $date - * @property null|Carbon $end_date - * @property null|Carbon $extension_date - * @property User $user + * @property Carbon $date + * @property null|Carbon $end_date + * @property null|Carbon $extension_date + * @property User $user * @property TransactionCurrency $transactionCurrency */ #[ObservedBy([BillObserver::class])] diff --git a/app/Models/GroupMembership.php b/app/Models/GroupMembership.php index 00e8facf45..0dddba9ff0 100644 --- a/app/Models/GroupMembership.php +++ b/app/Models/GroupMembership.php @@ -55,7 +55,7 @@ class GroupMembership extends Model protected function casts(): array { - return ['created_at' => 'datetime', 'updated_at' => 'datetime', 'user_id' => 'integer', 'user_group_id' => 'integer']; + return ['created_at' => 'datetime', 'updated_at' => 'datetime', 'user_id' => 'integer', 'user_group_id' => 'integer']; } protected function userRoleId(): Attribute diff --git a/app/Models/InvitedUser.php b/app/Models/InvitedUser.php index 2228b4d801..3669b690ed 100644 --- a/app/Models/InvitedUser.php +++ b/app/Models/InvitedUser.php @@ -71,6 +71,6 @@ class InvitedUser extends Model protected function casts(): array { - return ['expires' => SeparateTimezoneCaster::class, 'redeemed' => 'boolean', 'user_id' => 'integer', 'user_group_id' => 'integer']; + return ['expires' => SeparateTimezoneCaster::class, 'redeemed' => 'boolean', 'user_id' => 'integer', 'user_group_id' => 'integer']; } } diff --git a/app/Models/LinkType.php b/app/Models/LinkType.php index 30033c3b89..96b2970c6b 100644 --- a/app/Models/LinkType.php +++ b/app/Models/LinkType.php @@ -64,6 +64,6 @@ class LinkType extends Model protected function casts(): array { - return ['created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime', 'editable' => 'boolean']; + return ['created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime', 'editable' => 'boolean']; } } diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 673a6bc178..4519fd142b 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -38,8 +38,8 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @property null|Carbon $target_date - * @property null|Carbon $start_date + * @property null|Carbon $target_date + * @property null|Carbon $start_date * @property TransactionCurrency $transactionCurrency */ #[ObservedBy([PiggyBankObserver::class])] diff --git a/app/Models/Recurrence.php b/app/Models/Recurrence.php index 3af93c8887..29d00edc3c 100644 --- a/app/Models/Recurrence.php +++ b/app/Models/Recurrence.php @@ -43,7 +43,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * @property null|Carbon $first_date * @property null|Carbon $latest_date * @property null|Carbon $repeat_until - * @property User $user + * @property User $user */ #[ObservedBy([DeletedRecurrenceObserver::class])] class Recurrence extends Model diff --git a/app/Models/RecurrenceMeta.php b/app/Models/RecurrenceMeta.php index c4fa3e5f28..e1d6e31124 100644 --- a/app/Models/RecurrenceMeta.php +++ b/app/Models/RecurrenceMeta.php @@ -46,7 +46,7 @@ class RecurrenceMeta extends Model protected function casts(): array { - return ['created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime', 'name' => 'string', 'value' => 'string']; + return ['created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime', 'name' => 'string', 'value' => 'string']; } protected function recurrenceId(): Attribute diff --git a/app/Models/RecurrenceTransactionMeta.php b/app/Models/RecurrenceTransactionMeta.php index d162c3b9c6..6c82992025 100644 --- a/app/Models/RecurrenceTransactionMeta.php +++ b/app/Models/RecurrenceTransactionMeta.php @@ -46,7 +46,7 @@ class RecurrenceTransactionMeta extends Model protected function casts(): array { - return ['created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime', 'name' => 'string', 'value' => 'string']; + return ['created_at' => 'datetime', 'updated_at' => 'datetime', 'deleted_at' => 'datetime', 'name' => 'string', 'value' => 'string']; } protected function rtId(): Attribute diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index c80f949daa..918c611b54 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -36,11 +36,11 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\SoftDeletes; /** - * @property Account|null $account - * @property TransactionCurrency $transactionCurrency - * @property TransactionCurrency|null $foreignCurrency - * @property string|null $balance_before - * @property string|null $balance_after + * @property null|Account $account + * @property TransactionCurrency $transactionCurrency + * @property null|TransactionCurrency $foreignCurrency + * @property null|string $balance_before + * @property null|string $balance_after */ #[ObservedBy([TransactionObserver::class])] class Transaction extends Model diff --git a/app/Models/WebhookMessage.php b/app/Models/WebhookMessage.php index f5adcd3dde..4a7df1b60f 100644 --- a/app/Models/WebhookMessage.php +++ b/app/Models/WebhookMessage.php @@ -80,7 +80,7 @@ class WebhookMessage extends Model protected function casts(): array { - return ['sent' => 'boolean', 'errored' => 'boolean', 'uuid' => 'string', 'message' => 'json', 'logs' => 'json']; + return ['sent' => 'boolean', 'errored' => 'boolean', 'uuid' => 'string', 'message' => 'json', 'logs' => 'json']; } /** diff --git a/app/Notifications/Admin/UnknownUserLoginAttempt.php b/app/Notifications/Admin/UnknownUserLoginAttempt.php index b649198f2d..e0c4eb4230 100644 --- a/app/Notifications/Admin/UnknownUserLoginAttempt.php +++ b/app/Notifications/Admin/UnknownUserLoginAttempt.php @@ -60,7 +60,7 @@ class UnknownUserLoginAttempt extends Notification $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); $time = now(config('app.timezone'))->isoFormat((string) trans('config.date_time_js')); - $link = route('index'); + $link = route('index'); return new MailMessage() ->markdown('emails.owner.unknown-user', [ @@ -98,7 +98,7 @@ class UnknownUserLoginAttempt extends Notification { $ip = Request::ip(); - return PushoverMessage::create((string) trans('email.unknown_user_message', ['address' => $this->address, 'ip' => $ip]))->title((string) trans( + return PushoverMessage::create((string) trans('email.unknown_user_message', ['address' => $this->address, 'ip' => $ip]))->title((string) trans( 'email.unknown_user_subject' )); } @@ -110,7 +110,7 @@ class UnknownUserLoginAttempt extends Notification { $ip = Request::ip(); - return new SlackMessage()->content((string) trans('email.unknown_user_body', ['address' => $this->address, 'ip' => $ip])); + return new SlackMessage()->content((string) trans('email.unknown_user_body', ['address' => $this->address, 'ip' => $ip])); } /** diff --git a/app/Notifications/Admin/UserRegistration.php b/app/Notifications/Admin/UserRegistration.php index 55881a2261..0547b22451 100644 --- a/app/Notifications/Admin/UserRegistration.php +++ b/app/Notifications/Admin/UserRegistration.php @@ -111,7 +111,7 @@ class UserRegistration extends Notification */ public function toSlack(OwnerNotifiable $notifiable): SlackMessage { - return new SlackMessage()->content((string) trans('email.admin_new_user_registered', ['email' => $this->user->email, 'id' => $this->user->id])); + return new SlackMessage()->content((string) trans('email.admin_new_user_registered', ['email' => $this->user->email, 'id' => $this->user->id])); } /** diff --git a/app/Notifications/ReturnsSettings.php b/app/Notifications/ReturnsSettings.php index a6b7cdc96b..d4b5707beb 100644 --- a/app/Notifications/ReturnsSettings.php +++ b/app/Notifications/ReturnsSettings.php @@ -44,7 +44,7 @@ class ReturnsSettings private static function getNtfySettings(string $type, ?User $user): array { Log::debug(sprintf('Getting Ntfy settings for %s and user #%d', $type, $user?->id)); - $settings = ['ntfy_server' => 'https://ntfy.sh', 'ntfy_topic' => '', 'ntfy_auth' => false, 'ntfy_user' => '', 'ntfy_pass' => '']; + $settings = ['ntfy_server' => 'https://ntfy.sh', 'ntfy_topic' => '', 'ntfy_auth' => false, 'ntfy_user' => '', 'ntfy_pass' => '']; if ('user' === $type && $user instanceof User) { $settings['ntfy_server'] = Preferences::getEncryptedForUser($user, 'ntfy_server', 'https://ntfy.sh')->data; $settings['ntfy_topic'] = Preferences::getEncryptedForUser($user, 'ntfy_topic', '')->data; diff --git a/app/Notifications/Security/UserFailedLoginAttempt.php b/app/Notifications/Security/UserFailedLoginAttempt.php index a4cf358640..5b31840009 100644 --- a/app/Notifications/Security/UserFailedLoginAttempt.php +++ b/app/Notifications/Security/UserFailedLoginAttempt.php @@ -58,7 +58,7 @@ class UserFailedLoginAttempt extends Notification $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); $time = now(config('app.timezone'))->isoFormat((string) trans('config.date_time_js')); - $link = route('index'); + $link = route('index'); return new MailMessage() ->markdown('emails.security.failed-login', [ @@ -92,7 +92,7 @@ class UserFailedLoginAttempt extends Notification { $ip = Request::ip(); - return PushoverMessage::create((string) trans('email.failed_login_message', ['ip' => $ip, 'email' => $this->user->email]))->title((string) trans( + return PushoverMessage::create((string) trans('email.failed_login_message', ['ip' => $ip, 'email' => $this->user->email]))->title((string) trans( 'email.failed_login_subject' )); } @@ -103,7 +103,7 @@ class UserFailedLoginAttempt extends Notification public function toSlack(User $notifiable): SlackMessage { $ip = Request::ip(); - $message = (string) trans('email.failed_login_message', ['ip' => $ip, 'email' => $this->user->email]); + $message = (string) trans('email.failed_login_message', ['ip' => $ip, 'email' => $this->user->email]); return new SlackMessage()->content($message); } diff --git a/app/Notifications/Test/OwnerTestNotificationEmail.php b/app/Notifications/Test/OwnerTestNotificationEmail.php index 4a2c4d0bff..12e61426a5 100644 --- a/app/Notifications/Test/OwnerTestNotificationEmail.php +++ b/app/Notifications/Test/OwnerTestNotificationEmail.php @@ -51,7 +51,8 @@ class OwnerTestNotificationEmail extends Notification public function toMail(OwnerNotifiable $notifiable): MailMessage { $address = (string) config('firefly.site_owner'); - $link = route('index'); + $link = route('index'); + return new MailMessage() ->markdown('emails.admin-test', ['email' => $address, 'link' => $link]) ->subject((string) trans('email.admin_test_subject')) diff --git a/app/Notifications/User/BillReminder.php b/app/Notifications/User/BillReminder.php index 742a1ed852..273914c24a 100644 --- a/app/Notifications/User/BillReminder.php +++ b/app/Notifications/User/BillReminder.php @@ -60,7 +60,7 @@ class BillReminder extends Notification public function toMail(User $notifiable): MailMessage { return new MailMessage() - ->markdown('emails.bill-warning', ['field' => $this->field, 'diff' => $this->diff, 'bill' => $this->bill]) + ->markdown('emails.bill-warning', ['field' => $this->field, 'diff' => $this->diff, 'bill' => $this->bill]) ->subject($this->getSubject()) ; } diff --git a/app/Notifications/User/NewAccessToken.php b/app/Notifications/User/NewAccessToken.php index 9be2981696..f9d49ad636 100644 --- a/app/Notifications/User/NewAccessToken.php +++ b/app/Notifications/User/NewAccessToken.php @@ -56,7 +56,7 @@ class NewAccessToken extends Notification $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); $time = now(config('app.timezone'))->isoFormat((string) trans('config.date_time_js')); - $link = route('index'); + $link = route('index'); return new MailMessage() ->markdown('emails.token-created', [ @@ -70,7 +70,6 @@ class NewAccessToken extends Notification ; } - /** * @SuppressWarnings("PHPMD.UnusedFormalParameter") */ diff --git a/app/Notifications/User/SubscriptionsOverdueReminder.php b/app/Notifications/User/SubscriptionsOverdueReminder.php index 556a85a6bc..fa1a0eac2d 100644 --- a/app/Notifications/User/SubscriptionsOverdueReminder.php +++ b/app/Notifications/User/SubscriptionsOverdueReminder.php @@ -67,7 +67,7 @@ class SubscriptionsOverdueReminder extends Notification } return new MailMessage() - ->markdown('emails.subscriptions-overdue-warning', ['info' => $info, 'count' => $count]) + ->markdown('emails.subscriptions-overdue-warning', ['info' => $info, 'count' => $count]) ->subject($this->getSubject()) ; } diff --git a/app/Notifications/User/UserLogin.php b/app/Notifications/User/UserLogin.php index 1ccf98f5f9..fd4bf9cd17 100644 --- a/app/Notifications/User/UserLogin.php +++ b/app/Notifications/User/UserLogin.php @@ -55,7 +55,7 @@ class UserLogin extends Notification $host = Steam::getHostName($ip); $userAgent = Request::userAgent(); $time = now(config('app.timezone'))->isoFormat((string) trans('config.date_time_js')); - $link = route('index'); + $link = route('index'); return new MailMessage() ->markdown('emails.new-ip', [ @@ -90,7 +90,7 @@ class UserLogin extends Notification $ip = Request::ip(); $host = Steam::getHostName($ip); - return PushoverMessage::create((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host]))->title((string) trans( + return PushoverMessage::create((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host]))->title((string) trans( 'email.login_from_new_ip' )); } @@ -103,7 +103,7 @@ class UserLogin extends Notification $ip = Request::ip(); $host = Steam::getHostName($ip); - return new SlackMessage()->content((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host])); + return new SlackMessage()->content((string) trans('email.slack_login_from_new_ip', ['ip' => $ip, 'host' => $host])); } /** diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index a1e1c01af3..20a2081f41 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -447,7 +447,7 @@ class AccountRepository implements AccountRepositoryInterface, UserGroupInterfac throw new FireflyException(sprintf('%s is not an asset account.', $account->name)); } $currency = $this->getAccountCurrency($account) ?? Amount::getPrimaryCurrency(); - $name = trans('firefly.reconciliation_account_name', ['name' => $account->name, 'currency' => $currency->code]); + $name = trans('firefly.reconciliation_account_name', ['name' => $account->name, 'currency' => $currency->code]); /** @var AccountType $type */ $type = AccountType::where('type', AccountTypeEnum::RECONCILIATION->value)->first(); diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index 5ff4d3a955..b8d6adccb8 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -59,7 +59,7 @@ class AccountTasker implements AccountTaskerInterface, UserGroupInterface $repository = app(AccountRepositoryInterface::class); $primaryCurrency = Amount::getPrimaryCurrencyByUserGroup($this->user->userGroup); - $return = ['accounts' => [], 'sums' => []]; + $return = ['accounts' => [], 'sums' => []]; /** @var Account $account */ foreach ($accounts as $account) { @@ -179,7 +179,7 @@ class AccountTasker implements AccountTaskerInterface, UserGroupInterface /** @var CurrencyRepositoryInterface $currencyRepos */ $currencyRepos = app(CurrencyRepositoryInterface::class); $currencies = [$primaryCurrency->id => $primaryCurrency]; - $report = ['accounts' => [], 'sums' => []]; + $report = ['accounts' => [], 'sums' => []]; /** @var array $journal */ foreach ($array as $journal) { @@ -233,7 +233,7 @@ class AccountTasker implements AccountTaskerInterface, UserGroupInterface /** @var CurrencyRepositoryInterface $currencyRepos */ $currencyRepos = app(CurrencyRepositoryInterface::class); $currencies = [$primaryCurrency->id => $primaryCurrency]; - $report = ['accounts' => [], 'sums' => []]; + $report = ['accounts' => [], 'sums' => []]; /** @var array $journal */ foreach ($array as $journal) { diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index de63854d2d..8fa7f57ac5 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -433,7 +433,7 @@ class BillRepository implements BillRepositoryInterface, UserGroupInterface /** @var Rule $rule */ foreach ($rules as $rule) { $array[$rule->action_value] ??= []; - $array[$rule->action_value][] = ['id' => $rule->id, 'title' => $rule->title, 'active' => $rule->active]; + $array[$rule->action_value][] = ['id' => $rule->id, 'title' => $rule->title, 'active' => $rule->active]; } $return = []; foreach ($collection as $bill) { diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index 66cceee19b..c1e7af2cc8 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -475,7 +475,7 @@ class RecurringRepository implements RecurringRepositoryInterface, UserGroupInte if ('weekly' === $repetition->repetition_type) { $dayOfWeek = trans(sprintf('config.dow_%s', $repetition->repetition_moment), [], $language); if ($repetition->repetition_skip > 0) { - return (string) trans('firefly.recurring_weekly_skip', ['weekday' => $dayOfWeek, 'skip' => $repetition->repetition_skip + 1], $language); + return (string) trans('firefly.recurring_weekly_skip', ['weekday' => $dayOfWeek, 'skip' => $repetition->repetition_skip + 1], $language); } return (string) trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek], $language); @@ -484,14 +484,14 @@ class RecurringRepository implements RecurringRepositoryInterface, UserGroupInte if ($repetition->repetition_skip > 0) { return (string) trans( 'firefly.recurring_monthly_skip', - ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip + 1], + ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip + 1], $language ); } return (string) trans( 'firefly.recurring_monthly', - ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip - 1], + ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip - 1], $language ); } @@ -500,7 +500,7 @@ class RecurringRepository implements RecurringRepositoryInterface, UserGroupInte // first part is number of week, second is weekday. $dayOfWeek = trans(sprintf('config.dow_%s', $parts[1]), [], $language); - return (string) trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], $language); + return (string) trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], $language); } if ('yearly' === $repetition->repetition_type) { $today = today(config('app.timezone'))->endOfYear(); diff --git a/app/Repositories/Tag/OperationsRepository.php b/app/Repositories/Tag/OperationsRepository.php index 29785e366a..fb666c1474 100644 --- a/app/Repositories/Tag/OperationsRepository.php +++ b/app/Repositories/Tag/OperationsRepository.php @@ -91,7 +91,7 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn continue; } $listedJournals[] = $journalId; - $array[$currencyId]['tags'][$tagId] ??= ['id' => $tagId, 'name' => $tagName, 'transaction_journals' => []]; + $array[$currencyId]['tags'][$tagId] ??= ['id' => $tagId, 'name' => $tagName, 'transaction_journals' => []]; $array[$currencyId]['tags'][$tagId]['transaction_journals'][$journalId] = [ 'amount' => Steam::negative($journal['amount']), diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index 2831518c9d..c7bfd60099 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -124,7 +124,7 @@ class UserRepository implements UserRepositoryInterface public function createRole(string $name, string $displayName, string $description): Role { - return Role::create(['name' => $name, 'display_name' => $displayName, 'description' => $description]); + return Role::create(['name' => $name, 'display_name' => $displayName, 'description' => $description]); } public function deleteEmptyGroups(): void diff --git a/app/Repositories/UserGroup/UserGroupRepository.php b/app/Repositories/UserGroup/UserGroupRepository.php index 9b9c02444b..c47fb08d75 100644 --- a/app/Repositories/UserGroup/UserGroupRepository.php +++ b/app/Repositories/UserGroup/UserGroupRepository.php @@ -272,7 +272,7 @@ class UserGroupRepository implements UserGroupRepositoryInterface, UserGroupInte continue; } $userRole = UserRole::whereTitle($enum->value)->first(); - $user->groupMemberships()->create(['user_group_id' => $userGroup->id, 'user_role_id' => $userRole->id]); + $user->groupMemberships()->create(['user_group_id' => $userGroup->id, 'user_role_id' => $userRole->id]); } return $userGroup; @@ -300,7 +300,7 @@ class UserGroupRepository implements UserGroupRepositoryInterface, UserGroupInte if (!$existingGroup instanceof UserGroup) { $exists = false; - $existingGroup = $this->store(['user' => $user, 'title' => $groupName]); + $existingGroup = $this->store(['user' => $user, 'title' => $groupName]); } $groupName = sprintf('%s-%s', $user->email, substr(sha1(random_int(1000, 9999).microtime()), 0, 4)); ++$loop; diff --git a/app/Rules/IsValidSortInstruction.php b/app/Rules/IsValidSortInstruction.php index acc4f1dbde..3e0b590d1a 100644 --- a/app/Rules/IsValidSortInstruction.php +++ b/app/Rules/IsValidSortInstruction.php @@ -56,7 +56,7 @@ class IsValidSortInstruction implements ValidationRule foreach ($parts as $i => $part) { $part = trim($part); if (strlen($part) < 2) { - $fail('validation.invalid_sort_instruction_index')->translate(['index' => $i, 'object' => $shortClass]); + $fail('validation.invalid_sort_instruction_index')->translate(['index' => $i, 'object' => $shortClass]); return; } @@ -64,7 +64,7 @@ class IsValidSortInstruction implements ValidationRule $part = substr($part, 1); } if (!in_array($part, $validParameters, true)) { - $fail('validation.invalid_sort_instruction_index')->translate(['index' => $i, 'object' => $shortClass]); + $fail('validation.invalid_sort_instruction_index')->translate(['index' => $i, 'object' => $shortClass]); return; } diff --git a/app/Rules/UniqueAccountNumber.php b/app/Rules/UniqueAccountNumber.php index c74d721d7f..c2af6ae1fd 100644 --- a/app/Rules/UniqueAccountNumber.php +++ b/app/Rules/UniqueAccountNumber.php @@ -125,7 +125,7 @@ class UniqueAccountNumber implements ValidationRule private function getMaxOccurrences(): array { - $maxCounts = [AccountTypeEnum::ASSET->value => 0, AccountTypeEnum::EXPENSE->value => 0, AccountTypeEnum::REVENUE->value => 0]; + $maxCounts = [AccountTypeEnum::ASSET->value => 0, AccountTypeEnum::EXPENSE->value => 0, AccountTypeEnum::REVENUE->value => 0]; if ('expense' === $this->expectedType || AccountTypeEnum::EXPENSE->value === $this->expectedType) { // IBAN should be unique amongst expense and asset accounts. diff --git a/app/Services/FireflyIIIOrg/Update/GitHubUpdateRequest.php b/app/Services/FireflyIIIOrg/Update/GitHubUpdateRequest.php index 61b84e4615..f293366d1d 100644 --- a/app/Services/FireflyIIIOrg/Update/GitHubUpdateRequest.php +++ b/app/Services/FireflyIIIOrg/Update/GitHubUpdateRequest.php @@ -147,7 +147,7 @@ class GitHubUpdateRequest implements UpdateRequestInterface private function getNewest(array $releases): array { - $latest = ['version' => '1.0.0', 'published_at' => now(config('app.timezone'))->startOfYear()]; + $latest = ['version' => '1.0.0', 'published_at' => now(config('app.timezone'))->startOfYear()]; foreach ($releases as $release) { Log::debug(sprintf('Comparing current version "%s" with latest version "%s"', $release['version'], $latest['version'])); if (str_contains($release['version'], 'develop') || str_contains($latest['version'], 'develop')) { @@ -218,7 +218,7 @@ class GitHubUpdateRequest implements UpdateRequestInterface continue; } - $return[] = ['version' => $version, 'published_at' => $published]; + $return[] = ['version' => $version, 'published_at' => $published]; } return $return; diff --git a/app/Services/Internal/Support/JournalServiceTrait.php b/app/Services/Internal/Support/JournalServiceTrait.php index e4711bb778..3e153110d4 100644 --- a/app/Services/Internal/Support/JournalServiceTrait.php +++ b/app/Services/Internal/Support/JournalServiceTrait.php @@ -97,7 +97,7 @@ trait JournalServiceTrait Log::debug(sprintf('Account #%d may exist and be of the wrong type, use data to create one of the right type.', $data['id'])); $temp = $this->findAccountById(['id' => $data['id']], []); if (null !== $temp) { - $tempData = ['name' => $temp->name, 'iban' => $temp->iban, 'number' => null, 'bic' => null]; + $tempData = ['name' => $temp->name, 'iban' => $temp->iban, 'number' => null, 'bic' => null]; $result = $this->createAccount(null, $tempData, $creatableType); } } @@ -291,13 +291,13 @@ trait JournalServiceTrait if (null !== $data['bic']) { /** @var AccountMetaFactory $metaFactory */ $metaFactory = app(AccountMetaFactory::class); - $metaFactory->create(['account_id' => $account->id, 'name' => 'BIC', 'data' => $data['bic']]); + $metaFactory->create(['account_id' => $account->id, 'name' => 'BIC', 'data' => $data['bic']]); } // store account number if (null !== $data['number']) { /** @var AccountMetaFactory $metaFactory */ $metaFactory = app(AccountMetaFactory::class); - $metaFactory->create(['account_id' => $account->id, 'name' => 'account_number', 'data' => $data['number']]); + $metaFactory->create(['account_id' => $account->id, 'name' => 'account_number', 'data' => $data['number']]); } } diff --git a/app/Services/Internal/Support/RecurringTransactionTrait.php b/app/Services/Internal/Support/RecurringTransactionTrait.php index 09c9e0390f..2ea4ec7c99 100644 --- a/app/Services/Internal/Support/RecurringTransactionTrait.php +++ b/app/Services/Internal/Support/RecurringTransactionTrait.php @@ -244,7 +244,7 @@ trait RecurringTransactionTrait /** @var null|RecurrenceMeta $entry */ $entry = $transaction->recurrenceTransactionMeta()->where('name', 'piggy_bank_id')->first(); if (null === $entry) { - $entry = RecurrenceTransactionMeta::create(['rt_id' => $transaction->id, 'name' => 'piggy_bank_id', 'value' => $piggyBank->id]); + $entry = RecurrenceTransactionMeta::create(['rt_id' => $transaction->id, 'name' => 'piggy_bank_id', 'value' => $piggyBank->id]); } $entry->value = $piggyBank->id; $entry->save(); @@ -261,7 +261,7 @@ trait RecurringTransactionTrait /** @var null|RecurrenceMeta $entry */ $entry = $transaction->recurrenceTransactionMeta()->where('name', 'tags')->first(); if (null === $entry) { - $entry = RecurrenceTransactionMeta::create(['rt_id' => $transaction->id, 'name' => 'tags', 'value' => json_encode($tags)]); + $entry = RecurrenceTransactionMeta::create(['rt_id' => $transaction->id, 'name' => 'tags', 'value' => json_encode($tags)]); } $entry->value = json_encode($tags); $entry->save(); diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index 3ff5514b89..1792092df3 100644 --- a/app/Services/Internal/Update/JournalUpdateService.php +++ b/app/Services/Internal/Update/JournalUpdateService.php @@ -370,7 +370,7 @@ class JournalUpdateService $validator->setTransactionType($expectedType); $validator->setUser($this->transactionJournal->user); $validator->source = $this->getValidSourceAccount(); - $result = $validator->validateDestination(['id' => $destId, 'name' => $destName]); + $result = $validator->validateDestination(['id' => $destId, 'name' => $destName]); Log::debug(sprintf('hasValidDestinationAccount(%d, "%s") will return %s', $destId, $destName, var_export($result, true))); // TODO typeOverrule: the account validator may have another opinion on the transaction type. @@ -401,7 +401,7 @@ class JournalUpdateService $validator->setTransactionType($expectedType); $validator->setUser($this->transactionJournal->user); - $result = $validator->validateSource(['id' => $sourceId, 'name' => $sourceName]); + $result = $validator->validateSource(['id' => $sourceId, 'name' => $sourceName]); Log::debug(sprintf('hasValidSourceAccount(%d, "%s") will return %s', $sourceId, $sourceName, var_export($result, true))); // TODO type overrule the account validator may have a different opinion on the transaction type. @@ -558,7 +558,7 @@ class JournalUpdateService 'decimal_places' => $recordCurrency->decimal_places, 'amount' => $originalSourceAmount, ], - ['currency_symbol' => $recordCurrency->symbol, 'decimal_places' => $recordCurrency->decimal_places, 'amount' => $value] + ['currency_symbol' => $recordCurrency->symbol, 'decimal_places' => $recordCurrency->decimal_places, 'amount' => $value] ) ); } @@ -658,7 +658,7 @@ class JournalUpdateService /** @var TransactionJournalMetaFactory $factory */ $factory = app(TransactionJournalMetaFactory::class); - $set = ['journal' => $this->transactionJournal, 'name' => '_internal_previous_date', 'data' => null]; + $set = ['journal' => $this->transactionJournal, 'name' => '_internal_previous_date', 'data' => null]; if ($res) { Log::debug('Transaction is set to be AFTER its current date. Save also the "_internal_previous_date"-field.'); $set['data'] = clone $this->transactionJournal->date; @@ -777,7 +777,7 @@ class JournalUpdateService 'decimal_places' => $recordCurrency->decimal_places, 'amount' => $originalSourceAmount, ], - ['currency_symbol' => $recordCurrency->symbol, 'decimal_places' => $recordCurrency->decimal_places, 'amount' => $value] + ['currency_symbol' => $recordCurrency->symbol, 'decimal_places' => $recordCurrency->decimal_places, 'amount' => $value] ) ); } @@ -831,10 +831,10 @@ class JournalUpdateService return; } Log::debug(sprintf('Field "%s" is present ("%s"), try to update it.', $field, $value)); - $set = ['journal' => $this->transactionJournal, 'name' => $field, 'data' => $value]; + $set = ['journal' => $this->transactionJournal, 'name' => $field, 'data' => $value]; $factory->updateOrCreate($set); // also set date with timezone. - $set = ['journal' => $this->transactionJournal, 'name' => sprintf('%s_tz', $field), 'data' => $value?->format('e')]; + $set = ['journal' => $this->transactionJournal, 'name' => sprintf('%s_tz', $field), 'data' => $value?->format('e')]; $factory->updateOrCreate($set); } } @@ -849,7 +849,7 @@ class JournalUpdateService if ($this->hasFields([$field])) { $value = '' === $this->data[$field] ? null : $this->data[$field]; Log::debug(sprintf('Field "%s" is present ("%s"), try to update it.', $field, $value)); - $set = ['journal' => $this->transactionJournal, 'name' => $field, 'data' => $value]; + $set = ['journal' => $this->transactionJournal, 'name' => $field, 'data' => $value]; $factory->updateOrCreate($set); } } diff --git a/app/Services/Internal/Update/RecurrenceUpdateService.php b/app/Services/Internal/Update/RecurrenceUpdateService.php index a0c21bd335..cb0d97b5df 100644 --- a/app/Services/Internal/Update/RecurrenceUpdateService.php +++ b/app/Services/Internal/Update/RecurrenceUpdateService.php @@ -124,7 +124,7 @@ class RecurrenceUpdateService return $recurrence->recurrenceRepetitions()->first(); } // find it: - $fields = ['id' => 'id', 'type' => 'repetition_type', 'moment' => 'repetition_moment', 'skip' => 'repetition_skip', 'weekend' => 'weekend']; + $fields = ['id' => 'id', 'type' => 'repetition_type', 'moment' => 'repetition_moment', 'skip' => 'repetition_skip', 'weekend' => 'weekend']; $query = $recurrence->recurrenceRepetitions(); foreach ($fields as $field => $column) { if (array_key_exists($field, $data)) { @@ -265,7 +265,7 @@ class RecurrenceUpdateService if (!$match instanceof RecurrenceRepetition) { throw new FireflyException('Cannot match recurring repetition to existing repetition. Not sure what to do. Break.'); } - $fields = ['type' => 'repetition_type', 'moment' => 'repetition_moment', 'skip' => 'repetition_skip', 'weekend' => 'weekend']; + $fields = ['type' => 'repetition_type', 'moment' => 'repetition_moment', 'skip' => 'repetition_skip', 'weekend' => 'weekend']; foreach ($fields as $field => $column) { if (array_key_exists($field, $current)) { $match->{$column} = $current[$field]; @@ -298,7 +298,7 @@ class RecurrenceUpdateService foreach ($transactions as $ii => $submittedTransaction) { if (array_key_exists('id', $submittedTransaction) && (int) $originalTransaction['id'] === (int) $submittedTransaction['id']) { Log::debug(sprintf('Match original transaction #%d with an entry in the submitted array.', $originalTransaction['id'])); - $combinations[] = ['original' => $originalTransaction, 'submitted' => $submittedTransaction]; + $combinations[] = ['original' => $originalTransaction, 'submitted' => $submittedTransaction]; unset($originalTransactions[$i], $transactions[$ii]); } } @@ -307,7 +307,7 @@ class RecurrenceUpdateService if (1 === count($originalTransactions) && 1 === count($transactions)) { $first = array_shift($originalTransactions); Log::debug(sprintf('One left of each, link them (ID is #%d)', $first['id'])); - $combinations[] = ['original' => $first, 'submitted' => array_shift($transactions)]; + $combinations[] = ['original' => $first, 'submitted' => array_shift($transactions)]; unset($first); } // if they are both empty, we can safely loop all combinations and update them. diff --git a/app/Services/Password/PwndVerifierV2.php b/app/Services/Password/PwndVerifierV2.php index d915d926d9..5bb27b3539 100644 --- a/app/Services/Password/PwndVerifierV2.php +++ b/app/Services/Password/PwndVerifierV2.php @@ -44,7 +44,7 @@ class PwndVerifierV2 implements Verifier $prefix = substr($hash, 0, 5); $rest = substr($hash, 5); $url = sprintf('https://api.pwnedpasswords.com/range/%s', $prefix); - $opt = ['headers' => ['User-Agent' => sprintf('Firefly III v%s', config('firefly.version')), 'Add-Padding' => 'true'], 'timeout' => 3.1415]; + $opt = ['headers' => ['User-Agent' => sprintf('Firefly III v%s', config('firefly.version')), 'Add-Padding' => 'true'], 'timeout' => 3.1415]; Log::debug(sprintf('hash prefix is %s', $prefix)); Log::debug(sprintf('rest is %s', $rest)); diff --git a/app/Support/Amount.php b/app/Support/Amount.php index b8a455b019..ffe6974f9d 100644 --- a/app/Support/Amount.php +++ b/app/Support/Amount.php @@ -268,7 +268,7 @@ class Amount return [ 'mon_decimal_point' => $config['mon_decimal_point'], 'mon_thousands_sep' => $config['mon_thousands_sep'], - 'format' => ['pos' => $positive, 'neg' => $negative, 'zero' => $positive], + 'format' => ['pos' => $positive, 'neg' => $negative, 'zero' => $positive], ]; } diff --git a/app/Support/Authentication/RemoteUserProvider.php b/app/Support/Authentication/RemoteUserProvider.php index cef126bd62..06785b6d94 100644 --- a/app/Support/Authentication/RemoteUserProvider.php +++ b/app/Support/Authentication/RemoteUserProvider.php @@ -71,7 +71,7 @@ class RemoteUserProvider implements UserProvider $user = User::where('email', $identifier)->first(); if (null === $user) { Log::debug(sprintf('User with email "%s" not found. Will be created.', $identifier)); - $user = User::create(['blocked' => false, 'blocked_code' => null, 'email' => $identifier, 'password' => bcrypt(Str::random(64))]); + $user = User::create(['blocked' => false, 'blocked_code' => null, 'email' => $identifier, 'password' => bcrypt(Str::random(64))]); // if this is the first user, give them admin as well. if (1 === User::count()) { $roleObject = Role::where('name', 'owner')->first(); diff --git a/app/Support/Balance.php b/app/Support/Balance.php index 03b24b1a99..9d15f5ff8e 100644 --- a/app/Support/Balance.php +++ b/app/Support/Balance.php @@ -68,7 +68,7 @@ class Balance if (array_key_exists($currencyId, $return[$accountId])) { continue; } - $return[$accountId][$currencyId] = ['currency' => $currencies[$currencyId], 'balance' => $entry->balance_after, 'date' => clone $date]; + $return[$accountId][$currencyId] = ['currency' => $currencies[$currencyId], 'balance' => $entry->balance_after, 'date' => clone $date]; } return $return; diff --git a/app/Support/Chart/Budget/FrontpageChartGenerator.php b/app/Support/Chart/Budget/FrontpageChartGenerator.php index 2c18fe3abd..c51b2dcfd7 100644 --- a/app/Support/Chart/Budget/FrontpageChartGenerator.php +++ b/app/Support/Chart/Budget/FrontpageChartGenerator.php @@ -69,9 +69,9 @@ class FrontpageChartGenerator Log::debug('Now in generate for budget chart.'); $budgets = $this->budgetRepository->getActiveBudgets(); $data = [ - ['label' => (string) trans('firefly.spent_in_budget'), 'entries' => [], 'type' => 'bar'], - ['label' => (string) trans('firefly.left_to_spend'), 'entries' => [], 'type' => 'bar'], - ['label' => (string) trans('firefly.overspent'), 'entries' => [], 'type' => 'bar'], + ['label' => (string) trans('firefly.spent_in_budget'), 'entries' => [], 'type' => 'bar'], + ['label' => (string) trans('firefly.left_to_spend'), 'entries' => [], 'type' => 'bar'], + ['label' => (string) trans('firefly.overspent'), 'entries' => [], 'type' => 'bar'], ]; // loop al budgets: diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index a01e0a93c6..bf5cc26f95 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -129,7 +129,7 @@ class ExpandedForm unset($options['placeholder']); try { - $html = view('form.date', ['classes' => $classes, 'name' => $name, 'label' => $label, 'value' => $value, 'options' => $options])->render(); + $html = view('form.date', ['classes' => $classes, 'name' => $name, 'label' => $label, 'value' => $value, 'options' => $options])->render(); } catch (Throwable $e) { Log::debug(sprintf('Could not render date(): %s', $e->getMessage())); $html = 'Could not render date.'; @@ -151,7 +151,7 @@ class ExpandedForm $classes = $this->getHolderClasses($name); try { - $html = view('form.file', ['classes' => $classes, 'name' => $name, 'label' => $label, 'options' => $options])->render(); + $html = view('form.file', ['classes' => $classes, 'name' => $name, 'label' => $label, 'options' => $options])->render(); } catch (Throwable $e) { Log::debug(sprintf('Could not render file(): %s', $e->getMessage())); $html = 'Could not render file.'; @@ -311,7 +311,7 @@ class ExpandedForm $classes = $this->getHolderClasses($name); try { - $html = view('form.password', ['classes' => $classes, 'name' => $name, 'label' => $label, 'options' => $options])->render(); + $html = view('form.password', ['classes' => $classes, 'name' => $name, 'label' => $label, 'options' => $options])->render(); } catch (Throwable $e) { Log::debug(sprintf('Could not render password(): %s', $e->getMessage())); $html = 'Could not render password.'; @@ -395,7 +395,7 @@ class ExpandedForm $classes = $this->getHolderClasses($name); try { - $html = view('form.static', ['classes' => $classes, 'name' => $name, 'label' => $label, 'value' => $value, 'options' => $options])->render(); + $html = view('form.static', ['classes' => $classes, 'name' => $name, 'label' => $label, 'value' => $value, 'options' => $options])->render(); } catch (Throwable $e) { Log::debug(sprintf('Could not render staticText(): %s', $e->getMessage())); $html = 'Could not render staticText.'; @@ -419,7 +419,7 @@ class ExpandedForm $value = $this->fillFieldValue($name, $value); try { - $html = view('form.text', ['classes' => $classes, 'name' => $name, 'label' => $label, 'value' => $value, 'options' => $options])->render(); + $html = view('form.text', ['classes' => $classes, 'name' => $name, 'label' => $label, 'value' => $value, 'options' => $options])->render(); } catch (Throwable $e) { Log::debug(sprintf('Could not render text(): %s', $e->getMessage())); $html = 'Could not render text.'; diff --git a/app/Support/Form/PiggyBankForm.php b/app/Support/Form/PiggyBankForm.php index d1e948b944..5d931dfea5 100644 --- a/app/Support/Form/PiggyBankForm.php +++ b/app/Support/Form/PiggyBankForm.php @@ -49,7 +49,7 @@ class PiggyBankForm $piggyBanks = $repository->getPiggyBanksWithAmount(); $title = (string) trans('firefly.default_group_title_name'); $array = []; - $subList = [0 => ['group' => ['title' => $title], 'piggies' => [(string) trans('firefly.none_in_select_list')]]]; + $subList = [0 => ['group' => ['title' => $title], 'piggies' => [(string) trans('firefly.none_in_select_list')]]]; /** @var PiggyBank $piggy */ foreach ($piggyBanks as $piggy) { @@ -60,7 +60,7 @@ class PiggyBankForm $groupTitle = $group->title; $groupOrder = $group->order; } - $subList[$groupOrder] ??= ['group' => ['title' => $groupTitle], 'piggies' => []]; + $subList[$groupOrder] ??= ['group' => ['title' => $groupTitle], 'piggies' => []]; $subList[$groupOrder]['piggies'][$piggy->id] = $piggy->name; } ksort($subList); diff --git a/app/Support/Http/Api/AccountBalanceGrouped.php b/app/Support/Http/Api/AccountBalanceGrouped.php index 3d2594a0d6..4890e74ae9 100644 --- a/app/Support/Http/Api/AccountBalanceGrouped.php +++ b/app/Support/Http/Api/AccountBalanceGrouped.php @@ -211,7 +211,7 @@ class AccountBalanceGrouped { $currencyId = (int) $journal['currency_id']; $period = $journal['date']->format($this->carbonFormat); - $this->data[$currencyId][$period] ??= ['period' => $period, 'spent' => '0', 'earned' => '0', 'pc_spent' => '0', 'pc_earned' => '0']; + $this->data[$currencyId][$period] ??= ['period' => $period, 'spent' => '0', 'earned' => '0', 'pc_spent' => '0', 'pc_earned' => '0']; } private function findCurrency(int $currencyId): TransactionCurrency diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.php index 045ebb3c09..a507156873 100644 --- a/app/Support/Http/Controllers/AugumentData.php +++ b/app/Support/Http/Controllers/AugumentData.php @@ -281,7 +281,7 @@ trait AugumentData $total = $assets->merge($opposing); $collector->setRange($start, $end)->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setAccounts($total); $journals = $collector->getExtractedJournals(); - $sum = ['grand_sum' => '0', 'per_currency' => []]; + $sum = ['grand_sum' => '0', 'per_currency' => []]; // loop to support multi currency foreach ($journals as $journal) { $currencyId = (int) $journal['currency_id']; diff --git a/app/Support/Http/Controllers/ChartGeneration.php b/app/Support/Http/Controllers/ChartGeneration.php index 087eefe316..177b2e4e2b 100644 --- a/app/Support/Http/Controllers/ChartGeneration.php +++ b/app/Support/Http/Controllers/ChartGeneration.php @@ -80,7 +80,7 @@ trait ChartGeneration $field = $convertToPrimary ? 'pc_balance' : 'balance'; $currency = $usePrimary ? $primary : $currency; Log::debug(sprintf('Will use field %s', $field)); - $currentSet = ['label' => $account->name, 'currency_symbol' => $currency->symbol, 'entries' => []]; + $currentSet = ['label' => $account->name, 'currency_symbol' => $currency->symbol, 'entries' => []]; $currentStart = clone $start; $range = Steam::finalAccountBalanceInRange($account, clone $start, clone $end, $this->convertToPrimary); diff --git a/app/Support/Http/Controllers/CreateStuff.php b/app/Support/Http/Controllers/CreateStuff.php index bea31d1b61..a151dab50f 100644 --- a/app/Support/Http/Controllers/CreateStuff.php +++ b/app/Support/Http/Controllers/CreateStuff.php @@ -138,6 +138,6 @@ trait CreateStuff */ protected function createUser(array $data): User // create object { - return User::create(['email' => $data['email'], 'password' => bcrypt($data['password'])]); + return User::create(['email' => $data['email'], 'password' => bcrypt($data['password'])]); } } diff --git a/app/Support/Http/Controllers/CronRunner.php b/app/Support/Http/Controllers/CronRunner.php index 5087de1a94..2cf906727b 100644 --- a/app/Support/Http/Controllers/CronRunner.php +++ b/app/Support/Http/Controllers/CronRunner.php @@ -47,7 +47,7 @@ trait CronRunner try { $billWarning->fire(); } catch (FireflyException $e) { - return ['job_fired' => false, 'job_succeeded' => false, 'job_errored' => true, 'message' => $e->getMessage()]; + return ['job_fired' => false, 'job_succeeded' => false, 'job_errored' => true, 'message' => $e->getMessage()]; } return [ @@ -68,7 +68,7 @@ trait CronRunner try { $exchangeRates->fire(); } catch (FireflyException $e) { - return ['job_fired' => false, 'job_succeeded' => false, 'job_errored' => true, 'message' => $e->getMessage()]; + return ['job_fired' => false, 'job_succeeded' => false, 'job_errored' => true, 'message' => $e->getMessage()]; } return [ @@ -89,7 +89,7 @@ trait CronRunner try { $autoBudget->fire(); } catch (FireflyException $e) { - return ['job_fired' => false, 'job_succeeded' => false, 'job_errored' => true, 'message' => $e->getMessage()]; + return ['job_fired' => false, 'job_succeeded' => false, 'job_errored' => true, 'message' => $e->getMessage()]; } return [ @@ -110,7 +110,7 @@ trait CronRunner try { $recurring->fire(); } catch (FireflyException $e) { - return ['job_fired' => false, 'job_succeeded' => false, 'job_errored' => true, 'message' => $e->getMessage()]; + return ['job_fired' => false, 'job_succeeded' => false, 'job_errored' => true, 'message' => $e->getMessage()]; } return [ @@ -131,7 +131,7 @@ trait CronRunner try { $webhook->fire(); } catch (FireflyException $e) { - return ['job_fired' => false, 'job_succeeded' => false, 'job_errored' => true, 'message' => $e->getMessage()]; + return ['job_fired' => false, 'job_succeeded' => false, 'job_errored' => true, 'message' => $e->getMessage()]; } return [ diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.php index 6c8810702b..d0cd6f7c03 100644 --- a/app/Support/Http/Controllers/PeriodOverview.php +++ b/app/Support/Http/Controllers/PeriodOverview.php @@ -564,10 +564,10 @@ trait PeriodOverview $groupedSpent = $this->groupByCurrency($spent); $groupedEarned = $this->groupByCurrency($earned); $groupedTransferred = $this->groupByCurrency($transferred); - $entry = ['title' => $title, 'route' => route(sprintf('%s.no-%s', Str::plural($model), $model), [ + $entry = ['title' => $title, 'route' => route(sprintf('%s.no-%s', Str::plural($model), $model), [ $start->format('Y-m-d'), $end->format('Y-m-d'), - ]), 'total_transactions' => count($spent), 'spent' => $groupedSpent, 'earned' => $groupedEarned, 'transferred' => $groupedTransferred]; + ]), 'total_transactions' => count($spent), 'spent' => $groupedSpent, 'earned' => $groupedEarned, 'transferred' => $groupedTransferred]; $this->saveGroupedForPrefix(sprintf('no_%s', $model), $start, $end, 'spent', $groupedSpent); $this->saveGroupedForPrefix(sprintf('no_%s', $model), $start, $end, 'earned', $groupedEarned); $this->saveGroupedForPrefix(sprintf('no_%s', $model), $start, $end, 'transferred', $groupedTransferred); @@ -576,10 +576,10 @@ trait PeriodOverview } Log::debug(sprintf('Found %d statistics in period %s - %s.', count($statistics), $start->format('Y-m-d'), $end->format('Y-m-d'))); - $entry = ['title' => $title, 'route' => route(sprintf('%s.no-%s', Str::plural($model), $model), [ + $entry = ['title' => $title, 'route' => route(sprintf('%s.no-%s', Str::plural($model), $model), [ $start->format('Y-m-d'), $end->format('Y-m-d'), - ]), 'total_transactions' => 0, 'spent' => [], 'earned' => [], 'transferred' => []]; + ]), 'total_transactions' => 0, 'spent' => [], 'earned' => [], 'transferred' => []]; $grouped = []; /** @var PeriodStatistic $statistic */ diff --git a/app/Support/Http/Controllers/RenderPartialViews.php b/app/Support/Http/Controllers/RenderPartialViews.php index 07fba9873a..4ac5322ad3 100644 --- a/app/Support/Http/Controllers/RenderPartialViews.php +++ b/app/Support/Http/Controllers/RenderPartialViews.php @@ -70,7 +70,7 @@ trait RenderPartialViews $journals = $popupHelper->balanceForBudget($budget, $account, $attributes); try { - $view = view('popup.report.balance-amount', ['journals' => $journals, 'budget' => $budget, 'account' => $account])->render(); + $view = view('popup.report.balance-amount', ['journals' => $journals, 'budget' => $budget, 'account' => $account])->render(); } catch (Throwable $e) { Log::error(sprintf('Could not render: %s', $e->getMessage())); $view = 'Firefly III could not render the view. Please see the log files.'; @@ -125,7 +125,7 @@ trait RenderPartialViews $journals = $popupHelper->byBudget($budget, $attributes); try { - $view = view('popup.report.budget-spent-amount', ['journals' => $journals, 'budget' => $budget])->render(); + $view = view('popup.report.budget-spent-amount', ['journals' => $journals, 'budget' => $budget])->render(); } catch (Throwable $e) { Log::error(sprintf('Could not render: %s', $e->getMessage())); $view = 'Firefly III could not render the view. Please see the log files.'; @@ -261,7 +261,7 @@ trait RenderPartialViews $journals = $popupHelper->byExpenses($account, $attributes); try { - $view = view('popup.report.expense-entry', ['journals' => $journals, 'account' => $account])->render(); + $view = view('popup.report.expense-entry', ['journals' => $journals, 'account' => $account])->render(); } catch (Throwable $e) { Log::error(sprintf('Could not render: %s', $e->getMessage())); $view = 'Firefly III could not render the view. Please see the log files.'; @@ -382,7 +382,7 @@ trait RenderPartialViews $journals = $popupHelper->byIncome($account, $attributes); try { - $view = view('popup.report.income-entry', ['journals' => $journals, 'account' => $account])->render(); + $view = view('popup.report.income-entry', ['journals' => $journals, 'account' => $account])->render(); } catch (Throwable $e) { Log::error(sprintf('Could not render: %s', $e->getMessage())); $view = 'Firefly III could not render the view. Please see the log files.'; diff --git a/app/Support/JsonApi/Enrichments/AccountEnrichment.php b/app/Support/JsonApi/Enrichments/AccountEnrichment.php index dc97241a89..48c65a52c3 100644 --- a/app/Support/JsonApi/Enrichments/AccountEnrichment.php +++ b/app/Support/JsonApi/Enrichments/AccountEnrichment.php @@ -172,7 +172,7 @@ class AccountEnrichment implements EnrichmentInterface $item->full_account_type = $this->accountTypes[(int) $item->account_type_id] ?? null; $meta = [ 'currency' => null, - 'location' => ['latitude' => null, 'longitude' => null, 'zoom_level' => null], + 'location' => ['latitude' => null, 'longitude' => null, 'zoom_level' => null], 'object_group_id' => null, 'object_group_order' => null, 'object_group_title' => null, @@ -423,8 +423,8 @@ class AccountEnrichment implements EnrichmentInterface ; $journals = $collector->getExtractedJournals(); foreach ($journals as $journal) { - $this->openingBalances[(int) $journal['source_account_id']] = ['amount' => Steam::negative($journal['amount']), 'date' => $journal['date']]; - $this->openingBalances[(int) $journal['destination_account_id']] = ['amount' => Steam::positive($journal['amount']), 'date' => $journal['date']]; + $this->openingBalances[(int) $journal['source_account_id']] = ['amount' => Steam::negative($journal['amount']), 'date' => $journal['date']]; + $this->openingBalances[(int) $journal['destination_account_id']] = ['amount' => Steam::positive($journal['amount']), 'date' => $journal['date']]; } } diff --git a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php index 6ece6c1ac6..0d5f07f768 100644 --- a/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php +++ b/app/Support/JsonApi/Enrichments/PiggyBankEnrichment.php @@ -211,7 +211,7 @@ class PiggyBankEnrichment implements EnrichmentInterface $this->accountIds[$id] = (int) $item->account_id; } if (!array_key_exists($accountId, $this->amounts[$id])) { - $this->amounts[$id][$accountId] = ['current_amount' => '0', 'pc_current_amount' => '0']; + $this->amounts[$id][$accountId] = ['current_amount' => '0', 'pc_current_amount' => '0']; } $this->amounts[$id][$accountId]['current_amount'] = bcadd( (string) $this->amounts[$id][$accountId]['current_amount'], @@ -245,7 +245,7 @@ class PiggyBankEnrichment implements EnrichmentInterface /** @var Account $item */ foreach ($set as $item) { $id = (int) $item->id; - $this->accounts[$id] = ['id' => $id, 'name' => $item->name]; + $this->accounts[$id] = ['id' => $id, 'name' => $item->name]; } } diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php index fc746fe878..8d7c840315 100644 --- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php +++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php @@ -119,11 +119,7 @@ class RecurringEnrichment implements EnrichmentInterface if ('weekly' === $repetition->repetition_type) { $dayOfWeek = trans(sprintf('config.dow_%s', $repetition->repetition_moment), [], $this->language); if ($repetition->repetition_skip > 0) { - return (string) trans( - 'firefly.recurring_weekly_skip', - ['weekday' => $dayOfWeek, 'skip' => $repetition->repetition_skip + 1], - $this->language - ); + return (string) trans('firefly.recurring_weekly_skip', ['weekday' => $dayOfWeek, 'skip' => $repetition->repetition_skip + 1], $this->language); } return (string) trans('firefly.recurring_weekly', ['weekday' => $dayOfWeek], $this->language); @@ -132,14 +128,14 @@ class RecurringEnrichment implements EnrichmentInterface if ($repetition->repetition_skip > 0) { return (string) trans( 'firefly.recurring_monthly_skip', - ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip + 1], + ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip + 1], $this->language ); } return (string) trans( 'firefly.recurring_monthly', - ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip - 1], + ['dayOfMonth' => $repetition->repetition_moment, 'skip' => $repetition->repetition_skip - 1], $this->language ); } @@ -150,12 +146,12 @@ class RecurringEnrichment implements EnrichmentInterface if ($repetition->repetition_skip > 0) { return (string) trans( 'firefly.recurring_ndom_skip', - ['skip' => $repetition->repetition_skip, 'weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], + ['skip' => $repetition->repetition_skip, 'weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], $this->language ); } - return (string) trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], $this->language); + return (string) trans('firefly.recurring_ndom', ['weekday' => $dayOfWeek, 'dayOfMonth' => $parts[0]], $this->language); } if ('yearly' === $repetition->repetition_type) { $today = today(config('app.timezone'))->endOfYear(); @@ -427,7 +423,7 @@ class RecurringEnrichment implements EnrichmentInterface if ((int) $entry->value > 0) { $this->transactions[$recurrenceId][$transactionId]['subscription_id'] = $entry->value; if (!array_key_exists($id, $billIds)) { - $billIds[$id] = ['recurrence_id' => $recurrenceId, 'transaction_id' => $transactionId, 'bill_id' => (int) $entry->value]; + $billIds[$id] = ['recurrence_id' => $recurrenceId, 'transaction_id' => $transactionId, 'bill_id' => (int) $entry->value]; } } @@ -470,7 +466,7 @@ class RecurringEnrichment implements EnrichmentInterface if ('' !== (string) $entry->value) { $this->transactions[$recurrenceId][$transactionId]['category_name'] = (string) $entry->value; if (!array_key_exists($id, $categoryIds)) { - $categoryNames[$id] = ['recurrence_id' => $recurrenceId, 'transaction_id' => $transactionId, 'category_name' => $entry->value]; + $categoryNames[$id] = ['recurrence_id' => $recurrenceId, 'transaction_id' => $transactionId, 'category_name' => $entry->value]; } } @@ -480,7 +476,7 @@ class RecurringEnrichment implements EnrichmentInterface if ((int) $entry->value > 0) { $this->transactions[$recurrenceId][$transactionId]['budget_id'] = (string) $entry->value; if (!array_key_exists($id, $budgetIds)) { - $budgetIds[$id] = ['recurrence_id' => $recurrenceId, 'transaction_id' => $transactionId, 'budget_id' => (int) $entry->value]; + $budgetIds[$id] = ['recurrence_id' => $recurrenceId, 'transaction_id' => $transactionId, 'budget_id' => (int) $entry->value]; } } diff --git a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php index e63a0b09e0..7679f8be42 100644 --- a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php +++ b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php @@ -128,7 +128,7 @@ class TransactionGroupEnrichment implements EnrichmentInterface $item['transactions'][$index]['attachment_count'] = array_key_exists($journalId, $attachmentCount) ? $attachmentCount[$journalId] : 0; // default location data - $item['transactions'][$index]['location'] = ['latitude' => null, 'longitude' => null, 'zoom_level' => null]; + $item['transactions'][$index]['location'] = ['latitude' => null, 'longitude' => null, 'zoom_level' => null]; // primary currency $item['transactions'][$index]['primary_currency'] = [ diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index fd4800e730..1b3441d9c3 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -104,7 +104,7 @@ class Navigation // make sure we don't go overboard if ($workEnd->gt($start)) { - $periods[] = ['start' => clone $workStart, 'end' => clone $workEnd, 'period' => $range]; + $periods[] = ['start' => clone $workStart, 'end' => clone $workEnd, 'period' => $range]; } // skip to the next period: $workStart->subDay()->startOfDay(); @@ -120,7 +120,7 @@ class Navigation // make sure we don't go overboard if ($workEnd->gt($start)) { - $periods[] = ['start' => clone $workStart, 'end' => clone $workEnd, 'period' => '1Y']; + $periods[] = ['start' => clone $workStart, 'end' => clone $workEnd, 'period' => '1Y']; } // skip to the next period: $workStart->subDay()->startOfDay(); @@ -221,7 +221,7 @@ class Navigation 'yearly' => 'addYears', '1Y' => 'addYears', ]; - $modifierMap = ['half-year' => 6, 'half_year' => 6, '6M' => 6]; + $modifierMap = ['half-year' => 6, 'half_year' => 6, '6M' => 6]; $subDay = ['week', 'weekly', '1W', 'month', 'monthly', '1M', '3M', 'quarter', 'quarterly', '6M', 'half-year', 'half_year', '1Y', 'year', 'yearly']; if ('custom' === $repeatFreq) { @@ -744,7 +744,7 @@ class Navigation '1Y' => 'subYears', 'yearly' => 'subYears', ]; - $modifierMap = ['quarter' => 3, '3M' => 3, 'quarterly' => 3, 'half-year' => 6, '6M' => 6]; + $modifierMap = ['quarter' => 3, '3M' => 3, 'quarterly' => 3, 'half-year' => 6, '6M' => 6]; if (array_key_exists($repeatFreq, $functionMap)) { $function = $functionMap[$repeatFreq]; $date->{$function}($subtract); @@ -821,7 +821,7 @@ class Navigation public function updateEndDate(string $range, Carbon $start): Carbon { Log::debug(sprintf('updateEndDate("%s", "%s")', $range, $start->format('Y-m-d'))); - $functionMap = ['1D' => 'endOfDay', '1W' => 'endOfWeek', '1M' => 'endOfMonth', '3M' => 'lastOfQuarter', 'custom' => 'startOfMonth']; // this only happens in test situations. + $functionMap = ['1D' => 'endOfDay', '1W' => 'endOfWeek', '1M' => 'endOfMonth', '3M' => 'lastOfQuarter', 'custom' => 'startOfMonth']; // this only happens in test situations. $end = clone $start; if (array_key_exists($range, $functionMap)) { diff --git a/app/Support/ParseDateString.php b/app/Support/ParseDateString.php index 8251a149df..7d37a2c379 100644 --- a/app/Support/ParseDateString.php +++ b/app/Support/ParseDateString.php @@ -318,7 +318,7 @@ class ParseDateString Log::debug(sprintf('parseMonthYearRange: Parsed "%s".', $date)); $parts = explode('-', $date); - return ['year' => $parts[0], 'month' => $parts[1]]; + return ['year' => $parts[0], 'month' => $parts[1]]; } protected function parseRelativeDate(string $date): Carbon @@ -379,7 +379,7 @@ class ParseDateString Log::debug(sprintf('parseDayYearRange: Parsed "%s".', $date)); $parts = explode('-', $date); - return ['year' => $parts[0], 'day' => $parts[2]]; + return ['year' => $parts[0], 'day' => $parts[2]]; } /** @@ -390,6 +390,6 @@ class ParseDateString Log::debug(sprintf('parseMonthDayRange: Parsed "%s".', $date)); $parts = explode('-', $date); - return ['month' => $parts[1], 'day' => $parts[2]]; + return ['month' => $parts[1], 'day' => $parts[2]]; } } diff --git a/app/Support/Report/Budget/BudgetReportGenerator.php b/app/Support/Report/Budget/BudgetReportGenerator.php index 9b8aa084af..24c81a4b93 100644 --- a/app/Support/Report/Budget/BudgetReportGenerator.php +++ b/app/Support/Report/Budget/BudgetReportGenerator.php @@ -76,7 +76,7 @@ class BudgetReportGenerator /** @var Account $account */ foreach ($this->accounts as $account) { $accountId = $account->id; - $this->report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; + $this->report[$accountId] ??= ['name' => $account->name, 'id' => $account->id, 'iban' => $account->iban, 'currencies' => []]; } // loop expenses. @@ -91,7 +91,7 @@ class BudgetReportGenerator */ public function general(): void { - $this->report = ['budgets' => [], 'sums' => []]; + $this->report = ['budgets' => [], 'sums' => []]; $this->generalBudgetReport(); $this->noBudgetReport(); @@ -151,7 +151,7 @@ class BudgetReportGenerator private function noBudgetReport(): void { // add no budget info. - $this->report['budgets'][0] = ['budget_id' => null, 'budget_name' => null, 'no_budget' => true, 'budget_limits' => []]; + $this->report['budgets'][0] = ['budget_id' => null, 'budget_name' => null, 'no_budget' => true, 'budget_limits' => []]; $noBudget = $this->nbRepository->sumExpenses($this->start, $this->end, $this->accounts); foreach ($noBudget as $noBudgetEntry) { diff --git a/app/Support/Report/Category/CategoryReportGenerator.php b/app/Support/Report/Category/CategoryReportGenerator.php index 1dd7969019..0d94d802ea 100644 --- a/app/Support/Report/Category/CategoryReportGenerator.php +++ b/app/Support/Report/Category/CategoryReportGenerator.php @@ -72,7 +72,7 @@ class CategoryReportGenerator $earnedWithout = $this->noCatRepository->listIncome($this->start, $this->end, $this->accounts); $spentWithout = $this->noCatRepository->listExpenses($this->start, $this->end, $this->accounts); - $this->report = ['categories' => [], 'sums' => []]; + $this->report = ['categories' => [], 'sums' => []]; // needs four for-each loops. foreach ([$earnedWith, $spentWith, $earnedWithout, $spentWithout, $transferredIn, $transferredOut] as $data) { diff --git a/app/Support/Request/ConvertsDataTypes.php b/app/Support/Request/ConvertsDataTypes.php index 5a5af89e14..4f2fcd79da 100644 --- a/app/Support/Request/ConvertsDataTypes.php +++ b/app/Support/Request/ConvertsDataTypes.php @@ -465,7 +465,7 @@ trait ConvertsDataTypes if (!array_key_exists('current_amount', $entry)) { $amount = null; } - $return[] = ['account_id' => $this->integerFromValue((string) ($entry['account_id'] ?? '0')), 'current_amount' => $amount]; + $return[] = ['account_id' => $this->integerFromValue((string) ($entry['account_id'] ?? '0')), 'current_amount' => $amount]; } return $return; diff --git a/app/Support/Request/ValidatesWebhooks.php b/app/Support/Request/ValidatesWebhooks.php index f49885f992..6c257709b4 100644 --- a/app/Support/Request/ValidatesWebhooks.php +++ b/app/Support/Request/ValidatesWebhooks.php @@ -83,7 +83,7 @@ trait ValidatesWebhooks Log::debug(sprintf('Trigger %s and response %s are forbidden.', $trigger, $response)); $validator->errors()->add( sprintf('responses.%d', $ii), - trans('validation.bad_webhook_combination', ['trigger' => $trigger, 'response' => $response]) + trans('validation.bad_webhook_combination', ['trigger' => $trigger, 'response' => $response]) ); return; diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.php index f8d4bd403c..8de9e78429 100644 --- a/app/Support/Search/OperatorQuerySearch.php +++ b/app/Support/Search/OperatorQuerySearch.php @@ -304,12 +304,12 @@ class OperatorQuerySearch implements SearchInterface // must be valid operator: $inArray = in_array($operator, $this->validOperators, true); if ($inArray && $this->updateCollector($operator, $value, $prohibited)) { - $this->operators->push(['type' => self::getRootOperator($operator), 'value' => $value, 'prohibited' => $prohibited]); + $this->operators->push(['type' => self::getRootOperator($operator), 'value' => $value, 'prohibited' => $prohibited]); Log::debug(sprintf('Added operator type "%s"', $operator)); } if (!$inArray) { Log::debug(sprintf('Added INVALID operator type "%s"', $operator)); - $this->invalidOperators[] = ['type' => $operator, 'value' => $value]; + $this->invalidOperators[] = ['type' => $operator, 'value' => $value]; } } @@ -381,7 +381,7 @@ class OperatorQuerySearch implements SearchInterface $parsedDate = $parser->parseDate($value); } catch (FireflyException) { Log::debug(sprintf('Could not parse date "%s", will return empty array.', $value)); - $this->invalidOperators[] = ['type' => $type, 'value' => $value]; + $this->invalidOperators[] = ['type' => $type, 'value' => $value]; return []; } @@ -685,7 +685,7 @@ class OperatorQuerySearch implements SearchInterface case 'exact': if ($value instanceof Carbon) { $this->collector->setAfter($value); - $this->operators->push(['type' => 'date_after', 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => 'date_after', 'value' => $value->format('Y-m-d')]); } break; @@ -694,7 +694,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_after YEAR value "%s"', $value)); $this->collector->yearAfter($value); - $this->operators->push(['type' => 'date_after_year', 'value' => $value]); + $this->operators->push(['type' => 'date_after_year', 'value' => $value]); } break; @@ -703,7 +703,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_after MONTH value "%s"', $value)); $this->collector->monthAfter($value); - $this->operators->push(['type' => 'date_after_month', 'value' => $value]); + $this->operators->push(['type' => 'date_after_month', 'value' => $value]); } break; @@ -712,7 +712,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_after DAY value "%s"', $value)); $this->collector->dayAfter($value); - $this->operators->push(['type' => 'date_after_day', 'value' => $value]); + $this->operators->push(['type' => 'date_after_day', 'value' => $value]); } break; @@ -741,7 +741,7 @@ class OperatorQuerySearch implements SearchInterface case 'exact': if ($value instanceof Carbon) { $this->collector->setBefore($value); - $this->operators->push(['type' => 'date_before', 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => 'date_before', 'value' => $value->format('Y-m-d')]); } break; @@ -750,7 +750,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_before YEAR value "%s"', $value)); $this->collector->yearBefore($value); - $this->operators->push(['type' => 'date_before_year', 'value' => $value]); + $this->operators->push(['type' => 'date_before_year', 'value' => $value]); } break; @@ -759,7 +759,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_before MONTH value "%s"', $value)); $this->collector->monthBefore($value); - $this->operators->push(['type' => 'date_before_month', 'value' => $value]); + $this->operators->push(['type' => 'date_before_month', 'value' => $value]); } break; @@ -768,7 +768,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_before DAY value "%s"', $value)); $this->collector->dayBefore($value); - $this->operators->push(['type' => 'date_before_day', 'value' => $value]); + $this->operators->push(['type' => 'date_before_day', 'value' => $value]); } break; @@ -798,7 +798,7 @@ class OperatorQuerySearch implements SearchInterface if ($value instanceof Carbon) { Log::debug(sprintf('Set date_is_exact value "%s"', $value->format('Y-m-d'))); $this->collector->setRange($value, $value); - $this->operators->push(['type' => 'date_on', 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => 'date_on', 'value' => $value->format('Y-m-d')]); } break; @@ -806,7 +806,7 @@ class OperatorQuerySearch implements SearchInterface case 'exact_not': if ($value instanceof Carbon) { $this->collector->excludeRange($value, $value); - $this->operators->push(['type' => 'not_date_on', 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => 'not_date_on', 'value' => $value->format('Y-m-d')]); } break; @@ -815,7 +815,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_exact YEAR value "%s"', $value)); $this->collector->yearIs($value); - $this->operators->push(['type' => 'date_on_year', 'value' => $value]); + $this->operators->push(['type' => 'date_on_year', 'value' => $value]); } break; @@ -824,7 +824,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_exact_not YEAR value "%s"', $value)); $this->collector->yearIsNot($value); - $this->operators->push(['type' => 'not_date_on_year', 'value' => $value]); + $this->operators->push(['type' => 'not_date_on_year', 'value' => $value]); } break; @@ -833,7 +833,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_exact MONTH value "%s"', $value)); $this->collector->monthIs($value); - $this->operators->push(['type' => 'date_on_month', 'value' => $value]); + $this->operators->push(['type' => 'date_on_month', 'value' => $value]); } break; @@ -842,7 +842,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_exact not MONTH value "%s"', $value)); $this->collector->monthIsNot($value); - $this->operators->push(['type' => 'not_date_on_month', 'value' => $value]); + $this->operators->push(['type' => 'not_date_on_month', 'value' => $value]); } break; @@ -851,7 +851,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_exact DAY value "%s"', $value)); $this->collector->dayIs($value); - $this->operators->push(['type' => 'date_on_day', 'value' => $value]); + $this->operators->push(['type' => 'date_on_day', 'value' => $value]); } break; @@ -860,7 +860,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set not date_is_exact DAY value "%s"', $value)); $this->collector->dayIsNot($value); - $this->operators->push(['type' => 'not_date_on_day', 'value' => $value]); + $this->operators->push(['type' => 'not_date_on_day', 'value' => $value]); } break; @@ -892,7 +892,7 @@ class OperatorQuerySearch implements SearchInterface if ($value instanceof Carbon) { Log::debug(sprintf('Set %s_is_exact value "%s"', $field, $value->format('Y-m-d'))); $this->collector->setMetaDateRange($value, $value, $field); - $this->operators->push(['type' => sprintf('%s_on', $field), 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => sprintf('%s_on', $field), 'value' => $value->format('Y-m-d')]); } break; @@ -901,7 +901,7 @@ class OperatorQuerySearch implements SearchInterface if ($value instanceof Carbon) { Log::debug(sprintf('Set NOT %s_is_exact value "%s"', $field, $value->format('Y-m-d'))); $this->collector->excludeMetaDateRange($value, $value, $field); - $this->operators->push(['type' => sprintf('not_%s_on', $field), 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => sprintf('not_%s_on', $field), 'value' => $value->format('Y-m-d')]); } break; @@ -910,7 +910,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_exact YEAR value "%s"', $field, $value)); $this->collector->metaYearIs($value, $field); - $this->operators->push(['type' => sprintf('%s_on_year', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_on_year', $field), 'value' => $value]); } break; @@ -919,7 +919,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set NOT %s_is_exact YEAR value "%s"', $field, $value)); $this->collector->metaYearIsNot($value, $field); - $this->operators->push(['type' => sprintf('not_%s_on_year', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('not_%s_on_year', $field), 'value' => $value]); } break; @@ -928,7 +928,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_exact MONTH value "%s"', $field, $value)); $this->collector->metaMonthIs($value, $field); - $this->operators->push(['type' => sprintf('%s_on_month', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_on_month', $field), 'value' => $value]); } break; @@ -937,7 +937,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set NOT %s_is_exact MONTH value "%s"', $field, $value)); $this->collector->metaMonthIsNot($value, $field); - $this->operators->push(['type' => sprintf('not_%s_on_month', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('not_%s_on_month', $field), 'value' => $value]); } break; @@ -946,7 +946,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_exact DAY value "%s"', $field, $value)); $this->collector->metaDayIs($value, $field); - $this->operators->push(['type' => sprintf('%s_on_day', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_on_day', $field), 'value' => $value]); } break; @@ -955,7 +955,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set NOT %s_is_exact DAY value "%s"', $field, $value)); $this->collector->metaDayIsNot($value, $field); - $this->operators->push(['type' => sprintf('not_%s_on_day', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('not_%s_on_day', $field), 'value' => $value]); } break; @@ -985,7 +985,7 @@ class OperatorQuerySearch implements SearchInterface if ($value instanceof Carbon) { Log::debug(sprintf('Set %s_is_exact value "%s"', $field, $value->format('Y-m-d'))); $this->collector->setObjectRange($value, clone $value, $field); - $this->operators->push(['type' => sprintf('%s_on', $field), 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => sprintf('%s_on', $field), 'value' => $value->format('Y-m-d')]); } break; @@ -994,7 +994,7 @@ class OperatorQuerySearch implements SearchInterface if ($value instanceof Carbon) { Log::debug(sprintf('Set NOT %s_is_exact value "%s"', $field, $value->format('Y-m-d'))); $this->collector->excludeObjectRange($value, clone $value, $field); - $this->operators->push(['type' => sprintf('not_%s_on', $field), 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => sprintf('not_%s_on', $field), 'value' => $value->format('Y-m-d')]); } break; @@ -1003,7 +1003,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_exact YEAR value "%s"', $field, $value)); $this->collector->objectYearIs($value, $field); - $this->operators->push(['type' => sprintf('%s_on_year', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_on_year', $field), 'value' => $value]); } break; @@ -1012,7 +1012,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set NOT %s_is_exact YEAR value "%s"', $field, $value)); $this->collector->objectYearIsNot($value, $field); - $this->operators->push(['type' => sprintf('not_%s_on_year', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('not_%s_on_year', $field), 'value' => $value]); } break; @@ -1021,7 +1021,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_exact MONTH value "%s"', $field, $value)); $this->collector->objectMonthIs($value, $field); - $this->operators->push(['type' => sprintf('%s_on_month', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_on_month', $field), 'value' => $value]); } break; @@ -1030,7 +1030,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set NOT %s_is_exact MONTH value "%s"', $field, $value)); $this->collector->objectMonthIsNot($value, $field); - $this->operators->push(['type' => sprintf('not_%s_on_month', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('not_%s_on_month', $field), 'value' => $value]); } break; @@ -1039,7 +1039,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_exact DAY value "%s"', $field, $value)); $this->collector->objectDayIs($value, $field); - $this->operators->push(['type' => sprintf('%s_on_day', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_on_day', $field), 'value' => $value]); } break; @@ -1048,7 +1048,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set NOT %s_is_exact DAY value "%s"', $field, $value)); $this->collector->objectDayIsNot($value, $field); - $this->operators->push(['type' => sprintf('not_%s_on_day', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('not_%s_on_day', $field), 'value' => $value]); } break; @@ -1077,7 +1077,7 @@ class OperatorQuerySearch implements SearchInterface case 'exact': if ($value instanceof Carbon) { $this->collector->setMetaAfter($value, $field); - $this->operators->push(['type' => sprintf('%s_after', $field), 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => sprintf('%s_after', $field), 'value' => $value->format('Y-m-d')]); } break; @@ -1086,7 +1086,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_after YEAR value "%s"', $field, $value)); $this->collector->metaYearAfter($value, $field); - $this->operators->push(['type' => sprintf('%s_after_year', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_after_year', $field), 'value' => $value]); } break; @@ -1095,7 +1095,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_after MONTH value "%s"', $field, $value)); $this->collector->metaMonthAfter($value, $field); - $this->operators->push(['type' => sprintf('%s_after_month', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_after_month', $field), 'value' => $value]); } break; @@ -1104,7 +1104,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_after DAY value "%s"', $field, $value)); $this->collector->metaDayAfter($value, $field); - $this->operators->push(['type' => sprintf('%s_after_day', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_after_day', $field), 'value' => $value]); } break; @@ -1133,7 +1133,7 @@ class OperatorQuerySearch implements SearchInterface case 'exact': if ($value instanceof Carbon) { $this->collector->setMetaBefore($value, $field); - $this->operators->push(['type' => sprintf('%s_before', $field), 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => sprintf('%s_before', $field), 'value' => $value->format('Y-m-d')]); } break; @@ -1142,7 +1142,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_before YEAR value "%s"', $field, $value)); $this->collector->metaYearBefore($value, $field); - $this->operators->push(['type' => sprintf('%s_before_year', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_before_year', $field), 'value' => $value]); } break; @@ -1151,7 +1151,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_before MONTH value "%s"', $field, $value)); $this->collector->metaMonthBefore($value, $field); - $this->operators->push(['type' => sprintf('%s_before_month', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_before_month', $field), 'value' => $value]); } break; @@ -1160,7 +1160,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set %s_is_before DAY value "%s"', $field, $value)); $this->collector->metaDayBefore($value, $field); - $this->operators->push(['type' => sprintf('%s_before_day', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_before_day', $field), 'value' => $value]); } break; @@ -1189,7 +1189,7 @@ class OperatorQuerySearch implements SearchInterface case 'exact': if ($value instanceof Carbon) { $this->collector->setObjectAfter($value, $field); - $this->operators->push(['type' => sprintf('%s_after', $field), 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => sprintf('%s_after', $field), 'value' => $value->format('Y-m-d')]); } break; @@ -1198,7 +1198,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_after YEAR value "%s"', $value)); $this->collector->objectYearAfter($value, $field); - $this->operators->push(['type' => sprintf('%s_after_year', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_after_year', $field), 'value' => $value]); } break; @@ -1207,7 +1207,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_after MONTH value "%s"', $value)); $this->collector->objectMonthAfter($value, $field); - $this->operators->push(['type' => sprintf('%s_after_month', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_after_month', $field), 'value' => $value]); } break; @@ -1216,7 +1216,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_after DAY value "%s"', $value)); $this->collector->objectDayAfter($value, $field); - $this->operators->push(['type' => sprintf('%s_after_day', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_after_day', $field), 'value' => $value]); } break; @@ -1245,7 +1245,7 @@ class OperatorQuerySearch implements SearchInterface case 'exact': if ($value instanceof Carbon) { $this->collector->setObjectBefore($value, $field); - $this->operators->push(['type' => sprintf('%s_before', $field), 'value' => $value->format('Y-m-d')]); + $this->operators->push(['type' => sprintf('%s_before', $field), 'value' => $value->format('Y-m-d')]); } break; @@ -1254,7 +1254,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_before YEAR value "%s"', $value)); $this->collector->objectYearBefore($value, $field); - $this->operators->push(['type' => sprintf('%s_before_year', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_before_year', $field), 'value' => $value]); } break; @@ -1263,7 +1263,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_before MONTH value "%s"', $value)); $this->collector->objectMonthBefore($value, $field); - $this->operators->push(['type' => sprintf('%s_before_month', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_before_month', $field), 'value' => $value]); } break; @@ -1272,7 +1272,7 @@ class OperatorQuerySearch implements SearchInterface if (is_string($value)) { Log::debug(sprintf('Set date_is_before DAY value "%s"', $value)); $this->collector->objectDayBefore($value, $field); - $this->operators->push(['type' => sprintf('%s_before_day', $field), 'value' => $value]); + $this->operators->push(['type' => sprintf('%s_before_day', $field), 'value' => $value]); } break; diff --git a/app/Support/Steam.php b/app/Support/Steam.php index e76ab4e012..f36957abd0 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -97,7 +97,7 @@ class Steam /** @var Account $account */ foreach ($accounts as $account) { - $return = ['pc_balance' => '0', 'balance' => '0']; // this key is overwritten right away, but I must remember it is always created. + $return = ['pc_balance' => '0', 'balance' => '0']; // this key is overwritten right away, but I must remember it is always created. $currency = $currencies[$account->id]; // second array @@ -366,7 +366,7 @@ class Steam } $hasCurrency = null !== $accountCurrency; $currency = $hasCurrency ? $accountCurrency : $primary; - $return = ['pc_balance' => '0', 'balance' => '0']; // this key is overwritten right away, but I must remember it is always created. + $return = ['pc_balance' => '0', 'balance' => '0']; // this key is overwritten right away, but I must remember it is always created. // balance(s) in all currencies. $array = $account ->transactions() @@ -459,7 +459,7 @@ class Steam Log::debug(sprintf('Also set start balance in %s', $primaryCurrency->code)); $startBalance[$primaryCurrency->code] ??= '0'; } - $currencies = [$currency->id => $currency, $primaryCurrency->id => $primaryCurrency]; + $currencies = [$currency->id => $currency, $primaryCurrency->id => $primaryCurrency]; $balances[$formatted] = $startBalance; Log::debug('Final start balance: ', $startBalance); diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index c4de34ee09..5beef874d4 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -281,7 +281,7 @@ class General extends AbstractExtension return new TwigFilter( 'markdown', static function (string $text): string { - $converter = new GithubFlavoredMarkdownConverter(['allow_unsafe_links' => false, 'max_nesting_level' => 5, 'html_input' => 'escape']); + $converter = new GithubFlavoredMarkdownConverter(['allow_unsafe_links' => false, 'max_nesting_level' => 5, 'html_input' => 'escape']); return (string) $converter->convert($text); }, diff --git a/app/Support/Twig/Translation.php b/app/Support/Twig/Translation.php index 6c51c16792..91cbc7dd38 100644 --- a/app/Support/Twig/Translation.php +++ b/app/Support/Twig/Translation.php @@ -23,7 +23,6 @@ declare(strict_types=1); namespace FireflyIII\Support\Twig; -use Illuminate\Contracts\Translation\Translator; use Override; use Twig\Extension\AbstractExtension; use Twig\TwigFilter; diff --git a/app/TransactionRules/Actions/ConvertToDeposit.php b/app/TransactionRules/Actions/ConvertToDeposit.php index d7f12f74b1..903e12b577 100644 --- a/app/TransactionRules/Actions/ConvertToDeposit.php +++ b/app/TransactionRules/Actions/ConvertToDeposit.php @@ -178,7 +178,7 @@ class ConvertToDeposit implements ActionInterface // change transaction type of journal: $newType = TransactionType::whereType(TransactionTypeEnum::DEPOSIT->value)->first(); - DB::table('transaction_journals')->where('id', '=', $journal->id)->update(['transaction_type_id' => $newType->id, 'bill_id' => null]); + DB::table('transaction_journals')->where('id', '=', $journal->id)->update(['transaction_type_id' => $newType->id, 'bill_id' => null]); Log::debug('Converted transfer to deposit.'); @@ -235,7 +235,7 @@ class ConvertToDeposit implements ActionInterface // change transaction type of journal: $newType = TransactionType::whereType(TransactionTypeEnum::DEPOSIT->value)->first(); - DB::table('transaction_journals')->where('id', '=', $journal->id)->update(['transaction_type_id' => $newType->id, 'bill_id' => null]); + DB::table('transaction_journals')->where('id', '=', $journal->id)->update(['transaction_type_id' => $newType->id, 'bill_id' => null]); Log::debug('Converted withdrawal to deposit.'); diff --git a/app/TransactionRules/Actions/ConvertToTransfer.php b/app/TransactionRules/Actions/ConvertToTransfer.php index 22f3e3ca4b..1719205c59 100644 --- a/app/TransactionRules/Actions/ConvertToTransfer.php +++ b/app/TransactionRules/Actions/ConvertToTransfer.php @@ -205,7 +205,7 @@ class ConvertToTransfer implements ActionInterface // change transaction type of journal: $newType = TransactionType::whereType(TransactionTypeEnum::TRANSFER->value)->first(); - DB::table('transaction_journals')->where('id', '=', $journal->id)->update(['transaction_type_id' => $newType->id, 'bill_id' => null]); + DB::table('transaction_journals')->where('id', '=', $journal->id)->update(['transaction_type_id' => $newType->id, 'bill_id' => null]); Log::debug('Converted deposit to transfer.'); @@ -287,7 +287,7 @@ class ConvertToTransfer implements ActionInterface // change transaction type of journal: $newType = TransactionType::whereType(TransactionTypeEnum::TRANSFER->value)->first(); - DB::table('transaction_journals')->where('id', '=', $journal->id)->update(['transaction_type_id' => $newType->id, 'bill_id' => null]); + DB::table('transaction_journals')->where('id', '=', $journal->id)->update(['transaction_type_id' => $newType->id, 'bill_id' => null]); Log::debug('Converted withdrawal to transfer.'); diff --git a/app/TransactionRules/Engine/CustomExpressionLanguage.php b/app/TransactionRules/Engine/CustomExpressionLanguage.php index 65b16d4c31..a175ffc3f3 100644 --- a/app/TransactionRules/Engine/CustomExpressionLanguage.php +++ b/app/TransactionRules/Engine/CustomExpressionLanguage.php @@ -1,5 +1,7 @@ addFunction(ExpressionFunction::fromPhp($function)); } diff --git a/app/Transformers/TransactionGroupTransformer.php b/app/Transformers/TransactionGroupTransformer.php index 858096e66d..04020fdd67 100644 --- a/app/Transformers/TransactionGroupTransformer.php +++ b/app/Transformers/TransactionGroupTransformer.php @@ -129,7 +129,7 @@ class TransactionGroupTransformer extends AbstractTransformer private function getBill(?Bill $bill): array { - $array = ['id' => null, 'name' => null]; + $array = ['id' => null, 'name' => null]; if (!$bill instanceof Bill) { return $array; } @@ -141,7 +141,7 @@ class TransactionGroupTransformer extends AbstractTransformer private function getBudget(?Budget $budget): array { - $array = ['id' => null, 'name' => null]; + $array = ['id' => null, 'name' => null]; if (!$budget instanceof Budget) { return $array; } @@ -153,7 +153,7 @@ class TransactionGroupTransformer extends AbstractTransformer private function getCategory(?Category $category): array { - $array = ['id' => null, 'name' => null]; + $array = ['id' => null, 'name' => null]; if (!$category instanceof Category) { return $array; } @@ -202,7 +202,7 @@ class TransactionGroupTransformer extends AbstractTransformer private function getForeignCurrency(?TransactionCurrency $currency): array { - $array = ['id' => null, 'code' => null, 'symbol' => null, 'decimal_places' => null]; + $array = ['id' => null, 'code' => null, 'symbol' => null, 'decimal_places' => null]; if (!$currency instanceof TransactionCurrency) { return $array; } diff --git a/app/User.php b/app/User.php index e9598b7b29..c49b345461 100644 --- a/app/User.php +++ b/app/User.php @@ -74,8 +74,8 @@ use SensitiveParameter; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** - * @property UserGroup|null $userGroup - * @property bool $blocked + * @property null|UserGroup $userGroup + * @property bool $blocked */ class User extends Authenticatable { @@ -480,7 +480,7 @@ class User extends Authenticatable protected function casts(): array { - return ['created_at' => 'datetime', 'updated_at' => 'datetime', 'blocked' => 'boolean']; + return ['created_at' => 'datetime', 'updated_at' => 'datetime', 'blocked' => 'boolean']; } /** diff --git a/app/Validation/Account/DepositValidation.php b/app/Validation/Account/DepositValidation.php index 31d12a6ded..6b634f4b1f 100644 --- a/app/Validation/Account/DepositValidation.php +++ b/app/Validation/Account/DepositValidation.php @@ -67,7 +67,7 @@ trait DepositValidation $search = $this->findExistingAccount($validTypes, $array); if (null === $search) { Log::debug('findExistingAccount() returned NULL, so the result is false.'); - $this->destError = (string) trans('validation.deposit_dest_bad_data', ['id' => $accountId, 'name' => $accountName]); + $this->destError = (string) trans('validation.deposit_dest_bad_data', ['id' => $accountId, 'name' => $accountName]); $result = false; } if (null !== $search) { @@ -128,7 +128,7 @@ trait DepositValidation Log::debug(sprintf('User submitted an ID (#%d), which is a "%s", so this is not a valid source.', $accountId, $search->accountType->type)); Log::debug(sprintf('Firefly III does not accept ID #%d as valid account data.', $accountId)); // #10921 Set result false - $this->sourceError = (string) trans('validation.withdrawal_source_bad_data', ['id' => $accountId, 'name' => $accountName]); + $this->sourceError = (string) trans('validation.withdrawal_source_bad_data', ['id' => $accountId, 'name' => $accountName]); $result = false; } if (null !== $search && in_array($search->accountType->type, $validTypes, true)) { diff --git a/app/Validation/Account/OBValidation.php b/app/Validation/Account/OBValidation.php index 2b63ab554c..653a220d81 100644 --- a/app/Validation/Account/OBValidation.php +++ b/app/Validation/Account/OBValidation.php @@ -63,7 +63,7 @@ trait OBValidation $search = $this->findExistingAccount($validTypes, $array); if (null === $search) { Log::debug('findExistingAccount() returned NULL, so the result is false.', $validTypes); - $this->destError = (string) trans('validation.ob_dest_bad_data', ['id' => $accountId, 'name' => $accountName]); + $this->destError = (string) trans('validation.ob_dest_bad_data', ['id' => $accountId, 'name' => $accountName]); $result = false; } if (null !== $search) { diff --git a/app/Validation/Account/ReconciliationValidation.php b/app/Validation/Account/ReconciliationValidation.php index 8c911df112..f87afebf15 100644 --- a/app/Validation/Account/ReconciliationValidation.php +++ b/app/Validation/Account/ReconciliationValidation.php @@ -54,7 +54,7 @@ trait ReconciliationValidation $validTypes = array_keys($this->combinations[$this->transactionType]); $search = $this->findExistingAccount($validTypes, $array); if (null === $search) { - $this->sourceError = (string) trans('validation.reconciliation_source_bad_data', ['id' => $accountId, 'name' => $accountName]); + $this->sourceError = (string) trans('validation.reconciliation_source_bad_data', ['id' => $accountId, 'name' => $accountName]); Log::warning('Not a valid source. Cant find it.', $validTypes); return false; @@ -89,7 +89,7 @@ trait ReconciliationValidation $validTypes = array_keys($this->combinations[$this->transactionType]); $search = $this->findExistingAccount($validTypes, $array); if (null === $search) { - $this->sourceError = (string) trans('validation.reconciliation_source_bad_data', ['id' => $accountId, 'name' => $accountName]); + $this->sourceError = (string) trans('validation.reconciliation_source_bad_data', ['id' => $accountId, 'name' => $accountName]); Log::warning('Not a valid source. Cant find it.', $validTypes); return false; diff --git a/app/Validation/Account/TransferValidation.php b/app/Validation/Account/TransferValidation.php index 35a4f2dfff..6d6a15fc63 100644 --- a/app/Validation/Account/TransferValidation.php +++ b/app/Validation/Account/TransferValidation.php @@ -56,7 +56,7 @@ trait TransferValidation // or try to find the account: $search = $this->findExistingAccount($validTypes, $array); if (null === $search) { - $this->destError = (string) trans('validation.transfer_dest_bad_data', ['id' => $accountId, 'name' => $accountName]); + $this->destError = (string) trans('validation.transfer_dest_bad_data', ['id' => $accountId, 'name' => $accountName]); return false; } @@ -94,7 +94,7 @@ trait TransferValidation // otherwise try to find the account: $search = $this->findExistingAccount($validTypes, $array); if (null === $search) { - $this->sourceError = (string) trans('validation.transfer_source_bad_data', ['id' => $accountId, 'name' => $accountName]); + $this->sourceError = (string) trans('validation.transfer_source_bad_data', ['id' => $accountId, 'name' => $accountName]); Log::warning('Not a valid source, cant find it.', $validTypes); return false; diff --git a/app/Validation/Account/WithdrawalValidation.php b/app/Validation/Account/WithdrawalValidation.php index 5efc68d6f4..711dc82631 100644 --- a/app/Validation/Account/WithdrawalValidation.php +++ b/app/Validation/Account/WithdrawalValidation.php @@ -63,7 +63,7 @@ trait WithdrawalValidation // otherwise try to find the account: $search = $this->findExistingAccount($validTypes, $array); if (null === $search) { - $this->sourceError = (string) trans('validation.withdrawal_source_bad_data', ['id' => $accountId, 'name' => $accountName]); + $this->sourceError = (string) trans('validation.withdrawal_source_bad_data', ['id' => $accountId, 'name' => $accountName]); Log::warning('Not a valid source. Cant find it.', $validTypes); return false; @@ -103,7 +103,7 @@ trait WithdrawalValidation return true; } // todo explain error in log message. - $this->destError = (string) trans('validation.withdrawal_dest_bad_data', ['id' => $accountId, 'name' => $accountName]); + $this->destError = (string) trans('validation.withdrawal_dest_bad_data', ['id' => $accountId, 'name' => $accountName]); return false; } @@ -147,7 +147,7 @@ trait WithdrawalValidation // otherwise try to find the account: $search = $this->findExistingAccount($validTypes, $array); if (null === $search) { - $this->sourceError = (string) trans('validation.withdrawal_source_bad_data', ['id' => $accountId, 'name' => $accountName]); + $this->sourceError = (string) trans('validation.withdrawal_source_bad_data', ['id' => $accountId, 'name' => $accountName]); Log::warning('Not a valid source. Cant find it.', $validTypes); return false; diff --git a/app/Validation/RecurrenceValidation.php b/app/Validation/RecurrenceValidation.php index a1617b918a..a1f6ac0bdc 100644 --- a/app/Validation/RecurrenceValidation.php +++ b/app/Validation/RecurrenceValidation.php @@ -212,7 +212,7 @@ trait RecurrenceValidation // validate source account. $sourceId = array_key_exists('source_id', $transaction) ? (int) $transaction['source_id'] : null; $sourceName = $transaction['source_name'] ?? null; - $validSource = $accountValidator->validateSource(['id' => $sourceId, 'name' => $sourceName]); + $validSource = $accountValidator->validateSource(['id' => $sourceId, 'name' => $sourceName]); // do something with result: if (false === $validSource) { @@ -224,7 +224,7 @@ trait RecurrenceValidation // validate destination account $destinationId = array_key_exists('destination_id', $transaction) ? (int) $transaction['destination_id'] : null; $destinationName = $transaction['destination_name'] ?? null; - $validDestination = $accountValidator->validateDestination(['id' => $destinationId, 'name' => $destinationName]); + $validDestination = $accountValidator->validateDestination(['id' => $destinationId, 'name' => $destinationName]); // do something with result: if (false === $validDestination) { $validator->errors()->add(sprintf('transactions.%d.destination_id', $index), $accountValidator->destError); diff --git a/app/Validation/TransactionValidation.php b/app/Validation/TransactionValidation.php index 92b59070cb..53f99b9ce0 100644 --- a/app/Validation/TransactionValidation.php +++ b/app/Validation/TransactionValidation.php @@ -279,7 +279,7 @@ trait TransactionValidation $sourceName = array_key_exists('source_name', $transaction) ? (string) $transaction['source_name'] : null; $sourceIban = array_key_exists('source_iban', $transaction) ? (string) $transaction['source_iban'] : null; $sourceNumber = array_key_exists('source_number', $transaction) ? (string) $transaction['source_number'] : null; - $source = ['id' => $sourceId, 'name' => $sourceName, 'iban' => $sourceIban, 'number' => $sourceNumber]; + $source = ['id' => $sourceId, 'name' => $sourceName, 'iban' => $sourceIban, 'number' => $sourceNumber]; $validSource = $accountValidator->validateSource($source); // do something with result: @@ -294,7 +294,7 @@ trait TransactionValidation $destinationName = array_key_exists('destination_name', $transaction) ? (string) $transaction['destination_name'] : null; $destinationIban = array_key_exists('destination_iban', $transaction) ? (string) $transaction['destination_iban'] : null; $destinationNumber = array_key_exists('destination_number', $transaction) ? (string) $transaction['destination_number'] : null; - $destination = ['id' => $destinationId, 'name' => $destinationName, 'iban' => $destinationIban, 'number' => $destinationNumber]; + $destination = ['id' => $destinationId, 'name' => $destinationName, 'iban' => $destinationIban, 'number' => $destinationNumber]; $validDestination = $accountValidator->validateDestination($destination); // do something with result: if (false === $validDestination) { @@ -395,7 +395,7 @@ trait TransactionValidation $destinationName = $transaction['destination_name'] ?? null; $destinationIban = $transaction['destination_iban'] ?? null; $destinationNumber = $transaction['destination_number'] ?? null; - $array = ['id' => $destinationId, 'name' => $destinationName, 'iban' => $destinationIban, 'number' => $destinationNumber]; + $array = ['id' => $destinationId, 'name' => $destinationName, 'iban' => $destinationIban, 'number' => $destinationNumber]; $validDestination = $accountValidator->validateDestination($array); // do something with result: if (false === $validDestination) { @@ -489,7 +489,7 @@ trait TransactionValidation private function getOriginalData(int $journalId): array { - $return = ['source_id' => 0, 'source_name' => '', 'destination_id' => 0, 'destination_name' => '']; + $return = ['source_id' => 0, 'source_name' => '', 'destination_id' => 0, 'destination_name' => '']; if (0 === $journalId) { return $return; } diff --git a/composer.lock b/composer.lock index b9bf5b7775..ae26a8bdb8 100644 --- a/composer.lock +++ b/composer.lock @@ -1453,16 +1453,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "21dc724a0583619cd1652f673303492272778051" + "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051", - "reference": "21dc724a0583619cd1652f673303492272778051", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/7d0ed42f28e42d61352a7a79de682e5e67fec884", + "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884", "shasum": "" }, "require": { @@ -1478,6 +1478,7 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "http-interop/http-factory-tests": "0.9.0", + "jshttp/mime-db": "1.54.0.1", "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "suggest": { @@ -1549,7 +1550,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.8.0" + "source": "https://github.com/guzzle/psr7/tree/2.9.0" }, "funding": [ { @@ -1565,7 +1566,7 @@ "type": "tidelift" } ], - "time": "2025-08-23T21:21:41+00:00" + "time": "2026-03-10T16:41:02+00:00" }, { "name": "guzzlehttp/uri-template", @@ -1878,16 +1879,16 @@ }, { "name": "laravel/framework", - "version": "v12.53.0", + "version": "v12.54.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "f57f035c0d34503d9ff30be76159bb35a003cd1f" + "reference": "325497463e7599cd14224c422c6e5dd2fe832868" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f57f035c0d34503d9ff30be76159bb35a003cd1f", - "reference": "f57f035c0d34503d9ff30be76159bb35a003cd1f", + "url": "https://api.github.com/repos/laravel/framework/zipball/325497463e7599cd14224c422c6e5dd2fe832868", + "reference": "325497463e7599cd14224c422c6e5dd2fe832868", "shasum": "" }, "require": { @@ -1908,7 +1909,7 @@ "guzzlehttp/uri-template": "^1.0", "laravel/prompts": "^0.3.0", "laravel/serializable-closure": "^1.3|^2.0", - "league/commonmark": "^2.7", + "league/commonmark": "^2.8.1", "league/flysystem": "^3.25.1", "league/flysystem-local": "^3.25.1", "league/uri": "^7.5.1", @@ -2096,7 +2097,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2026-02-24T14:35:15+00:00" + "time": "2026-03-10T20:25:56+00:00" }, { "name": "laravel/passport", @@ -2176,16 +2177,16 @@ }, { "name": "laravel/prompts", - "version": "v0.3.13", + "version": "v0.3.14", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "ed8c466571b37e977532fb2fd3c272c784d7050d" + "reference": "9f0e371244eedfe2ebeaa72c79c54bb5df6e0176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/ed8c466571b37e977532fb2fd3c272c784d7050d", - "reference": "ed8c466571b37e977532fb2fd3c272c784d7050d", + "url": "https://api.github.com/repos/laravel/prompts/zipball/9f0e371244eedfe2ebeaa72c79c54bb5df6e0176", + "reference": "9f0e371244eedfe2ebeaa72c79c54bb5df6e0176", "shasum": "" }, "require": { @@ -2229,9 +2230,9 @@ "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.3.13" + "source": "https://github.com/laravel/prompts/tree/v0.3.14" }, - "time": "2026-02-06T12:17:10+00:00" + "time": "2026-03-01T09:02:38+00:00" }, { "name": "laravel/serializable-closure", @@ -2361,16 +2362,16 @@ }, { "name": "laravel/ui", - "version": "v4.6.1", + "version": "v4.6.2", "source": { "type": "git", "url": "https://github.com/laravel/ui.git", - "reference": "7d6ffa38d79f19c9b3e70a751a9af845e8f41d88" + "reference": "4acfa331aa073f169a22d87851dc51eb2f7ac6be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/ui/zipball/7d6ffa38d79f19c9b3e70a751a9af845e8f41d88", - "reference": "7d6ffa38d79f19c9b3e70a751a9af845e8f41d88", + "url": "https://api.github.com/repos/laravel/ui/zipball/4acfa331aa073f169a22d87851dc51eb2f7ac6be", + "reference": "4acfa331aa073f169a22d87851dc51eb2f7ac6be", "shasum": "" }, "require": { @@ -2418,9 +2419,9 @@ "ui" ], "support": { - "source": "https://github.com/laravel/ui/tree/v4.6.1" + "source": "https://github.com/laravel/ui/tree/v4.6.2" }, - "time": "2025-01-28T15:15:29+00:00" + "time": "2026-03-10T20:00:50+00:00" }, { "name": "lcobucci/clock", @@ -3661,16 +3662,16 @@ }, { "name": "nesbot/carbon", - "version": "3.11.1", + "version": "3.11.3", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon.git", - "reference": "f438fcc98f92babee98381d399c65336f3a3827f" + "reference": "6a7e652845bb018c668220c2a545aded8594fbbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/f438fcc98f92babee98381d399c65336f3a3827f", - "reference": "f438fcc98f92babee98381d399c65336f3a3827f", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/6a7e652845bb018c668220c2a545aded8594fbbf", + "reference": "6a7e652845bb018c668220c2a545aded8594fbbf", "shasum": "" }, "require": { @@ -3762,7 +3763,7 @@ "type": "tidelift" } ], - "time": "2026-01-29T09:26:29+00:00" + "time": "2026-03-11T17:23:39+00:00" }, { "name": "nette/schema", @@ -5058,16 +5059,16 @@ }, { "name": "predis/predis", - "version": "v3.4.1", + "version": "v3.4.2", "source": { "type": "git", "url": "https://github.com/predis/predis.git", - "reference": "0850f2f36ee179f0ff96c92c750e1366c6cd754c" + "reference": "2033429520d8997a7815a2485f56abe6d2d0e075" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/predis/predis/zipball/0850f2f36ee179f0ff96c92c750e1366c6cd754c", - "reference": "0850f2f36ee179f0ff96c92c750e1366c6cd754c", + "url": "https://api.github.com/repos/predis/predis/zipball/2033429520d8997a7815a2485f56abe6d2d0e075", + "reference": "2033429520d8997a7815a2485f56abe6d2d0e075", "shasum": "" }, "require": { @@ -5109,7 +5110,7 @@ ], "support": { "issues": "https://github.com/predis/predis/issues", - "source": "https://github.com/predis/predis/tree/v3.4.1" + "source": "https://github.com/predis/predis/tree/v3.4.2" }, "funding": [ { @@ -5117,7 +5118,7 @@ "type": "github" } ], - "time": "2026-02-23T19:51:21+00:00" + "time": "2026-03-09T20:33:04+00:00" }, { "name": "psr/cache", @@ -5852,16 +5853,16 @@ }, { "name": "spatie/backtrace", - "version": "1.8.1", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/spatie/backtrace.git", - "reference": "8c0f16a59ae35ec8c62d85c3c17585158f430110" + "reference": "8ffe78be5ed355b5009e3dd989d183433e9a5adc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/backtrace/zipball/8c0f16a59ae35ec8c62d85c3c17585158f430110", - "reference": "8c0f16a59ae35ec8c62d85c3c17585158f430110", + "url": "https://api.github.com/repos/spatie/backtrace/zipball/8ffe78be5ed355b5009e3dd989d183433e9a5adc", + "reference": "8ffe78be5ed355b5009e3dd989d183433e9a5adc", "shasum": "" }, "require": { @@ -5872,7 +5873,7 @@ "laravel/serializable-closure": "^1.3 || ^2.0", "phpunit/phpunit": "^9.3 || ^11.4.3", "spatie/phpunit-snapshot-assertions": "^4.2 || ^5.1.6", - "symfony/var-dumper": "^5.1 || ^6.0 || ^7.0" + "symfony/var-dumper": "^5.1|^6.0|^7.0|^8.0" }, "type": "library", "autoload": { @@ -5900,7 +5901,7 @@ ], "support": { "issues": "https://github.com/spatie/backtrace/issues", - "source": "https://github.com/spatie/backtrace/tree/1.8.1" + "source": "https://github.com/spatie/backtrace/tree/1.8.2" }, "funding": [ { @@ -5912,7 +5913,7 @@ "type": "other" } ], - "time": "2025-08-26T08:22:30+00:00" + "time": "2026-03-11T13:48:28+00:00" }, { "name": "spatie/error-solutions", @@ -10545,16 +10546,16 @@ }, { "name": "fruitcake/laravel-debugbar", - "version": "v4.1.1", + "version": "v4.1.3", "source": { "type": "git", "url": "https://github.com/fruitcake/laravel-debugbar.git", - "reference": "048876cf8ffdd8af2b82306289e2c0453fa0b059" + "reference": "b48a68c4f8ffcdfa3a10d49930da4b03588dc87b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/048876cf8ffdd8af2b82306289e2c0453fa0b059", - "reference": "048876cf8ffdd8af2b82306289e2c0453fa0b059", + "url": "https://api.github.com/repos/fruitcake/laravel-debugbar/zipball/b48a68c4f8ffcdfa3a10d49930da4b03588dc87b", + "reference": "b48a68c4f8ffcdfa3a10d49930da4b03588dc87b", "shasum": "" }, "require": { @@ -10631,7 +10632,7 @@ ], "support": { "issues": "https://github.com/fruitcake/laravel-debugbar/issues", - "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.1.1" + "source": "https://github.com/fruitcake/laravel-debugbar/tree/v4.1.3" }, "funding": [ { @@ -10643,7 +10644,7 @@ "type": "github" } ], - "time": "2026-03-08T08:20:19+00:00" + "time": "2026-03-09T14:55:04+00:00" }, { "name": "hamcrest/hamcrest-php", diff --git a/config/firefly.php b/config/firefly.php index 89e883c6fb..c97754d4c5 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -78,8 +78,8 @@ return [ 'running_balance_column' => (bool)envDefaultWhenEmpty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used. // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2026-03-09', - 'build_time' => 1773028179, + 'version' => 'develop/2026-03-13', + 'build_time' => 1773370359, 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 28, // field is no longer used. diff --git a/database/factories/AccountFactory.php b/database/factories/AccountFactory.php index dbcf8e18be..09487b3d4a 100644 --- a/database/factories/AccountFactory.php +++ b/database/factories/AccountFactory.php @@ -12,7 +12,7 @@ class AccountFactory extends Factory { public function definition(): array { - return ['name' => $this->faker->name(), 'active' => true]; + return ['name' => $this->faker->name(), 'active' => true]; } public function withType(AccountTypeEnum $type): static diff --git a/database/seeders/LinkTypeSeeder.php b/database/seeders/LinkTypeSeeder.php index 6ae93585fb..1dd73e8d9a 100644 --- a/database/seeders/LinkTypeSeeder.php +++ b/database/seeders/LinkTypeSeeder.php @@ -36,10 +36,10 @@ class LinkTypeSeeder extends Seeder public function run(): void { $types = [ - ['name' => 'Related', 'inward' => 'relates to', 'outward' => 'relates to', 'editable' => false], - ['name' => 'Refund', 'inward' => 'is (partially) refunded by', 'outward' => '(partially) refunds', 'editable' => false], - ['name' => 'Paid', 'inward' => 'is (partially) paid for by', 'outward' => '(partially) pays for', 'editable' => false], - ['name' => 'Reimbursement', 'inward' => 'is (partially) reimbursed by', 'outward' => '(partially) reimburses', 'editable' => false] + ['name' => 'Related', 'inward' => 'relates to', 'outward' => 'relates to', 'editable' => false], + ['name' => 'Refund', 'inward' => 'is (partially) refunded by', 'outward' => '(partially) refunds', 'editable' => false], + ['name' => 'Paid', 'inward' => 'is (partially) paid for by', 'outward' => '(partially) pays for', 'editable' => false], + ['name' => 'Reimbursement', 'inward' => 'is (partially) reimbursed by', 'outward' => '(partially) reimburses', 'editable' => false] ]; foreach ($types as $type) { if (null === LinkType::where('name', $type['name'])->first()) { diff --git a/database/seeders/PermissionSeeder.php b/database/seeders/PermissionSeeder.php index 8db4e9e5a2..fd8b35d1d6 100644 --- a/database/seeders/PermissionSeeder.php +++ b/database/seeders/PermissionSeeder.php @@ -36,8 +36,8 @@ class PermissionSeeder extends Seeder public function run(): void { $roles = [ - ['name' => 'owner', 'display_name' => 'Site Owner', 'description' => 'User runs this instance of FF3'], - ['name' => 'demo', 'display_name' => 'Demo User', 'description' => 'User is a demo user'] + ['name' => 'owner', 'display_name' => 'Site Owner', 'description' => 'User runs this instance of FF3'], + ['name' => 'demo', 'display_name' => 'Demo User', 'description' => 'User is a demo user'] ]; foreach ($roles as $role) { if (null === Role::where('name', $role['name'])->first()) { diff --git a/database/seeders/TransactionCurrencySeeder.php b/database/seeders/TransactionCurrencySeeder.php index 0510efe88f..d9aacbb18d 100644 --- a/database/seeders/TransactionCurrencySeeder.php +++ b/database/seeders/TransactionCurrencySeeder.php @@ -37,58 +37,58 @@ class TransactionCurrencySeeder extends Seeder { $currencies = []; // european currencies - $currencies[] = ['code' => 'EUR', 'name' => 'Euro', 'symbol' => '€', 'decimal_places' => 2, 'enabled' => 1]; - $currencies[] = ['code' => 'HUF', 'name' => 'Hungarian forint', 'symbol' => 'Ft', 'decimal_places' => 2]; - $currencies[] = ['code' => 'GBP', 'name' => 'British Pound', 'symbol' => '£', 'decimal_places' => 2]; - $currencies[] = ['code' => 'UAH', 'name' => 'Ukrainian hryvnia', 'symbol' => '₴', 'decimal_places' => 2]; - $currencies[] = ['code' => 'PLN', 'name' => 'Polish złoty', 'symbol' => 'zł', 'decimal_places' => 2]; - $currencies[] = ['code' => 'TRY', 'name' => 'Turkish lira', 'symbol' => '₺', 'decimal_places' => 2]; - $currencies[] = ['code' => 'DKK', 'name' => 'Dansk krone', 'symbol' => 'kr.', 'decimal_places' => 2]; - $currencies[] = ['code' => 'ISK', 'name' => 'Íslensk króna', 'symbol' => 'kr.', 'decimal_places' => 2]; - $currencies[] = ['code' => 'NOK', 'name' => 'Norsk krone', 'symbol' => 'kr.', 'decimal_places' => 2]; - $currencies[] = ['code' => 'SEK', 'name' => 'Svensk krona', 'symbol' => 'kr.', 'decimal_places' => 2]; - $currencies[] = ['code' => 'RON', 'name' => 'Romanian leu', 'symbol' => 'lei', 'decimal_places' => 2]; + $currencies[] = ['code' => 'EUR', 'name' => 'Euro', 'symbol' => '€', 'decimal_places' => 2, 'enabled' => 1]; + $currencies[] = ['code' => 'HUF', 'name' => 'Hungarian forint', 'symbol' => 'Ft', 'decimal_places' => 2]; + $currencies[] = ['code' => 'GBP', 'name' => 'British Pound', 'symbol' => '£', 'decimal_places' => 2]; + $currencies[] = ['code' => 'UAH', 'name' => 'Ukrainian hryvnia', 'symbol' => '₴', 'decimal_places' => 2]; + $currencies[] = ['code' => 'PLN', 'name' => 'Polish złoty', 'symbol' => 'zł', 'decimal_places' => 2]; + $currencies[] = ['code' => 'TRY', 'name' => 'Turkish lira', 'symbol' => '₺', 'decimal_places' => 2]; + $currencies[] = ['code' => 'DKK', 'name' => 'Dansk krone', 'symbol' => 'kr.', 'decimal_places' => 2]; + $currencies[] = ['code' => 'ISK', 'name' => 'Íslensk króna', 'symbol' => 'kr.', 'decimal_places' => 2]; + $currencies[] = ['code' => 'NOK', 'name' => 'Norsk krone', 'symbol' => 'kr.', 'decimal_places' => 2]; + $currencies[] = ['code' => 'SEK', 'name' => 'Svensk krona', 'symbol' => 'kr.', 'decimal_places' => 2]; + $currencies[] = ['code' => 'RON', 'name' => 'Romanian leu', 'symbol' => 'lei', 'decimal_places' => 2]; // american currencies - $currencies[] = ['code' => 'USD', 'name' => 'US Dollar', 'symbol' => '$', 'decimal_places' => 2]; - $currencies[] = ['code' => 'BRL', 'name' => 'Brazilian real', 'symbol' => 'R$', 'decimal_places' => 2]; - $currencies[] = ['code' => 'CAD', 'name' => 'Canadian dollar', 'symbol' => 'C$', 'decimal_places' => 2]; - $currencies[] = ['code' => 'MXN', 'name' => 'Mexican peso', 'symbol' => 'MX$', 'decimal_places' => 2]; - $currencies[] = ['code' => 'PEN', 'name' => 'Peruvian Sol', 'symbol' => 'S/', 'decimal_places' => 2]; - $currencies[] = ['code' => 'ARS', 'name' => 'Argentinian Peso', 'symbol' => '$', 'decimal_places' => 2]; - $currencies[] = ['code' => 'COP', 'name' => 'Colombian Peso', 'symbol' => '$', 'decimal_places' => 2]; - $currencies[] = ['code' => 'CLP', 'name' => 'Chilean Peso', 'symbol' => '$', 'decimal_places' => 2]; - $currencies[] = ['code' => 'UYU', 'name' => 'Uruguayan Peso', 'symbol' => '$', 'decimal_places' => 2]; + $currencies[] = ['code' => 'USD', 'name' => 'US Dollar', 'symbol' => '$', 'decimal_places' => 2]; + $currencies[] = ['code' => 'BRL', 'name' => 'Brazilian real', 'symbol' => 'R$', 'decimal_places' => 2]; + $currencies[] = ['code' => 'CAD', 'name' => 'Canadian dollar', 'symbol' => 'C$', 'decimal_places' => 2]; + $currencies[] = ['code' => 'MXN', 'name' => 'Mexican peso', 'symbol' => 'MX$', 'decimal_places' => 2]; + $currencies[] = ['code' => 'PEN', 'name' => 'Peruvian Sol', 'symbol' => 'S/', 'decimal_places' => 2]; + $currencies[] = ['code' => 'ARS', 'name' => 'Argentinian Peso', 'symbol' => '$', 'decimal_places' => 2]; + $currencies[] = ['code' => 'COP', 'name' => 'Colombian Peso', 'symbol' => '$', 'decimal_places' => 2]; + $currencies[] = ['code' => 'CLP', 'name' => 'Chilean Peso', 'symbol' => '$', 'decimal_places' => 2]; + $currencies[] = ['code' => 'UYU', 'name' => 'Uruguayan Peso', 'symbol' => '$', 'decimal_places' => 2]; // oceanian currencies - $currencies[] = ['code' => 'IDR', 'name' => 'Indonesian rupiah', 'symbol' => 'Rp', 'decimal_places' => 2]; - $currencies[] = ['code' => 'AUD', 'name' => 'Australian dollar', 'symbol' => 'A$', 'decimal_places' => 2]; - $currencies[] = ['code' => 'NZD', 'name' => 'New Zealand dollar', 'symbol' => 'NZ$', 'decimal_places' => 2]; + $currencies[] = ['code' => 'IDR', 'name' => 'Indonesian rupiah', 'symbol' => 'Rp', 'decimal_places' => 2]; + $currencies[] = ['code' => 'AUD', 'name' => 'Australian dollar', 'symbol' => 'A$', 'decimal_places' => 2]; + $currencies[] = ['code' => 'NZD', 'name' => 'New Zealand dollar', 'symbol' => 'NZ$', 'decimal_places' => 2]; // african currencies - $currencies[] = ['code' => 'EGP', 'name' => 'Egyptian pound', 'symbol' => 'E£', 'decimal_places' => 2]; - $currencies[] = ['code' => 'MAD', 'name' => 'Moroccan dirham', 'symbol' => 'DH', 'decimal_places' => 2]; - $currencies[] = ['code' => 'ZAR', 'name' => 'South African rand', 'symbol' => 'R', 'decimal_places' => 2]; + $currencies[] = ['code' => 'EGP', 'name' => 'Egyptian pound', 'symbol' => 'E£', 'decimal_places' => 2]; + $currencies[] = ['code' => 'MAD', 'name' => 'Moroccan dirham', 'symbol' => 'DH', 'decimal_places' => 2]; + $currencies[] = ['code' => 'ZAR', 'name' => 'South African rand', 'symbol' => 'R', 'decimal_places' => 2]; // asian currencies - $currencies[] = ['code' => 'JPY', 'name' => 'Japanese yen', 'symbol' => '¥', 'decimal_places' => 0]; - $currencies[] = ['code' => 'CNY', 'name' => 'Chinese yuan', 'symbol' => '¥', 'decimal_places' => 2]; - $currencies[] = ['code' => 'KRW', 'name' => 'South Korean won', 'symbol' => '₩', 'decimal_places' => 2]; + $currencies[] = ['code' => 'JPY', 'name' => 'Japanese yen', 'symbol' => '¥', 'decimal_places' => 0]; + $currencies[] = ['code' => 'CNY', 'name' => 'Chinese yuan', 'symbol' => '¥', 'decimal_places' => 2]; + $currencies[] = ['code' => 'KRW', 'name' => 'South Korean won', 'symbol' => '₩', 'decimal_places' => 2]; // $currencies[] = ['code' => 'RMB', 'name' => 'Chinese yuan', 'symbol' => '¥', 'decimal_places' => 2]; - $currencies[] = ['code' => 'RUB', 'name' => 'Russian ruble', 'symbol' => '₽', 'decimal_places' => 2]; - $currencies[] = ['code' => 'INR', 'name' => 'Indian rupee', 'symbol' => '₹', 'decimal_places' => 2]; + $currencies[] = ['code' => 'RUB', 'name' => 'Russian ruble', 'symbol' => '₽', 'decimal_places' => 2]; + $currencies[] = ['code' => 'INR', 'name' => 'Indian rupee', 'symbol' => '₹', 'decimal_places' => 2]; // ALL NEW CURRENCIES BELOW THIS LINE - $currencies[] = ['code' => 'ILS', 'name' => 'Israeli new shekel', 'symbol' => '₪', 'decimal_places' => 2]; - $currencies[] = ['code' => 'CHF', 'name' => 'Swiss franc', 'symbol' => 'CHF', 'decimal_places' => 2]; - $currencies[] = ['code' => 'HRK', 'name' => 'Croatian kuna', 'symbol' => 'kn', 'decimal_places' => 2]; - $currencies[] = ['code' => 'HKD', 'name' => 'Hong Kong dollar', 'symbol' => 'HK$', 'decimal_places' => 2]; - $currencies[] = ['code' => 'CZK', 'name' => 'Czech koruna', 'symbol' => 'Kč', 'decimal_places' => 2]; - $currencies[] = ['code' => 'KZT', 'name' => 'Kazakhstani tenge', 'symbol' => '₸', 'decimal_places' => 2]; - $currencies[] = ['code' => 'SAR', 'name' => 'Saudi Riyal', 'symbol' => 'SAR', 'decimal_places' => 2]; - $currencies[] = ['code' => 'RSD', 'name' => 'Serbian Dinar', 'symbol' => 'RSD', 'decimal_places' => 2]; - $currencies[] = ['code' => 'TWD', 'name' => 'New Taiwan Dollar', 'symbol' => 'NT$', 'decimal_places' => 0]; - $currencies[] = ['code' => 'THB', 'name' => 'Thai baht', 'symbol' => '฿', 'decimal_places' => 2]; + $currencies[] = ['code' => 'ILS', 'name' => 'Israeli new shekel', 'symbol' => '₪', 'decimal_places' => 2]; + $currencies[] = ['code' => 'CHF', 'name' => 'Swiss franc', 'symbol' => 'CHF', 'decimal_places' => 2]; + $currencies[] = ['code' => 'HRK', 'name' => 'Croatian kuna', 'symbol' => 'kn', 'decimal_places' => 2]; + $currencies[] = ['code' => 'HKD', 'name' => 'Hong Kong dollar', 'symbol' => 'HK$', 'decimal_places' => 2]; + $currencies[] = ['code' => 'CZK', 'name' => 'Czech koruna', 'symbol' => 'Kč', 'decimal_places' => 2]; + $currencies[] = ['code' => 'KZT', 'name' => 'Kazakhstani tenge', 'symbol' => '₸', 'decimal_places' => 2]; + $currencies[] = ['code' => 'SAR', 'name' => 'Saudi Riyal', 'symbol' => 'SAR', 'decimal_places' => 2]; + $currencies[] = ['code' => 'RSD', 'name' => 'Serbian Dinar', 'symbol' => 'RSD', 'decimal_places' => 2]; + $currencies[] = ['code' => 'TWD', 'name' => 'New Taiwan Dollar', 'symbol' => 'NT$', 'decimal_places' => 0]; + $currencies[] = ['code' => 'THB', 'name' => 'Thai baht', 'symbol' => '฿', 'decimal_places' => 2]; foreach ($currencies as $currency) { if (null === TransactionCurrency::where('code', $currency['code'])->first()) { diff --git a/database/seeders/WebhookDataSeeder.php b/database/seeders/WebhookDataSeeder.php index fce24aafad..4a000ffc25 100644 --- a/database/seeders/WebhookDataSeeder.php +++ b/database/seeders/WebhookDataSeeder.php @@ -43,7 +43,7 @@ class WebhookDataSeeder extends Seeder foreach (WebhookTrigger::cases() as $trigger) { if (null === WebhookTriggerModel::where('key', $trigger->value)->where('title', $trigger->name)->first()) { try { - WebhookTriggerModel::create(['key' => $trigger->value, 'title' => $trigger->name]); + WebhookTriggerModel::create(['key' => $trigger->value, 'title' => $trigger->name]); } catch (\PDOException $e) { Log::debug(sprintf('Webhook trigger with name "%s" already exists and that is OK.', $trigger->name)); } @@ -52,7 +52,7 @@ class WebhookDataSeeder extends Seeder foreach (WebhookResponse::cases() as $response) { if (null === WebhookResponseModel::where('key', $response->value)->where('title', $response->name)->first()) { try { - WebhookResponseModel::create(['key' => $response->value, 'title' => $response->name]); + WebhookResponseModel::create(['key' => $response->value, 'title' => $response->name]); } catch (\PDOException $e) { Log::debug(sprintf('Webhook response with name "%s" already exists and that is OK.', $response->name)); } @@ -61,7 +61,7 @@ class WebhookDataSeeder extends Seeder foreach (WebhookDelivery::cases() as $delivery) { if (null === WebhookDeliveryModel::where('key', $delivery->value)->where('title', $delivery->name)->first()) { try { - WebhookDeliveryModel::create(['key' => $delivery->value, 'title' => $delivery->name]); + WebhookDeliveryModel::create(['key' => $delivery->value, 'title' => $delivery->name]); } catch (\PDOException $e) { Log::debug(sprintf('Webhook delivery type with name "%s" already exists and that is OK.', $delivery->name)); } diff --git a/package-lock.json b/package-lock.json index e3b0e5aebc..299abcbdd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1710,9 +1710,9 @@ "license": "MIT" }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.3.tgz", - "integrity": "sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.4.tgz", + "integrity": "sha512-cQPwL2mp2nSmHHJlCyoXgHGhbEPMrEEU5xhkcy3Hs/O7nGZqEpZ2sUtLaL9MORLtDfRvVl2/3PAuEkYZH0Ty8Q==", "cpu": [ "ppc64" ], @@ -1727,9 +1727,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.3.tgz", - "integrity": "sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.4.tgz", + "integrity": "sha512-X9bUgvxiC8CHAGKYufLIHGXPJWnr0OCdR0anD2e21vdvgCI8lIfqFbnoeOz7lBjdrAGUhqLZLcQo6MLhTO2DKQ==", "cpu": [ "arm" ], @@ -1744,9 +1744,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.3.tgz", - "integrity": "sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.4.tgz", + "integrity": "sha512-gdLscB7v75wRfu7QSm/zg6Rx29VLdy9eTr2t44sfTW7CxwAtQghZ4ZnqHk3/ogz7xao0QAgrkradbBzcqFPasw==", "cpu": [ "arm64" ], @@ -1761,9 +1761,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.3.tgz", - "integrity": "sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.4.tgz", + "integrity": "sha512-PzPFnBNVF292sfpfhiyiXCGSn9HZg5BcAz+ivBuSsl6Rk4ga1oEXAamhOXRFyMcjwr2DVtm40G65N3GLeH1Lvw==", "cpu": [ "x64" ], @@ -1778,9 +1778,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.3.tgz", - "integrity": "sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.4.tgz", + "integrity": "sha512-b7xaGIwdJlht8ZFCvMkpDN6uiSmnxxK56N2GDTMYPr2/gzvfdQN8rTfBsvVKmIVY/X7EM+/hJKEIbbHs9oA4tQ==", "cpu": [ "arm64" ], @@ -1795,9 +1795,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.3.tgz", - "integrity": "sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.4.tgz", + "integrity": "sha512-sR+OiKLwd15nmCdqpXMnuJ9W2kpy0KigzqScqHI3Hqwr7IXxBp3Yva+yJwoqh7rE8V77tdoheRYataNKL4QrPw==", "cpu": [ "x64" ], @@ -1812,9 +1812,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.3.tgz", - "integrity": "sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.4.tgz", + "integrity": "sha512-jnfpKe+p79tCnm4GVav68A7tUFeKQwQyLgESwEAUzyxk/TJr4QdGog9sqWNcUbr/bZt/O/HXouspuQDd9JxFSw==", "cpu": [ "arm64" ], @@ -1829,9 +1829,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.3.tgz", - "integrity": "sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.4.tgz", + "integrity": "sha512-2kb4ceA/CpfUrIcTUl1wrP/9ad9Atrp5J94Lq69w7UwOMolPIGrfLSvAKJp0RTvkPPyn6CIWrNy13kyLikZRZQ==", "cpu": [ "x64" ], @@ -1846,9 +1846,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.3.tgz", - "integrity": "sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.4.tgz", + "integrity": "sha512-aBYgcIxX/wd5n2ys0yESGeYMGF+pv6g0DhZr3G1ZG4jMfruU9Tl1i2Z+Wnj9/KjGz1lTLCcorqE2viePZqj4Eg==", "cpu": [ "arm" ], @@ -1863,9 +1863,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.3.tgz", - "integrity": "sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.4.tgz", + "integrity": "sha512-7nQOttdzVGth1iz57kxg9uCz57dxQLHWxopL6mYuYthohPKEK0vU0C3O21CcBK6KDlkYVcnDXY099HcCDXd9dA==", "cpu": [ "arm64" ], @@ -1880,9 +1880,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.3.tgz", - "integrity": "sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.4.tgz", + "integrity": "sha512-oPtixtAIzgvzYcKBQM/qZ3R+9TEUd1aNJQu0HhGyqtx6oS7qTpvjheIWBbes4+qu1bNlo2V4cbkISr8q6gRBFA==", "cpu": [ "ia32" ], @@ -1897,9 +1897,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.3.tgz", - "integrity": "sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.4.tgz", + "integrity": "sha512-8mL/vh8qeCoRcFH2nM8wm5uJP+ZcVYGGayMavi8GmRJjuI3g1v6Z7Ni0JJKAJW+m0EtUuARb6Lmp4hMjzCBWzA==", "cpu": [ "loong64" ], @@ -1914,9 +1914,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.3.tgz", - "integrity": "sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.4.tgz", + "integrity": "sha512-1RdrWFFiiLIW7LQq9Q2NES+HiD4NyT8Itj9AUeCl0IVCA459WnPhREKgwrpaIfTOe+/2rdntisegiPWn/r/aAw==", "cpu": [ "mips64el" ], @@ -1931,9 +1931,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.3.tgz", - "integrity": "sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.4.tgz", + "integrity": "sha512-tLCwNG47l3sd9lpfyx9LAGEGItCUeRCWeAx6x2Jmbav65nAwoPXfewtAdtbtit/pJFLUWOhpv0FpS6GQAmPrHA==", "cpu": [ "ppc64" ], @@ -1948,9 +1948,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.3.tgz", - "integrity": "sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.4.tgz", + "integrity": "sha512-BnASypppbUWyqjd1KIpU4AUBiIhVr6YlHx/cnPgqEkNoVOhHg+YiSVxM1RLfiy4t9cAulbRGTNCKOcqHrEQLIw==", "cpu": [ "riscv64" ], @@ -1965,9 +1965,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.3.tgz", - "integrity": "sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.4.tgz", + "integrity": "sha512-+eUqgb/Z7vxVLezG8bVB9SfBie89gMueS+I0xYh2tJdw3vqA/0ImZJ2ROeWwVJN59ihBeZ7Tu92dF/5dy5FttA==", "cpu": [ "s390x" ], @@ -1982,9 +1982,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.3.tgz", - "integrity": "sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.4.tgz", + "integrity": "sha512-S5qOXrKV8BQEzJPVxAwnryi2+Iq5pB40gTEIT69BQONqR7JH1EPIcQ/Uiv9mCnn05jff9umq/5nqzxlqTOg9NA==", "cpu": [ "x64" ], @@ -1999,9 +1999,9 @@ } }, "node_modules/@esbuild/netbsd-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.3.tgz", - "integrity": "sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.4.tgz", + "integrity": "sha512-xHT8X4sb0GS8qTqiwzHqpY00C95DPAq7nAwX35Ie/s+LO9830hrMd3oX0ZMKLvy7vsonee73x0lmcdOVXFzd6Q==", "cpu": [ "arm64" ], @@ -2016,9 +2016,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.3.tgz", - "integrity": "sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.4.tgz", + "integrity": "sha512-RugOvOdXfdyi5Tyv40kgQnI0byv66BFgAqjdgtAKqHoZTbTF2QqfQrFwa7cHEORJf6X2ht+l9ABLMP0dnKYsgg==", "cpu": [ "x64" ], @@ -2033,9 +2033,9 @@ } }, "node_modules/@esbuild/openbsd-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.3.tgz", - "integrity": "sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.4.tgz", + "integrity": "sha512-2MyL3IAaTX+1/qP0O1SwskwcwCoOI4kV2IBX1xYnDDqthmq5ArrW94qSIKCAuRraMgPOmG0RDTA74mzYNQA9ow==", "cpu": [ "arm64" ], @@ -2050,9 +2050,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.3.tgz", - "integrity": "sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.4.tgz", + "integrity": "sha512-u8fg/jQ5aQDfsnIV6+KwLOf1CmJnfu1ShpwqdwC0uA7ZPwFws55Ngc12vBdeUdnuWoQYx/SOQLGDcdlfXhYmXQ==", "cpu": [ "x64" ], @@ -2067,9 +2067,9 @@ } }, "node_modules/@esbuild/openharmony-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.3.tgz", - "integrity": "sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.4.tgz", + "integrity": "sha512-JkTZrl6VbyO8lDQO3yv26nNr2RM2yZzNrNHEsj9bm6dOwwu9OYN28CjzZkH57bh4w0I2F7IodpQvUAEd1mbWXg==", "cpu": [ "arm64" ], @@ -2084,9 +2084,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.3.tgz", - "integrity": "sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.4.tgz", + "integrity": "sha512-/gOzgaewZJfeJTlsWhvUEmUG4tWEY2Spp5M20INYRg2ZKl9QPO3QEEgPeRtLjEWSW8FilRNacPOg8R1uaYkA6g==", "cpu": [ "x64" ], @@ -2101,9 +2101,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.3.tgz", - "integrity": "sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.4.tgz", + "integrity": "sha512-Z9SExBg2y32smoDQdf1HRwHRt6vAHLXcxD2uGgO/v2jK7Y718Ix4ndsbNMU/+1Qiem9OiOdaqitioZwxivhXYg==", "cpu": [ "arm64" ], @@ -2118,9 +2118,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.3.tgz", - "integrity": "sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.4.tgz", + "integrity": "sha512-DAyGLS0Jz5G5iixEbMHi5KdiApqHBWMGzTtMiJ72ZOLhbu/bzxgAe8Ue8CTS3n3HbIUHQz/L51yMdGMeoxXNJw==", "cpu": [ "ia32" ], @@ -2135,9 +2135,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.3.tgz", - "integrity": "sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.4.tgz", + "integrity": "sha512-+knoa0BDoeXgkNvvV1vvbZX4+hizelrkwmGJBdT17t8FNPwG2lKemmuMZlmaNQ3ws3DKKCxpb4zRZEIp3UxFCg==", "cpu": [ "x64" ], @@ -3236,9 +3236,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "25.3.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.5.tgz", - "integrity": "sha512-oX8xrhvpiyRCQkG1MFchB09f+cXftgIXb3a7UUa4Y3wpmZPw5tyZGTLWhlESOLq1Rq6oDlc8npVU2/9xiCuXMA==", + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.0.tgz", + "integrity": "sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==", "dev": true, "license": "MIT", "dependencies": { @@ -3354,57 +3354,57 @@ } }, "node_modules/@vue/compiler-core": { - "version": "3.5.29", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.29.tgz", - "integrity": "sha512-cuzPhD8fwRHk8IGfmYaR4eEe4cAyJEL66Ove/WZL7yWNL134nqLddSLwNRIsFlnnW1kK+p8Ck3viFnC0chXCXw==", + "version": "3.5.30", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.30.tgz", + "integrity": "sha512-s3DfdZkcu/qExZ+td75015ljzHc6vE+30cFMGRPROYjqkroYI5NV2X1yAMX9UeyBNWB9MxCfPcsjpLS11nzkkw==", "dev": true, "license": "MIT", "dependencies": { "@babel/parser": "^7.29.0", - "@vue/shared": "3.5.29", + "@vue/shared": "3.5.30", "entities": "^7.0.1", "estree-walker": "^2.0.2", "source-map-js": "^1.2.1" } }, "node_modules/@vue/compiler-dom": { - "version": "3.5.29", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.29.tgz", - "integrity": "sha512-n0G5o7R3uBVmVxjTIYcz7ovr8sy7QObFG8OQJ3xGCDNhbG60biP/P5KnyY8NLd81OuT1WJflG7N4KWYHaeeaIg==", + "version": "3.5.30", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.30.tgz", + "integrity": "sha512-eCFYESUEVYHhiMuK4SQTldO3RYxyMR/UQL4KdGD1Yrkfdx4m/HYuZ9jSfPdA+nWJY34VWndiYdW/wZXyiPEB9g==", "dev": true, "license": "MIT", "dependencies": { - "@vue/compiler-core": "3.5.29", - "@vue/shared": "3.5.29" + "@vue/compiler-core": "3.5.30", + "@vue/shared": "3.5.30" } }, "node_modules/@vue/compiler-sfc": { - "version": "3.5.29", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.29.tgz", - "integrity": "sha512-oJZhN5XJs35Gzr50E82jg2cYdZQ78wEwvRO6Y63TvLVTc+6xICzJHP1UIecdSPPYIbkautNBanDiWYa64QSFIA==", + "version": "3.5.30", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.30.tgz", + "integrity": "sha512-LqmFPDn89dtU9vI3wHJnwaV6GfTRD87AjWpTWpyrdVOObVtjIuSeZr181z5C4PmVx/V3j2p+0f7edFKGRMpQ5A==", "dev": true, "license": "MIT", "dependencies": { "@babel/parser": "^7.29.0", - "@vue/compiler-core": "3.5.29", - "@vue/compiler-dom": "3.5.29", - "@vue/compiler-ssr": "3.5.29", - "@vue/shared": "3.5.29", + "@vue/compiler-core": "3.5.30", + "@vue/compiler-dom": "3.5.30", + "@vue/compiler-ssr": "3.5.30", + "@vue/shared": "3.5.30", "estree-walker": "^2.0.2", "magic-string": "^0.30.21", - "postcss": "^8.5.6", + "postcss": "^8.5.8", "source-map-js": "^1.2.1" } }, "node_modules/@vue/compiler-ssr": { - "version": "3.5.29", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.29.tgz", - "integrity": "sha512-Y/ARJZE6fpjzL5GH/phJmsFwx3g6t2KmHKHx5q+MLl2kencADKIrhH5MLF6HHpRMmlRAYBRSvv347Mepf1zVNw==", + "version": "3.5.30", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.30.tgz", + "integrity": "sha512-NsYK6OMTnx109PSL2IAyf62JP6EUdk4Dmj6AkWcJGBvN0dQoMYtVekAmdqgTtWQgEJo+Okstbf/1p7qZr5H+bA==", "dev": true, "license": "MIT", "dependencies": { - "@vue/compiler-dom": "3.5.29", - "@vue/shared": "3.5.29" + "@vue/compiler-dom": "3.5.30", + "@vue/shared": "3.5.30" } }, "node_modules/@vue/component-compiler-utils": { @@ -3486,9 +3486,9 @@ "license": "MIT" }, "node_modules/@vue/shared": { - "version": "3.5.29", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.29.tgz", - "integrity": "sha512-w7SR0A5zyRByL9XUkCfdLs7t9XOHUyJ67qPGQjOou3p6GvBeBW+AVjUUmlxtZ4PIYaRvE+1LmK44O4uajlZwcg==", + "version": "3.5.30", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.30.tgz", + "integrity": "sha512-YXgQ7JjaO18NeK2K9VTbDHaFy62WrObMa6XERNfNOkAhD1F1oDSf3ZJ7K6GqabZ0BvSDHajp8qfS5Sa2I9n8uQ==", "dev": true, "license": "MIT" }, @@ -3763,9 +3763,9 @@ } }, "node_modules/admin-lte": { - "version": "4.0.0-rc6", - "resolved": "https://registry.npmjs.org/admin-lte/-/admin-lte-4.0.0-rc6.tgz", - "integrity": "sha512-bJmCkfXesZKRD6OScTDSY6bYch5QsMDJv8pFnRESvSVKccH2WjUu3CuBC6qVcTggcaM2KPVO4DWDi0tRElMvqg==", + "version": "4.0.0-rc7", + "resolved": "https://registry.npmjs.org/admin-lte/-/admin-lte-4.0.0-rc7.tgz", + "integrity": "sha512-v7JYiuxONrpXxvoRVhFJuLpZ9xoBvQ1bHkE1lanVR8+/AqBATWXU3vOO0TAWOoxhG6/26JkU5otXq0Z2SRQjZQ==", "license": "MIT" }, "node_modules/ajv": { @@ -4135,9 +4135,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz", - "integrity": "sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==", + "version": "2.10.7", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.7.tgz", + "integrity": "sha512-1ghYO3HnxGec0TCGBXiDLVns4eCSx4zJpxnHrlqFQajmhfKMQBzUGDdkMK7fUW7PTHTeLf+j87aTuKuuwWzMGw==", "dev": true, "license": "Apache-2.0", "bin": { @@ -4587,9 +4587,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001777", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001777.tgz", - "integrity": "sha512-tmN+fJxroPndC74efCdp12j+0rk0RHwV5Jwa1zWaFVyw2ZxAuPeG8ZgWC3Wz7uSjT3qMRQ5XHZ4COgQmsCMJAQ==", + "version": "1.0.30001778", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001778.tgz", + "integrity": "sha512-PN7uxFL+ExFJO61aVmP1aIEG4i9whQd4eoSCebav62UwDyp5OHh06zN4jqKSMePVgxHifCw1QJxdRkA1Pisekg==", "dev": true, "funding": [ { @@ -5792,9 +5792,9 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.307", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.307.tgz", - "integrity": "sha512-5z3uFKBWjiNR44nFcYdkcXjKMbg5KXNdciu7mhTPo9tB7NbqSNP2sSnGR+fqknZSCwKkBN+oxiiajWs4dT6ORg==", + "version": "1.5.313", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.313.tgz", + "integrity": "sha512-QBMrTWEf00GXZmJyx2lbYD45jpI3TUFnNIzJ5BBc8piGUDwMPa1GV6HJWTZVvY/eiN3fSopl7NRbgGp9sZ9LTA==", "dev": true, "license": "ISC" }, @@ -5952,9 +5952,9 @@ } }, "node_modules/esbuild": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.3.tgz", - "integrity": "sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==", + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.4.tgz", + "integrity": "sha512-Rq4vbHnYkK5fws5NF7MYTU68FPRE1ajX7heQ/8QXXWqNgqqJ/GkmmyxIzUnf2Sr/bakf8l54716CcMGHYhMrrQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -5965,32 +5965,32 @@ "node": ">=18" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.27.3", - "@esbuild/android-arm": "0.27.3", - "@esbuild/android-arm64": "0.27.3", - "@esbuild/android-x64": "0.27.3", - "@esbuild/darwin-arm64": "0.27.3", - "@esbuild/darwin-x64": "0.27.3", - "@esbuild/freebsd-arm64": "0.27.3", - "@esbuild/freebsd-x64": "0.27.3", - "@esbuild/linux-arm": "0.27.3", - "@esbuild/linux-arm64": "0.27.3", - "@esbuild/linux-ia32": "0.27.3", - "@esbuild/linux-loong64": "0.27.3", - "@esbuild/linux-mips64el": "0.27.3", - "@esbuild/linux-ppc64": "0.27.3", - "@esbuild/linux-riscv64": "0.27.3", - "@esbuild/linux-s390x": "0.27.3", - "@esbuild/linux-x64": "0.27.3", - "@esbuild/netbsd-arm64": "0.27.3", - "@esbuild/netbsd-x64": "0.27.3", - "@esbuild/openbsd-arm64": "0.27.3", - "@esbuild/openbsd-x64": "0.27.3", - "@esbuild/openharmony-arm64": "0.27.3", - "@esbuild/sunos-x64": "0.27.3", - "@esbuild/win32-arm64": "0.27.3", - "@esbuild/win32-ia32": "0.27.3", - "@esbuild/win32-x64": "0.27.3" + "@esbuild/aix-ppc64": "0.27.4", + "@esbuild/android-arm": "0.27.4", + "@esbuild/android-arm64": "0.27.4", + "@esbuild/android-x64": "0.27.4", + "@esbuild/darwin-arm64": "0.27.4", + "@esbuild/darwin-x64": "0.27.4", + "@esbuild/freebsd-arm64": "0.27.4", + "@esbuild/freebsd-x64": "0.27.4", + "@esbuild/linux-arm": "0.27.4", + "@esbuild/linux-arm64": "0.27.4", + "@esbuild/linux-ia32": "0.27.4", + "@esbuild/linux-loong64": "0.27.4", + "@esbuild/linux-mips64el": "0.27.4", + "@esbuild/linux-ppc64": "0.27.4", + "@esbuild/linux-riscv64": "0.27.4", + "@esbuild/linux-s390x": "0.27.4", + "@esbuild/linux-x64": "0.27.4", + "@esbuild/netbsd-arm64": "0.27.4", + "@esbuild/netbsd-x64": "0.27.4", + "@esbuild/openbsd-arm64": "0.27.4", + "@esbuild/openbsd-x64": "0.27.4", + "@esbuild/openharmony-arm64": "0.27.4", + "@esbuild/sunos-x64": "0.27.4", + "@esbuild/win32-arm64": "0.27.4", + "@esbuild/win32-ia32": "0.27.4", + "@esbuild/win32-x64": "0.27.4" } }, "node_modules/escalade": { @@ -7143,9 +7143,9 @@ } }, "node_modules/i18next": { - "version": "25.8.14", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.14.tgz", - "integrity": "sha512-paMUYkfWJMsWPeE/Hejcw+XLhHrQPehem+4wMo+uELnvIwvCG019L9sAIljwjCmEMtFQQO3YeitJY8Kctei3iA==", + "version": "25.8.18", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.18.tgz", + "integrity": "sha512-lzY5X83BiL5AP77+9DydbrqkQHFN9hUzWGjqjLpPcp5ZOzuu1aSoKaU3xbBLSjWx9dAzW431y+d+aogxOZaKRA==", "funding": [ { "type": "individual", @@ -7162,7 +7162,7 @@ ], "license": "MIT", "dependencies": { - "@babel/runtime": "^7.28.4" + "@babel/runtime": "^7.28.6" }, "peerDependencies": { "typescript": "^5" @@ -10224,14 +10224,14 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.97.3", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.97.3.tgz", - "integrity": "sha512-fDz1zJpd5GycprAbu4Q2PV/RprsRtKC/0z82z0JLgdytmcq0+ujJbJ/09bPGDxCLkKY3Np5cRAOcWiVkLXJURg==", + "version": "1.98.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.98.0.tgz", + "integrity": "sha512-+4N/u9dZ4PrgzGgPlKnaaRQx64RO0JBKs9sDhQ2pLgN6JQZ25uPQZKQYaBJU48Kd5BxgXoJ4e09Dq7nMcOUW3A==", "dev": true, "license": "MIT", "dependencies": { "chokidar": "^4.0.0", - "immutable": "^5.0.2", + "immutable": "^5.1.5", "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { @@ -11023,9 +11023,9 @@ } }, "node_modules/terser-webpack-plugin": { - "version": "5.3.17", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.17.tgz", - "integrity": "sha512-YR7PtUp6GMU91BgSJmlaX/rS2lGDbAF7D+Wtq7hRO+MiljNmodYvqslzCFiYVAgW+Qoaaia/QUIP4lGXufjdZw==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.4.0.tgz", + "integrity": "sha512-Bn5vxm48flOIfkdl5CaD2+1CiUVbonWQ3KQPyP7/EuIl9Gbzq/gQFOzaMFUEgVjB1396tcK0SG8XcNJ/2kDH8g==", "dev": true, "license": "MIT", "dependencies": { diff --git a/resources/lang/en_US/auth.php b/resources/lang/en_US/auth.php index ae99f86951..239941eba6 100644 --- a/resources/lang/en_US/auth.php +++ b/resources/lang/en_US/auth.php @@ -22,4 +22,4 @@ declare(strict_types=1); -return ['failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.']; +return ['failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.']; diff --git a/resources/lang/en_US/email.php b/resources/lang/en_US/email.php index 816189c015..8a4931e754 100644 --- a/resources/lang/en_US/email.php +++ b/resources/lang/en_US/email.php @@ -33,8 +33,8 @@ return [ 'admin_test_subject' => 'A test message from your Firefly III installation', 'admin_test_body' => 'This is a test message from your Firefly III instance. It was sent to :email.', 'admin_test_message' => 'This is a test message from your Firefly III instance over channel ":channel".', - 'admin_test_link' => 'The following link should point to your Firefly III installation. It should be correctly adorned with "http" or "https". If not, please set your `APP_URL` environment variable: [:link](:link)', - 'firefly_iii_url' => 'Firefly III', + 'admin_test_link' => 'The following link should point to your Firefly III installation. It should be correctly adorned with "http" or "https". If not, please set your `APP_URL` environment variable: [:link](:link)', + 'firefly_iii_url' => 'Firefly III', // invite 'invitation_created_subject' => 'An invitation has been created', diff --git a/resources/lang/en_US/pagination.php b/resources/lang/en_US/pagination.php index b0b7518b45..428745c852 100644 --- a/resources/lang/en_US/pagination.php +++ b/resources/lang/en_US/pagination.php @@ -22,4 +22,4 @@ declare(strict_types=1); -return ['previous' => '« Previous', 'next' => 'Next »']; +return ['previous' => '« Previous', 'next' => 'Next »']; diff --git a/tests/feature/TestCase.php b/tests/feature/TestCase.php index 6569e9baea..cd6dadffc3 100644 --- a/tests/feature/TestCase.php +++ b/tests/feature/TestCase.php @@ -33,6 +33,6 @@ abstract class TestCase extends BaseTestCase protected function createUser(): User { - return User::create(['email' => 'james@firefly', 'password' => 'secret']); + return User::create(['email' => 'james@firefly', 'password' => 'secret']); } } diff --git a/tests/integration/Api/Autocomplete/CategoryControllerTest.php b/tests/integration/Api/Autocomplete/CategoryControllerTest.php index 547573ea34..d5c711aa6d 100644 --- a/tests/integration/Api/Autocomplete/CategoryControllerTest.php +++ b/tests/integration/Api/Autocomplete/CategoryControllerTest.php @@ -108,7 +108,7 @@ final class CategoryControllerTest extends TestCase private function createTestCategories(int $count, User $user): void { for ($i = 1; $i <= $count; ++$i) { - $category = Category::create(['user_id' => $user->id, 'name' => 'Category '.$i, 'user_group_id' => $user->user_group_id]); + $category = Category::create(['user_id' => $user->id, 'name' => 'Category '.$i, 'user_group_id' => $user->user_group_id]); } } } diff --git a/tests/integration/Api/Autocomplete/PiggyBankControllerTest.php b/tests/integration/Api/Autocomplete/PiggyBankControllerTest.php index dc2d53c31a..bf23c5e88c 100644 --- a/tests/integration/Api/Autocomplete/PiggyBankControllerTest.php +++ b/tests/integration/Api/Autocomplete/PiggyBankControllerTest.php @@ -117,7 +117,7 @@ final class PiggyBankControllerTest extends TestCase } $currency = TransactionCurrency::whereCode('EUR')->first(); if (null === $currency) { - $currency = TransactionCurrency::create(['code' => 'EUR', 'name' => 'Euro', 'symbol' => '€']); + $currency = TransactionCurrency::create(['code' => 'EUR', 'name' => 'Euro', 'symbol' => '€']); } for ($i = 1; $i <= $count; ++$i) { $piggyBank = PiggyBank::create([ diff --git a/tests/integration/Api/Chart/AccountControllerTest.php b/tests/integration/Api/Chart/AccountControllerTest.php index aa9df496f4..369c2e4989 100644 --- a/tests/integration/Api/Chart/AccountControllerTest.php +++ b/tests/integration/Api/Chart/AccountControllerTest.php @@ -43,7 +43,7 @@ final class AccountControllerTest extends TestCase public function testGetOverviewChart(): void { $this->actingAs($this->user); - $params = ['start' => '2024-01-01', 'end' => '2024-01-31']; + $params = ['start' => '2024-01-01', 'end' => '2024-01-31']; $response = $this->getJson(route('api.v1.chart.account.overview').'?'.http_build_query($params)); $response->assertStatus(200); } diff --git a/tests/integration/Api/Chart/BalanceControllerTest.php b/tests/integration/Api/Chart/BalanceControllerTest.php index e9055a2786..17bff6a5ff 100644 --- a/tests/integration/Api/Chart/BalanceControllerTest.php +++ b/tests/integration/Api/Chart/BalanceControllerTest.php @@ -43,7 +43,7 @@ final class BalanceControllerTest extends TestCase public function testGetOverviewChart(): void { $this->actingAs($this->user); - $params = ['start' => '2024-01-01', 'end' => '2024-01-31']; + $params = ['start' => '2024-01-01', 'end' => '2024-01-31']; $response = $this->getJson(route('api.v1.chart.balance.balance').'?'.http_build_query($params)); $response->assertStatus(200); } diff --git a/tests/integration/Api/Chart/BudgetControllerTest.php b/tests/integration/Api/Chart/BudgetControllerTest.php index a316a7dbfa..8bd8aa8711 100644 --- a/tests/integration/Api/Chart/BudgetControllerTest.php +++ b/tests/integration/Api/Chart/BudgetControllerTest.php @@ -43,7 +43,7 @@ final class BudgetControllerTest extends TestCase public function testGetOverviewChart(): void { $this->actingAs($this->user); - $params = ['start' => '2024-01-01', 'end' => '2024-01-31']; + $params = ['start' => '2024-01-01', 'end' => '2024-01-31']; $response = $this->getJson(route('api.v1.chart.budget.overview').'?'.http_build_query($params)); $response->assertStatus(200); } diff --git a/tests/integration/Api/Chart/CategoryControllerTest.php b/tests/integration/Api/Chart/CategoryControllerTest.php index cee6e3a0f5..e9f78d0d23 100644 --- a/tests/integration/Api/Chart/CategoryControllerTest.php +++ b/tests/integration/Api/Chart/CategoryControllerTest.php @@ -43,7 +43,7 @@ final class CategoryControllerTest extends TestCase public function testGetOverviewChart(): void { $this->actingAs($this->user); - $params = ['start' => '2024-01-01', 'end' => '2024-01-31']; + $params = ['start' => '2024-01-01', 'end' => '2024-01-31']; $response = $this->getJson(route('api.v1.chart.category.overview').'?'.http_build_query($params)); $response->assertStatus(200); } diff --git a/tests/integration/Api/Models/Account/ListControllerTest.php b/tests/integration/Api/Models/Account/ListControllerTest.php index 7990994ed9..e18fca9397 100644 --- a/tests/integration/Api/Models/Account/ListControllerTest.php +++ b/tests/integration/Api/Models/Account/ListControllerTest.php @@ -49,15 +49,15 @@ final class ListControllerTest extends TestCase $this->actingAs($this->user); $response = $this->getJson(route('api.v1.accounts.attachments', ['account' => $this->account->id])); $response->assertStatus(200); - $response->assertJson(['meta' => ['pagination' => ['total' => 2, 'total_pages' => 1]]]); + $response->assertJson(['meta' => ['pagination' => ['total' => 2, 'total_pages' => 1]]]); } public function testIndexCanChangePageSize(): void { $this->actingAs($this->user); - $response = $this->getJson(route('api.v1.accounts.attachments', ['account' => $this->account->id, 'limit' => 1])); + $response = $this->getJson(route('api.v1.accounts.attachments', ['account' => $this->account->id, 'limit' => 1])); $response->assertStatus(200); - $response->assertJson(['meta' => ['pagination' => ['total' => 2, 'total_pages' => 2]]]); + $response->assertJson(['meta' => ['pagination' => ['total' => 2, 'total_pages' => 2]]]); } #[Override] diff --git a/tests/integration/TestCase.php b/tests/integration/TestCase.php index 342cc4cd7a..a982a5b1fc 100644 --- a/tests/integration/TestCase.php +++ b/tests/integration/TestCase.php @@ -61,9 +61,9 @@ abstract class TestCase extends BaseTestCase { $group = UserGroup::create(['title' => 'test@email.com']); $role = UserRole::where('title', 'owner')->first(); - $user = User::create(['email' => 'test@email.com', 'password' => 'password', 'user_group_id' => $group->id]); + $user = User::create(['email' => 'test@email.com', 'password' => 'password', 'user_group_id' => $group->id]); - GroupMembership::create(['user_id' => $user->id, 'user_group_id' => $group->id, 'user_role_id' => $role->id]); + GroupMembership::create(['user_id' => $user->id, 'user_group_id' => $group->id, 'user_role_id' => $role->id]); return $user; } diff --git a/tests/unit/Support/NavigationAddPeriodTest.php b/tests/unit/Support/NavigationAddPeriodTest.php index 869334f4b5..e2eb80a719 100644 --- a/tests/unit/Support/NavigationAddPeriodTest.php +++ b/tests/unit/Support/NavigationAddPeriodTest.php @@ -64,11 +64,11 @@ final class NavigationAddPeriodTest extends TestCase 'from' => Carbon::parse('2019-01-31'), 'expected' => Carbon::parse('2019-02-11'), ], - '1D' => ['skip' => 1, 'frequency' => '1D', 'from' => Carbon::now(), 'expected' => Carbon::now()->addDays(2)], - 'daily' => ['skip' => 1, 'frequency' => 'daily', 'from' => Carbon::now(), 'expected' => Carbon::now()->addDays(2)], - '1W' => ['skip' => 1, 'frequency' => '1W', 'from' => Carbon::now(), 'expected' => Carbon::now()->addWeeks(2)], - 'weekly' => ['skip' => 1, 'frequency' => 'weekly', 'from' => Carbon::now(), 'expected' => Carbon::now()->addWeeks(2)], - 'week' => ['skip' => 1, 'frequency' => 'week', 'from' => Carbon::now(), 'expected' => Carbon::now()->addWeeks(2)], + '1D' => ['skip' => 1, 'frequency' => '1D', 'from' => Carbon::now(), 'expected' => Carbon::now()->addDays(2)], + 'daily' => ['skip' => 1, 'frequency' => 'daily', 'from' => Carbon::now(), 'expected' => Carbon::now()->addDays(2)], + '1W' => ['skip' => 1, 'frequency' => '1W', 'from' => Carbon::now(), 'expected' => Carbon::now()->addWeeks(2)], + 'weekly' => ['skip' => 1, 'frequency' => 'weekly', 'from' => Carbon::now(), 'expected' => Carbon::now()->addWeeks(2)], + 'week' => ['skip' => 1, 'frequency' => 'week', 'from' => Carbon::now(), 'expected' => Carbon::now()->addWeeks(2)], '1M' => [ 'skip' => 1, 'frequency' => '1M', @@ -183,16 +183,16 @@ final class NavigationAddPeriodTest extends TestCase 'from' => Carbon::now(), 'expected' => Carbon::now()->addMonthsNoOverflow(12), ], - 'year' => ['skip' => 1, 'frequency' => 'year', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYears(2)], - 'yearly' => ['skip' => 1, 'frequency' => 'yearly', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYears(2)], - '1Y' => ['skip' => 1, 'frequency' => '1Y', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYears(2)], + 'year' => ['skip' => 1, 'frequency' => 'year', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYears(2)], + 'yearly' => ['skip' => 1, 'frequency' => 'yearly', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYears(2)], + '1Y' => ['skip' => 1, 'frequency' => '1Y', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYears(2)], '2023-02-01 to 2023-02-15' => [ 'skip' => 1, 'frequency' => 'last7', 'from' => Carbon::parse('2023-02-01'), 'expected' => Carbon::parse('2023-02-15'), ], - 'last7' => ['skip' => 1, 'frequency' => 'last7', 'from' => Carbon::now(), 'expected' => Carbon::now()->addDays(14)], + 'last7' => ['skip' => 1, 'frequency' => 'last7', 'from' => Carbon::now(), 'expected' => Carbon::now()->addDays(14)], 'last30' => [ 'skip' => 1, 'frequency' => 'last30', @@ -205,7 +205,7 @@ final class NavigationAddPeriodTest extends TestCase 'from' => Carbon::now(), 'expected' => Carbon::now()->addMonthsNoOverflow(6), ], - 'last365' => ['skip' => 1, 'frequency' => 'last365', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYears(2)], + 'last365' => ['skip' => 1, 'frequency' => 'last365', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYears(2)], 'MTD' => [ 'skip' => 1, 'frequency' => 'MTD', @@ -218,7 +218,7 @@ final class NavigationAddPeriodTest extends TestCase 'from' => Carbon::now(), 'expected' => Carbon::now()->addMonthsNoOverflow(6), ], - 'YTD' => ['skip' => 1, 'frequency' => 'YTD', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYears(2)], + 'YTD' => ['skip' => 1, 'frequency' => 'YTD', 'from' => Carbon::now(), 'expected' => Carbon::now()->addYears(2)], ]; foreach ($intervals as $interval) { yield "{$interval['frequency']} {$interval['from']->toDateString()} to {$interval['expected']->toDateString()}" => $interval;