From 3711222f9e9ab2633dd56a6a288c36124cace8fa Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 28 Nov 2025 19:01:15 +0100 Subject: [PATCH] Fix #11281 and some other stuff. --- app/Handlers/Events/WebhookEventHandler.php | 4 +++ .../Controllers/Account/CreateController.php | 7 ++--- .../Controllers/Account/DeleteController.php | 3 ++- .../Controllers/Account/EditController.php | 3 ++- .../Controllers/Account/IndexController.php | 5 ++-- .../Account/ReconcileController.php | 3 ++- .../Controllers/Account/ShowController.php | 5 ++-- .../Admin/ConfigurationController.php | 3 ++- app/Http/Controllers/Admin/HomeController.php | 3 ++- app/Http/Controllers/Admin/LinkController.php | 5 ++-- app/Http/Controllers/Admin/UserController.php | 3 ++- app/Http/Controllers/AttachmentController.php | 5 ++-- .../Controllers/Auth/TwoFactorController.php | 25 ++++++++--------- .../Controllers/Bill/CreateController.php | 3 ++- .../Controllers/Bill/DeleteController.php | 3 ++- app/Http/Controllers/Bill/EditController.php | 3 ++- app/Http/Controllers/Bill/ShowController.php | 5 ++-- .../Budget/BudgetLimitController.php | 3 ++- .../Controllers/Budget/CreateController.php | 3 ++- .../Controllers/Budget/DeleteController.php | 3 ++- .../Controllers/Budget/EditController.php | 3 ++- .../Controllers/Budget/IndexController.php | 3 ++- .../Controllers/Budget/ShowController.php | 9 ++++--- .../Controllers/Category/CreateController.php | 3 ++- .../Controllers/Category/DeleteController.php | 3 ++- .../Controllers/Category/EditController.php | 3 ++- .../Controllers/Category/IndexController.php | 3 ++- .../Category/NoCategoryController.php | 5 ++-- .../Controllers/Category/ShowController.php | 5 ++-- app/Http/Controllers/HomeController.php | 3 ++- app/Http/Controllers/JavascriptController.php | 3 ++- app/Http/Controllers/Json/IntroController.php | 7 ++--- app/Http/Controllers/NewUserController.php | 11 ++++---- .../ObjectGroup/DeleteController.php | 3 ++- .../ObjectGroup/EditController.php | 3 ++- .../PiggyBank/AmountController.php | 5 ++-- .../PiggyBank/CreateController.php | 3 ++- .../PiggyBank/DeleteController.php | 3 ++- .../Controllers/PiggyBank/EditController.php | 3 ++- .../Controllers/Profile/MfaController.php | 27 ++++++++++--------- app/Http/Controllers/ProfileController.php | 15 ++++++----- .../Recurring/CreateController.php | 3 ++- .../Recurring/DeleteController.php | 3 ++- .../Controllers/Recurring/EditController.php | 3 ++- .../Controllers/Recurring/IndexController.php | 3 ++- app/Http/Controllers/ReportController.php | 3 ++- .../Controllers/Rule/CreateController.php | 3 ++- .../Controllers/Rule/DeleteController.php | 3 ++- app/Http/Controllers/Rule/EditController.php | 3 ++- .../RuleGroup/CreateController.php | 3 ++- .../RuleGroup/DeleteController.php | 3 ++- .../Controllers/RuleGroup/EditController.php | 3 ++- .../Controllers/System/InstallController.php | 3 ++- app/Http/Controllers/TagController.php | 11 ++++---- .../Transaction/BulkController.php | 3 ++- .../Transaction/DeleteController.php | 3 ++- .../Transaction/EditController.php | 5 ++-- .../Transaction/IndexController.php | 5 ++-- .../Transaction/LinkController.php | 3 ++- .../Transaction/MassController.php | 5 ++-- .../TransactionCurrency/EditController.php | 3 ++- .../TransactionCurrency/IndexController.php | 3 ++- app/Http/Middleware/InterestingMessage.php | 13 ++++----- app/Http/Middleware/Range.php | 5 ++-- app/Jobs/CreateRecurringTransactions.php | 8 ++++-- .../ReturnsAvailableChannels.php | 11 ++++---- .../Recurring/RecurringRepository.php | 3 ++- app/Repositories/User/UserRepository.php | 13 ++++----- .../Internal/Support/AccountServiceTrait.php | 7 ++--- .../Internal/Update/AccountUpdateService.php | 5 ++-- .../Internal/Update/GroupUpdateService.php | 7 ++--- .../Internal/Update/JournalUpdateService.php | 3 ++- app/Support/Binder/CLIToken.php | 3 ++- app/Support/CacheProperties.php | 3 ++- app/Support/Cronjobs/AutoBudgetCronjob.php | 3 ++- app/Support/Cronjobs/BillWarningCronjob.php | 3 ++- app/Support/Cronjobs/ExchangeRatesCronjob.php | 3 ++- app/Support/Cronjobs/RecurringCronjob.php | 3 ++- app/Support/Cronjobs/WebhookCronjob.php | 3 ++- .../Http/Api/CollectsAccountsFromFilter.php | 3 ++- .../Http/Controllers/RequestInformation.php | 3 ++- app/Support/Navigation.php | 3 ++- .../RecalculatesAvailableBudgetsTrait.php | 3 ++- app/Support/Search/OperatorQuerySearch.php | 3 ++- app/Support/Steam.php | 7 ++--- app/User.php | 9 ++++--- app/Validation/FireflyValidator.php | 3 ++- 87 files changed, 260 insertions(+), 167 deletions(-) diff --git a/app/Handlers/Events/WebhookEventHandler.php b/app/Handlers/Events/WebhookEventHandler.php index 04e575039e..b83079e402 100644 --- a/app/Handlers/Events/WebhookEventHandler.php +++ b/app/Handlers/Events/WebhookEventHandler.php @@ -53,8 +53,12 @@ class WebhookEventHandler )->splice(0, 5) ; Log::debug(sprintf('Found %d webhook message(s) ready to be send.', $messages->count())); + /** @var WebhookMessage $message */ foreach ($messages as $message) { if (false === $message->sent) { + // set it to "sent" right away! + $message->sent = true; + $message->save(); Log::debug(sprintf('Send message #%d', $message->id)); SendWebhookMessage::dispatch($message)->afterResponse(); } diff --git a/app/Http/Controllers/Account/CreateController.php b/app/Http/Controllers/Account/CreateController.php index 65994d0f82..7411952ae9 100644 --- a/app/Http/Controllers/Account/CreateController.php +++ b/app/Http/Controllers/Account/CreateController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Account; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; @@ -141,18 +142,18 @@ class CreateController extends Controller $data = $request->getAccountData(); $account = $this->repository->store($data); $request->session()->flash('success', (string) trans('firefly.stored_new_account', ['name' => $account->name])); - app('preferences')->mark(); + Preferences::mark(); Log::channel('audit')->info('Stored new account.', $data); // update preferences if necessary: - $frontpage = app('preferences')->get('frontpageAccounts', [])->data; + $frontpage = Preferences::get('frontpageAccounts', [])->data; if (!is_array($frontpage)) { $frontpage = []; } if (AccountTypeEnum::ASSET->value === $account->accountType->type) { $frontpage[] = $account->id; - app('preferences')->set('frontpageAccounts', $frontpage); + Preferences::set('frontpageAccounts', $frontpage); } // store attachment(s): diff --git a/app/Http/Controllers/Account/DeleteController.php b/app/Http/Controllers/Account/DeleteController.php index 49686ffe61..8f577d3d6d 100644 --- a/app/Http/Controllers/Account/DeleteController.php +++ b/app/Http/Controllers/Account/DeleteController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Account; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -101,7 +102,7 @@ class DeleteController extends Controller $this->repository->destroy($account, $moveTo); $request->session()->flash('success', (string) trans(sprintf('firefly.%s_deleted', $typeName), ['name' => $name])); - app('preferences')->mark(); + Preferences::mark(); return redirect($this->getPreviousUrl('accounts.delete.url')); } diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.php index 9fa0eea7c0..2b0c39e870 100644 --- a/app/Http/Controllers/Account/EditController.php +++ b/app/Http/Controllers/Account/EditController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Account; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\AccountFormRequest; @@ -205,7 +206,7 @@ class EditController extends Controller $redirect = redirect(route('accounts.edit', [$account->id]))->withInput(['return_to_edit' => 1]); } - app('preferences')->mark(); + Preferences::mark(); return $redirect; } diff --git a/app/Http/Controllers/Account/IndexController.php b/app/Http/Controllers/Account/IndexController.php index 289413e8fb..94951b398a 100644 --- a/app/Http/Controllers/Account/IndexController.php +++ b/app/Http/Controllers/Account/IndexController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Account; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; @@ -81,7 +82,7 @@ class IndexController extends Controller $collection = $this->repository->getInactiveAccountsByType($types); $total = $collection->count(); $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $accounts = $collection->slice(($page - 1) * $pageSize, $pageSize); unset($collection); @@ -153,7 +154,7 @@ class IndexController extends Controller $collection = $this->repository->getActiveAccountsByType($types); $total = $collection->count(); $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $accounts = $collection->slice(($page - 1) * $pageSize, $pageSize); $inactiveCount = $this->repository->getInactiveAccountsByType($types)->count(); diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 248e5efe38..c96cd970a6 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Account; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Navigation; use Illuminate\Support\Facades\Log; use Carbon\Carbon; @@ -175,7 +176,7 @@ class ReconcileController extends Controller $result = $this->createReconciliation($account, $start, $end, $data['difference']); } Log::debug('End of routine.'); - app('preferences')->mark(); + Preferences::mark(); if ('' === $result) { session()->flash('success', (string) trans('firefly.reconciliation_stored')); } diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index f495e586c8..39e5debb64 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Account; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; @@ -113,7 +114,7 @@ class ShowController extends Controller $today = today(config('app.timezone')); $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type)); $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $accountCurrency = $this->repository->getAccountCurrency($account); $currency = $accountCurrency ?? $this->primaryCurrency; $fStart = $start->isoFormat($this->monthAndDayFormat); @@ -199,7 +200,7 @@ class ShowController extends Controller $start = $this->repository->oldestJournalDate($account) ?? today(config('app.timezone'))->startOfMonth(); $subTitleIcon = config('firefly.subIconsByIdentifier.'.$account->accountType->type); $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $currency = $this->repository->getAccountCurrency($account) ?? $this->primaryCurrency; $subTitle = (string) trans('firefly.all_journals_for_account', ['name' => $account->name]); $periods = new Collection(); diff --git a/app/Http/Controllers/Admin/ConfigurationController.php b/app/Http/Controllers/Admin/ConfigurationController.php index 541549fade..fe4f9dc3ca 100644 --- a/app/Http/Controllers/Admin/ConfigurationController.php +++ b/app/Http/Controllers/Admin/ConfigurationController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Admin; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Middleware\IsDemoUser; use FireflyIII\Http\Requests\ConfigurationRequest; @@ -95,7 +96,7 @@ class ConfigurationController extends Controller // flash message session()->flash('success', (string) trans('firefly.configuration_updated')); - app('preferences')->mark(); + Preferences::mark(); return redirect()->route('settings.configuration.index'); } diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php index 8915a44f06..0c4fc3911c 100644 --- a/app/Http/Controllers/Admin/HomeController.php +++ b/app/Http/Controllers/Admin/HomeController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Admin; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Middleware\IsDemoUser; use Illuminate\Contracts\View\Factory; @@ -59,7 +60,7 @@ class HomeController extends Controller $title = (string) trans('firefly.system_settings'); $mainTitleIcon = 'fa-hand-spock-o'; $email = auth()->user()->email; - $pref = app('preferences')->get('remote_guard_alt_email'); + $pref = Preferences::get('remote_guard_alt_email'); if (null !== $pref && is_string($pref->data)) { $email = $pref->data; } diff --git a/app/Http/Controllers/Admin/LinkController.php b/app/Http/Controllers/Admin/LinkController.php index 234c980471..d48124d231 100644 --- a/app/Http/Controllers/Admin/LinkController.php +++ b/app/Http/Controllers/Admin/LinkController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Admin; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Middleware\IsDemoUser; use FireflyIII\Http\Requests\LinkTypeFormRequest; @@ -125,7 +126,7 @@ class LinkController extends Controller $this->repository->destroy($linkType, $moveTo); $request->session()->flash('success', (string) trans('firefly.deleted_link_type', ['name' => $name])); - app('preferences')->mark(); + Preferences::mark(); return redirect($this->getPreviousUrl('link-types.delete.url')); } @@ -245,7 +246,7 @@ class LinkController extends Controller Log::channel('audit')->info(sprintf('User update link type #%d.', $linkType->id), $data); $request->session()->flash('success', (string) trans('firefly.updated_link_type', ['name' => $linkType->name])); - app('preferences')->mark(); + Preferences::mark(); $redirect = redirect($this->getPreviousUrl('link-types.edit.url')); if (1 === (int) $request->get('return_to_edit')) { // set value so edit routine will not overwrite URL: diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index b2a50a5da5..380ac6dc3e 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Admin; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use FireflyIII\Events\Admin\InvitationCreated; use FireflyIII\Exceptions\FireflyException; @@ -242,7 +243,7 @@ class UserController extends Controller $this->repository->updateEmail($user, $data['email']); session()->flash('success', (string) trans('firefly.updated_user', ['email' => $user->email])); - app('preferences')->mark(); + Preferences::mark(); $redirect = redirect($this->getPreviousUrl('users.edit.url')); if (1 === (int) $request->get('return_to_edit')) { session()->put('users.edit.fromUpdate', true); diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index 534dd47cee..4c4ff2293a 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Requests\AttachmentFormRequest; use FireflyIII\Models\Attachment; @@ -85,7 +86,7 @@ class AttachmentController extends Controller $this->repository->destroy($attachment); $request->session()->flash('success', (string) trans('firefly.attachment_deleted', ['name' => $name])); - app('preferences')->mark(); + Preferences::mark(); return redirect($this->getPreviousUrl('attachments.delete.url')); } @@ -175,7 +176,7 @@ class AttachmentController extends Controller $this->repository->update($attachment, $data); $request->session()->flash('success', (string) trans('firefly.attachment_updated', ['name' => $attachment->filename])); - app('preferences')->mark(); + Preferences::mark(); $redirect = redirect($this->getPreviousUrl('attachments.edit.url')); if (1 === (int) $request->get('return_to_edit')) { diff --git a/app/Http/Controllers/Auth/TwoFactorController.php b/app/Http/Controllers/Auth/TwoFactorController.php index 2116f1b827..983f0f8b26 100644 --- a/app/Http/Controllers/Auth/TwoFactorController.php +++ b/app/Http/Controllers/Auth/TwoFactorController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Auth; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Events\Security\MFABackupFewLeft; use FireflyIII\Events\Security\MFABackupNoLeft; @@ -65,7 +66,7 @@ class TwoFactorController extends Controller public function submitMFA(Request $request): Redirector|RedirectResponse { /** @var array $mfaHistory */ - $mfaHistory = app('preferences')->get('mfa_history', [])->data; + $mfaHistory = Preferences::get('mfa_history', [])->data; $mfaCode = (string) $request->get('one_time_password'); // is in history? then refuse to use it. @@ -149,7 +150,7 @@ class TwoFactorController extends Controller private function filterMFAHistory(): void { /** @var array $mfaHistory */ - $mfaHistory = app('preferences')->get('mfa_history', [])->data; + $mfaHistory = Preferences::get('mfa_history', [])->data; $newHistory = []; $now = Carbon::now()->getTimestamp(); foreach ($mfaHistory as $entry) { @@ -162,20 +163,20 @@ class TwoFactorController extends Controller ]; } } - app('preferences')->set('mfa_history', $newHistory); + Preferences::set('mfa_history', $newHistory); } private function addToMFAFailureCounter(): void { - $preference = (int) app('preferences')->get('mfa_failure_count', 0)->data; + $preference = (int) Preferences::get('mfa_failure_count', 0)->data; ++$preference; Log::channel('audit')->info(sprintf('MFA failure count is set to %d.', $preference)); - app('preferences')->set('mfa_failure_count', $preference); + Preferences::set('mfa_failure_count', $preference); } private function getMFAFailureCounter(): int { - $value = (int) app('preferences')->get('mfa_failure_count', 0)->data; + $value = (int) Preferences::get('mfa_failure_count', 0)->data; Log::channel('audit')->info(sprintf('MFA failure count is %d.', $value)); return $value; @@ -184,20 +185,20 @@ class TwoFactorController extends Controller private function addToMFAHistory(string $mfaCode): void { /** @var array $mfaHistory */ - $mfaHistory = app('preferences')->get('mfa_history', [])->data; + $mfaHistory = Preferences::get('mfa_history', [])->data; $entry = [ 'time' => Carbon::now()->getTimestamp(), 'code' => $mfaCode, ]; $mfaHistory[] = $entry; - app('preferences')->set('mfa_history', $mfaHistory); + Preferences::set('mfa_history', $mfaHistory); $this->filterMFAHistory(); } private function resetMFAFailureCounter(): void { - app('preferences')->set('mfa_failure_count', 0); + Preferences::set('mfa_failure_count', 0); Log::channel('audit')->info('MFA failure count is set to zero.'); } @@ -206,7 +207,7 @@ class TwoFactorController extends Controller */ private function isBackupCode(string $mfaCode): bool { - $list = app('preferences')->get('mfa_recovery', [])->data; + $list = Preferences::get('mfa_recovery', [])->data; if (!is_array($list)) { $list = []; } @@ -219,7 +220,7 @@ class TwoFactorController extends Controller */ private function removeFromBackupCodes(string $mfaCode): void { - $list = app('preferences')->get('mfa_recovery', [])->data; + $list = Preferences::get('mfa_recovery', [])->data; if (!is_array($list)) { $list = []; } @@ -238,6 +239,6 @@ class TwoFactorController extends Controller event(new MFABackupNoLeft($user)); } - app('preferences')->set('mfa_recovery', $newList); + Preferences::set('mfa_recovery', $newList); } } diff --git a/app/Http/Controllers/Bill/CreateController.php b/app/Http/Controllers/Bill/CreateController.php index f87059d095..3d8d95fd37 100644 --- a/app/Http/Controllers/Bill/CreateController.php +++ b/app/Http/Controllers/Bill/CreateController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Bill; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; @@ -105,7 +106,7 @@ class CreateController extends Controller Log::channel('audit')->info('Stored new bill.', $billData); $request->session()->flash('success', (string) trans('firefly.stored_new_bill', ['name' => $bill->name])); - app('preferences')->mark(); + Preferences::mark(); /** @var null|array $files */ $files = $request->hasFile('attachments') ? $request->file('attachments') : null; diff --git a/app/Http/Controllers/Bill/DeleteController.php b/app/Http/Controllers/Bill/DeleteController.php index a3516bcf4a..70f8d06338 100644 --- a/app/Http/Controllers/Bill/DeleteController.php +++ b/app/Http/Controllers/Bill/DeleteController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Bill; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Bill; use FireflyIII\Repositories\Bill\BillRepositoryInterface; @@ -83,7 +84,7 @@ class DeleteController extends Controller $this->repository->destroy($bill); $request->session()->flash('success', (string) trans('firefly.deleted_bill', ['name' => $name])); - app('preferences')->mark(); + Preferences::mark(); return redirect($this->getPreviousUrl('bills.delete.url')); } diff --git a/app/Http/Controllers/Bill/EditController.php b/app/Http/Controllers/Bill/EditController.php index 820841215b..536eabb827 100644 --- a/app/Http/Controllers/Bill/EditController.php +++ b/app/Http/Controllers/Bill/EditController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Bill; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\BillUpdateRequest; @@ -116,7 +117,7 @@ class EditController extends Controller Log::channel('audit')->info(sprintf('Updated bill #%d.', $bill->id), $billData); $request->session()->flash('success', (string) trans('firefly.updated_bill', ['name' => $bill->name])); - app('preferences')->mark(); + Preferences::mark(); /** @var null|array $files */ $files = $request->hasFile('attachments') ? $request->file('attachments') : null; diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.php index fa5ef7d699..a4125f0410 100644 --- a/app/Http/Controllers/Bill/ShowController.php +++ b/app/Http/Controllers/Bill/ShowController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Bill; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Navigation; use Carbon\Carbon; use FireflyIII\Helpers\Collector\GroupCollectorInterface; @@ -106,7 +107,7 @@ class ShowController extends Controller $ruleEngine->fire(); $request->session()->flash('success', trans_choice('firefly.rescanned_bill', $total)); - app('preferences')->mark(); + Preferences::mark(); return redirect(route('bills.show', [$bill->id])); } @@ -132,7 +133,7 @@ class ShowController extends Controller $end = session('end'); $year = $start->year; $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $yearAverage = $this->repository->getYearAverage($bill, $start); $overallAverage = $this->repository->getOverallAverage($bill); $manager = new Manager(); diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.php index 241345f2f5..c074746c2a 100644 --- a/app/Http/Controllers/Budget/BudgetLimitController.php +++ b/app/Http/Controllers/Budget/BudgetLimitController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Budget; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; @@ -255,7 +256,7 @@ class BudgetLimitController extends Controller $limit = $this->blRepository->update($budgetLimit, ['amount' => $amount, 'notes' => $notes]); - app('preferences')->mark(); + Preferences::mark(); $array = $limit->toArray(); $spentArr = $this->opsRepository->sumExpenses( diff --git a/app/Http/Controllers/Budget/CreateController.php b/app/Http/Controllers/Budget/CreateController.php index 2146daa4e9..de3a38ebb4 100644 --- a/app/Http/Controllers/Budget/CreateController.php +++ b/app/Http/Controllers/Budget/CreateController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Budget; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Enums\AutoBudgetType; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; @@ -116,7 +117,7 @@ class CreateController extends Controller $budget = $this->repository->store($data); $this->repository->cleanupBudgets(); $request->session()->flash('success', (string) trans('firefly.stored_new_budget', ['name' => $budget->name])); - app('preferences')->mark(); + Preferences::mark(); Log::channel('audit')->info('Stored new budget.', $data); diff --git a/app/Http/Controllers/Budget/DeleteController.php b/app/Http/Controllers/Budget/DeleteController.php index 7338cfa1b1..b9989c45ef 100644 --- a/app/Http/Controllers/Budget/DeleteController.php +++ b/app/Http/Controllers/Budget/DeleteController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Budget; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; @@ -82,7 +83,7 @@ class DeleteController extends Controller $name = $budget->name; $this->repository->destroy($budget); $request->session()->flash('success', (string) trans('firefly.deleted_budget', ['name' => $name])); - app('preferences')->mark(); + Preferences::mark(); return redirect($this->getPreviousUrl('budgets.delete.url')); } diff --git a/app/Http/Controllers/Budget/EditController.php b/app/Http/Controllers/Budget/EditController.php index 15ca61d449..a164365fcd 100644 --- a/app/Http/Controllers/Budget/EditController.php +++ b/app/Http/Controllers/Budget/EditController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Budget; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Enums\AutoBudgetType; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; @@ -126,7 +127,7 @@ class EditController extends Controller $request->session()->flash('success', (string) trans('firefly.updated_budget', ['name' => $budget->name])); $this->repository->cleanupBudgets(); - app('preferences')->mark(); + Preferences::mark(); Log::channel('audit')->info(sprintf('Updated budget #%d.', $budget->id), $data); diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index 776a4e2239..efe15e03bb 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Budget; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Navigation; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; @@ -308,7 +309,7 @@ class IndexController extends Controller $repository->setBudgetOrder($budget, $index + 1); } } - app('preferences')->mark(); + Preferences::mark(); return response()->json(['OK']); } diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index 9215523324..9325032225 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Budget; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Exceptions\FireflyException; @@ -98,7 +99,7 @@ class ShowController extends Controller $firstDate = $first instanceof TransactionJournal ? $first->date : $start; $periods = $this->getNoModelPeriodOverview('budget', $firstDate, $end); $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); @@ -126,7 +127,7 @@ class ShowController extends Controller $start = $first instanceof TransactionJournal ? $first->date : new Carbon(); $end = today(config('app.timezone')); $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; /** @var GroupCollectorInterface $collector */ $collector = app(GroupCollectorInterface::class); @@ -153,7 +154,7 @@ class ShowController extends Controller $allStart = session('first', today(config('app.timezone'))->startOfYear()); $allEnd = today(); $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $limits = $this->getLimits($budget, $allStart, $allEnd); $repetition = null; $attachments = $this->repository->getAttachments($budget); @@ -190,7 +191,7 @@ class ShowController extends Controller $currencySymbol = $budgetLimit->transactionCurrency->symbol; $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $subTitle = trans( 'firefly.budget_in_period', [ diff --git a/app/Http/Controllers/Category/CreateController.php b/app/Http/Controllers/Category/CreateController.php index da68a62fe9..043cc17ea6 100644 --- a/app/Http/Controllers/Category/CreateController.php +++ b/app/Http/Controllers/Category/CreateController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; @@ -92,7 +93,7 @@ class CreateController extends Controller $category = $this->repository->store($data); $request->session()->flash('success', (string) trans('firefly.stored_category', ['name' => $category->name])); - app('preferences')->mark(); + Preferences::mark(); // store attachment(s): /** @var null|array $files */ diff --git a/app/Http/Controllers/Category/DeleteController.php b/app/Http/Controllers/Category/DeleteController.php index e90b33b56c..d2e106a192 100644 --- a/app/Http/Controllers/Category/DeleteController.php +++ b/app/Http/Controllers/Category/DeleteController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; @@ -83,7 +84,7 @@ class DeleteController extends Controller $this->repository->destroy($category); $request->session()->flash('success', (string) trans('firefly.deleted_category', ['name' => $name])); - app('preferences')->mark(); + Preferences::mark(); return redirect($this->getPreviousUrl('categories.delete.url')); } diff --git a/app/Http/Controllers/Category/EditController.php b/app/Http/Controllers/Category/EditController.php index 9a5ddd55dc..2e02d8fcaa 100644 --- a/app/Http/Controllers/Category/EditController.php +++ b/app/Http/Controllers/Category/EditController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\CategoryFormRequest; @@ -94,7 +95,7 @@ class EditController extends Controller $this->repository->update($category, $data); $request->session()->flash('success', (string) trans('firefly.updated_category', ['name' => $category->name])); - app('preferences')->mark(); + Preferences::mark(); // store new attachment(s): /** @var null|array $files */ diff --git a/app/Http/Controllers/Category/IndexController.php b/app/Http/Controllers/Category/IndexController.php index 15d7f70865..e7cfd7816e 100644 --- a/app/Http/Controllers/Category/IndexController.php +++ b/app/Http/Controllers/Category/IndexController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; @@ -72,7 +73,7 @@ class IndexController extends Controller public function index(Request $request): Factory|\Illuminate\Contracts\View\View { $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $collection = $this->repository->getCategories(); $total = $collection->count(); $collection = $collection->slice(($page - 1) * $pageSize, $pageSize); diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index 2e4db37b00..fa03c70f08 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Enums\TransactionTypeEnum; use FireflyIII\Exceptions\FireflyException; @@ -86,7 +87,7 @@ class NoCategoryController extends Controller /** @var Carbon $start */ /** @var Carbon $end */ $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $subTitle = trans('firefly.without_category_between', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat)]); $first = $this->journalRepos->firstNull()->date ?? clone $start; $periods = $this->getNoModelPeriodOverview('category', $first, $end); @@ -122,7 +123,7 @@ class NoCategoryController extends Controller $end = null; $periods = new Collection(); $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; Log::debug('Start of noCategory()'); $subTitle = (string) trans('firefly.all_journals_without_category'); $first = $this->journalRepos->firstNull(); diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index 101bf3f75a..1df3544c91 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; @@ -86,7 +87,7 @@ class ShowController extends Controller $subTitleIcon = 'fa-bookmark'; $page = (int) $request->get('page'); $attachments = $this->repository->getAttachments($category); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $oldest = $this->repository->firstUseDate($category) ?? today(config('app.timezone'))->startOfYear(); $periods = $this->getCategoryPeriodOverview($category, $oldest, $end); $path = route('categories.show', [$category->id, $start->format('Y-m-d'), $end->format('Y-m-d')]); @@ -125,7 +126,7 @@ class ShowController extends Controller // default values: $subTitleIcon = 'fa-bookmark'; $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $start = null; $end = null; $periods = new Collection(); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index b3cff18071..67118821c6 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use Carbon\Exceptions\InvalidFormatException; use Exception; @@ -146,7 +147,7 @@ class HomeController extends Controller $count = $repository->count($types); $subTitle = (string) trans('firefly.welcome_back'); $transactions = []; - $frontpage = app('preferences')->getFresh('frontpageAccounts', $repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray()); + $frontpage = Preferences::getFresh('frontpageAccounts', $repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray()); $frontpageArray = $frontpage->data; if (!is_array($frontpageArray)) { $frontpageArray = []; diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index 059e005eb9..65eeab1fa4 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Exceptions\FireflyException; @@ -107,7 +108,7 @@ class JavascriptController extends Controller $locale = app('steam')->getLocale(); $accounting = app('amount')->getJsConfig(); $accounting['frac_digits'] = $currency->decimal_places; - $pref = app('preferences')->get('language', config('firefly.default_language', 'en_US')); + $pref = Preferences::get('language', config('firefly.default_language', 'en_US')); $lang = $pref->data; $dateRange = $this->getDateRangeConfig(); $uid = substr(hash('sha256', sprintf('%s-%s-%s', (string) config('app.key'), auth()->user()->id, auth()->user()->email)), 0, 12); diff --git a/app/Http/Controllers/Json/IntroController.php b/app/Http/Controllers/Json/IntroController.php index 9025051314..30badd5350 100644 --- a/app/Http/Controllers/Json/IntroController.php +++ b/app/Http/Controllers/Json/IntroController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Json; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Support\Http\Controllers\GetConfigurationData; @@ -98,8 +99,8 @@ class IntroController extends Controller $key = sprintf('%s_%s', $key, $specialPage); } Log::debug(sprintf('Going to mark the following route as NOT done: %s with special "%s" (%s)', $route, $specialPage, $key)); - app('preferences')->set($key, false); - app('preferences')->mark(); + Preferences::set($key, false); + Preferences::mark(); return response()->json(['message' => (string) trans('firefly.intro_boxes_after_refresh')]); } @@ -115,7 +116,7 @@ class IntroController extends Controller $key = sprintf('%s_%s', $key, $specialPage); } Log::debug(sprintf('Going to mark the following route as done: %s with special "%s" (%s)', $route, $specialPage, $key)); - app('preferences')->set($key, true); + Preferences::set($key, true); return response()->json(['result' => sprintf('Reported demo watched for route "%s" (%s): %s.', $route, $specialPage, $key)]); } diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index db8360ba6f..9b92f08074 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Http\Requests\NewUserFormRequest; use FireflyIII\Models\TransactionCurrency; @@ -92,7 +93,7 @@ class NewUserController extends Controller } // set language preference: - app('preferences')->set('language', $language); + Preferences::set('language', $language); // Store currency preference from input: $currency = $currencyRepository->find((int) $request->input('amount_currency_id_bank_balance')); @@ -111,10 +112,10 @@ class NewUserController extends Controller // store frontpage preferences: $accounts = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray(); - app('preferences')->set('frontpageAccounts', $accounts); + Preferences::set('frontpageAccounts', $accounts); // mark. - app('preferences')->mark(); + Preferences::mark(); // set default optional fields: $visibleFields = [ @@ -128,10 +129,10 @@ class NewUserController extends Controller 'notes' => true, 'attachments' => true, ]; - app('preferences')->set('transaction_journal_optional_fields', $visibleFields); + Preferences::set('transaction_journal_optional_fields', $visibleFields); session()->flash('success', (string) trans('firefly.stored_new_accounts_new_user')); - app('preferences')->mark(); + Preferences::mark(); return redirect(route('index')); } diff --git a/app/Http/Controllers/ObjectGroup/DeleteController.php b/app/Http/Controllers/ObjectGroup/DeleteController.php index 52c4b61466..6024db89a4 100644 --- a/app/Http/Controllers/ObjectGroup/DeleteController.php +++ b/app/Http/Controllers/ObjectGroup/DeleteController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\ObjectGroup; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\ObjectGroup; use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface; @@ -77,7 +78,7 @@ class DeleteController extends Controller public function destroy(ObjectGroup $objectGroup): RedirectResponse { session()->flash('success', (string) trans('firefly.deleted_object_group', ['title' => $objectGroup->title])); - app('preferences')->mark(); + Preferences::mark(); $this->repository->destroy($objectGroup); return redirect($this->getPreviousUrl('object-groups.delete.url')); diff --git a/app/Http/Controllers/ObjectGroup/EditController.php b/app/Http/Controllers/ObjectGroup/EditController.php index c3a3355eb6..f446765aa2 100644 --- a/app/Http/Controllers/ObjectGroup/EditController.php +++ b/app/Http/Controllers/ObjectGroup/EditController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\ObjectGroup; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\ObjectGroupFormRequest; use FireflyIII\Models\ObjectGroup; @@ -87,7 +88,7 @@ class EditController extends Controller $piggyBank = $this->repository->update($objectGroup, $data); session()->flash('success', (string) trans('firefly.updated_object_group', ['title' => $objectGroup->title])); - app('preferences')->mark(); + Preferences::mark(); $redirect = redirect($this->getPreviousUrl('object-groups.edit.url')); diff --git a/app/Http/Controllers/PiggyBank/AmountController.php b/app/Http/Controllers/PiggyBank/AmountController.php index 011ba2a445..659da06f57 100644 --- a/app/Http/Controllers/PiggyBank/AmountController.php +++ b/app/Http/Controllers/PiggyBank/AmountController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; @@ -167,7 +168,7 @@ class AmountController extends Controller } if (0 !== bccomp($total, '0')) { session()->flash('success', (string) trans('firefly.added_amount_to_piggy', ['amount' => app('amount')->formatAnything($piggyBank->transactionCurrency, $total, false), 'name' => $piggyBank->name])); - app('preferences')->mark(); + Preferences::mark(); return redirect(route('piggy-banks.index')); } @@ -216,7 +217,7 @@ class AmountController extends Controller ['amount' => app('amount')->formatAnything($piggyBank->transactionCurrency, $total, false), 'name' => $piggyBank->name] ) ); - app('preferences')->mark(); + Preferences::mark(); return redirect(route('piggy-banks.index')); } diff --git a/app/Http/Controllers/PiggyBank/CreateController.php b/app/Http/Controllers/PiggyBank/CreateController.php index 6cf391dd4a..6c734618ad 100644 --- a/app/Http/Controllers/PiggyBank/CreateController.php +++ b/app/Http/Controllers/PiggyBank/CreateController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; @@ -106,7 +107,7 @@ class CreateController extends Controller session()->flash('success', (string) trans('firefly.stored_piggy_bank', ['name' => $piggyBank->name])); session()->flash('success_url', route('piggy-banks.show', [$piggyBank->id])); - app('preferences')->mark(); + Preferences::mark(); // store attachment(s): /** @var null|array $files */ diff --git a/app/Http/Controllers/PiggyBank/DeleteController.php b/app/Http/Controllers/PiggyBank/DeleteController.php index f267db4a5e..e2cb6caf58 100644 --- a/app/Http/Controllers/PiggyBank/DeleteController.php +++ b/app/Http/Controllers/PiggyBank/DeleteController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\PiggyBank; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; @@ -78,7 +79,7 @@ class DeleteController extends Controller public function destroy(PiggyBank $piggyBank): RedirectResponse { session()->flash('success', (string) trans('firefly.deleted_piggy_bank', ['name' => $piggyBank->name])); - app('preferences')->mark(); + Preferences::mark(); $this->piggyRepos->destroy($piggyBank); return redirect($this->getPreviousUrl('piggy-banks.delete.url')); diff --git a/app/Http/Controllers/PiggyBank/EditController.php b/app/Http/Controllers/PiggyBank/EditController.php index 4140e68da7..67fee2f363 100644 --- a/app/Http/Controllers/PiggyBank/EditController.php +++ b/app/Http/Controllers/PiggyBank/EditController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\PiggyBank; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\PiggyBankUpdateRequest; @@ -121,7 +122,7 @@ class EditController extends Controller $piggyBank = $this->piggyRepos->update($piggyBank, $data); session()->flash('success', (string) trans('firefly.updated_piggy_bank', ['name' => $piggyBank->name])); - app('preferences')->mark(); + Preferences::mark(); // store new attachment(s): /** @var null|array $files */ diff --git a/app/Http/Controllers/Profile/MfaController.php b/app/Http/Controllers/Profile/MfaController.php index e434a2e525..23ff40d41b 100644 --- a/app/Http/Controllers/Profile/MfaController.php +++ b/app/Http/Controllers/Profile/MfaController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Profile; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Events\Security\DisabledMFA; use FireflyIII\Events\Security\EnabledMFA; @@ -124,8 +125,8 @@ class MfaController extends Controller ; $codes = implode("\r\n", $recoveryCodes); - app('preferences')->set('mfa_recovery', $recoveryCodes); - app('preferences')->mark(); + Preferences::set('mfa_recovery', $recoveryCodes); + Preferences::mark(); // send user notification. $user = auth()->user(); @@ -172,10 +173,10 @@ class MfaController extends Controller /** @var User $user */ $user = auth()->user(); - app('preferences')->delete('temp-mfa-secret'); - app('preferences')->delete('temp-mfa-codes'); + Preferences::delete('temp-mfa-secret'); + Preferences::delete('temp-mfa-codes'); $repository->setMFACode($user, null); - app('preferences')->mark(); + Preferences::mark(); session()->flash('success', (string) trans('firefly.pref_two_factor_auth_disabled')); session()->flash('info', (string) trans('firefly.pref_two_factor_auth_remove_it')); @@ -218,7 +219,7 @@ class MfaController extends Controller $secret = Google2FA::generateSecretKey(); $image = Google2FA::getQRCodeInline($domain, auth()->user()->email, $secret); - app('preferences')->set('temp-mfa-secret', $secret); + Preferences::set('temp-mfa-secret', $secret); return view('profile.mfa.enable-mfa', ['image' => $image, 'secret' => $secret]); @@ -252,7 +253,7 @@ class MfaController extends Controller /** @var UserRepositoryInterface $repository */ $repository = app(UserRepositoryInterface::class); - $secret = app('preferences')->get('temp-mfa-secret')?->data; + $secret = Preferences::get('temp-mfa-secret')?->data; if (is_array($secret)) { $secret = null; } @@ -260,10 +261,10 @@ class MfaController extends Controller $repository->setMFACode($user, $secret); - app('preferences')->delete('temp-mfa-secret'); + Preferences::delete('temp-mfa-secret'); session()->flash('success', (string) trans('firefly.saved_preferences')); - app('preferences')->mark(); + Preferences::mark(); // also save the code so replay attack is prevented. $mfaCode = $request->get('code'); @@ -293,14 +294,14 @@ class MfaController extends Controller private function addToMFAHistory(string $mfaCode): void { /** @var array $mfaHistory */ - $mfaHistory = app('preferences')->get('mfa_history', [])->data; + $mfaHistory = Preferences::get('mfa_history', [])->data; $entry = [ 'time' => Carbon::now()->getTimestamp(), 'code' => $mfaCode, ]; $mfaHistory[] = $entry; - app('preferences')->set('mfa_history', $mfaHistory); + Preferences::set('mfa_history', $mfaHistory); $this->filterMFAHistory(); } @@ -310,7 +311,7 @@ class MfaController extends Controller private function filterMFAHistory(): void { /** @var array $mfaHistory */ - $mfaHistory = app('preferences')->get('mfa_history', [])->data; + $mfaHistory = Preferences::get('mfa_history', [])->data; $newHistory = []; $now = Carbon::now()->getTimestamp(); foreach ($mfaHistory as $entry) { @@ -323,7 +324,7 @@ class MfaController extends Controller ]; } } - app('preferences')->set('mfa_history', $newHistory); + Preferences::set('mfa_history', $newHistory); } public function index(): Factory|RedirectResponse|View diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 67e28666fd..dabe7f6b2d 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use Exception; use FireflyIII\Events\UserChangedEmail; @@ -98,7 +99,7 @@ class ProfileController extends Controller // find preference with this token value. /** @var Collection $set */ - $set = app('preferences')->findByName('email_change_confirm_token'); + $set = Preferences::findByName('email_change_confirm_token'); $user = null; /** @var Preference $preference */ @@ -151,7 +152,7 @@ class ProfileController extends Controller $subTitle = $user->email; $userId = $user->id; $enabled2FA = null !== $user->mfa_secret; - $recoveryData = app('preferences')->get('mfa_recovery', [])->data; + $recoveryData = Preferences::get('mfa_recovery', [])->data; if (!is_array($recoveryData)) { $recoveryData = []; } @@ -165,10 +166,10 @@ class ProfileController extends Controller $repository->createPersonalAccessClient(null, $name, 'http://localhost'); } - $accessToken = app('preferences')->get('access_token'); + $accessToken = Preferences::get('access_token'); if (null === $accessToken) { $token = $user->generateAccessToken(); - $accessToken = app('preferences')->set('access_token', $token); + $accessToken = Preferences::set('access_token', $token); } return view( @@ -374,7 +375,7 @@ class ProfileController extends Controller /** @var User $user */ $user = auth()->user(); $token = $user->generateAccessToken(); - app('preferences')->set('access_token', $token); + Preferences::set('access_token', $token); session()->flash('success', (string) trans('firefly.token_regenerated')); return redirect(route('profile.index')); @@ -392,7 +393,7 @@ class ProfileController extends Controller } // find preference with this token value. - $set = app('preferences')->findByName('email_change_undo_token'); + $set = Preferences::findByName('email_change_undo_token'); $user = null; /** @var Preference $preference */ @@ -406,7 +407,7 @@ class ProfileController extends Controller } // found user.which email address to return to? - $set = app('preferences')->beginsWith($user, 'previous_email_'); + $set = Preferences::beginsWith($user, 'previous_email_'); /** @var null|string $match */ $match = null; diff --git a/app/Http/Controllers/Recurring/CreateController.php b/app/Http/Controllers/Recurring/CreateController.php index 16bf091f03..abca6a0971 100644 --- a/app/Http/Controllers/Recurring/CreateController.php +++ b/app/Http/Controllers/Recurring/CreateController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Recurring; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Enums\RecurrenceRepetitionWeekend; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; @@ -228,7 +229,7 @@ class CreateController extends Controller Log::channel('audit')->info('Stored new recurrence.', $data); $request->session()->flash('success', (string) trans('firefly.stored_new_recurrence', ['title' => $recurrence->title])); - app('preferences')->mark(); + Preferences::mark(); // store attachment(s): /** @var null|array $files */ diff --git a/app/Http/Controllers/Recurring/DeleteController.php b/app/Http/Controllers/Recurring/DeleteController.php index 35d1017f00..b542f2998e 100644 --- a/app/Http/Controllers/Recurring/DeleteController.php +++ b/app/Http/Controllers/Recurring/DeleteController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Recurring; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Recurrence; use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; @@ -83,7 +84,7 @@ class DeleteController extends Controller { $repository->destroy($recurrence); $request->session()->flash('success', (string) trans('firefly.recurrence_deleted', ['title' => $recurrence->title])); - app('preferences')->mark(); + Preferences::mark(); return redirect($this->getPreviousUrl('recurrences.delete.url')); } diff --git a/app/Http/Controllers/Recurring/EditController.php b/app/Http/Controllers/Recurring/EditController.php index 0141ce94f2..c12c8b4773 100644 --- a/app/Http/Controllers/Recurring/EditController.php +++ b/app/Http/Controllers/Recurring/EditController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Recurring; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Enums\RecurrenceRepetitionWeekend; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; @@ -193,7 +194,7 @@ class EditController extends Controller if (count($this->attachments->getMessages()->get('attachments')) > 0) { $request->session()->flash('info', $this->attachments->getMessages()->get('attachments')); } - app('preferences')->mark(); + Preferences::mark(); $redirect = redirect($this->getPreviousUrl('recurrences.edit.url')); if (1 === (int) $request->get('return_to_edit')) { // set value so edit routine will not overwrite URL: diff --git a/app/Http/Controllers/Recurring/IndexController.php b/app/Http/Controllers/Recurring/IndexController.php index 48d840828f..24cc4556d8 100644 --- a/app/Http/Controllers/Recurring/IndexController.php +++ b/app/Http/Controllers/Recurring/IndexController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Recurring; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; @@ -82,7 +83,7 @@ class IndexController extends Controller public function index(Request $request): Factory|\Illuminate\Contracts\View\View { $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $collection = $this->repository->get(); $today = today(config('app.timezone')); $year = today(config('app.timezone')); diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 3cdc068f1e..02a889a320 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use Carbon\Carbon; use FireflyIII\Enums\AccountTypeEnum; @@ -227,7 +228,7 @@ class ReportController extends Controller /** @var Carbon $start */ $start = clone session('first', today(config('app.timezone'))); $months = $this->helper->listOfMonths($start); - $customFiscalYear = app('preferences')->get('customFiscalYear', 0)->data; + $customFiscalYear = Preferences::get('customFiscalYear', 0)->data; $accounts = $repository->getAccountsByType( [AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value] ); diff --git a/app/Http/Controllers/Rule/CreateController.php b/app/Http/Controllers/Rule/CreateController.php index d1f0809cc3..d70ab54921 100644 --- a/app/Http/Controllers/Rule/CreateController.php +++ b/app/Http/Controllers/Rule/CreateController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Rule; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\RuleFormRequest; @@ -269,7 +270,7 @@ class CreateController extends Controller $rule = $this->ruleRepos->store($data); session()->flash('success_url', route('rules.select-transactions', [$rule->id])); session()->flash('success', (string) trans('firefly.stored_new_rule', ['title' => $rule->title])); - app('preferences')->mark(); + Preferences::mark(); // redirect to show bill. if ('true' === $request->get('return_to_bill') && (int) $request->get('bill_id') > 0) { diff --git a/app/Http/Controllers/Rule/DeleteController.php b/app/Http/Controllers/Rule/DeleteController.php index f9d86b7abe..14332b7c14 100644 --- a/app/Http/Controllers/Rule/DeleteController.php +++ b/app/Http/Controllers/Rule/DeleteController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Rule; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Rule; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; @@ -82,7 +83,7 @@ class DeleteController extends Controller $this->ruleRepos->destroy($rule); session()->flash('success', (string) trans('firefly.deleted_rule', ['title' => $title])); - app('preferences')->mark(); + Preferences::mark(); return redirect($this->getPreviousUrl('rules.delete.url')); } diff --git a/app/Http/Controllers/Rule/EditController.php b/app/Http/Controllers/Rule/EditController.php index cdc80c0219..ff6b44ede7 100644 --- a/app/Http/Controllers/Rule/EditController.php +++ b/app/Http/Controllers/Rule/EditController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Rule; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; @@ -204,7 +205,7 @@ class EditController extends Controller $this->ruleRepos->update($rule, $data); session()->flash('success', (string) trans('firefly.updated_rule', ['title' => $rule->title])); - app('preferences')->mark(); + Preferences::mark(); $redirect = redirect($this->getPreviousUrl('rules.edit.url')); if (true === $data['run_after_form']) { diff --git a/app/Http/Controllers/RuleGroup/CreateController.php b/app/Http/Controllers/RuleGroup/CreateController.php index 9f76923ce8..dfe919246b 100644 --- a/app/Http/Controllers/RuleGroup/CreateController.php +++ b/app/Http/Controllers/RuleGroup/CreateController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\RuleGroup; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\RuleGroupFormRequest; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; @@ -89,7 +90,7 @@ class CreateController extends Controller $ruleGroup = $this->repository->store($data); session()->flash('success', (string) trans('firefly.created_new_rule_group', ['title' => $ruleGroup->title])); - app('preferences')->mark(); + Preferences::mark(); $redirect = redirect($this->getPreviousUrl('rule-groups.create.url')); if (1 === (int) $request->get('create_another')) { diff --git a/app/Http/Controllers/RuleGroup/DeleteController.php b/app/Http/Controllers/RuleGroup/DeleteController.php index 6782f5e8bb..d788955054 100644 --- a/app/Http/Controllers/RuleGroup/DeleteController.php +++ b/app/Http/Controllers/RuleGroup/DeleteController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\RuleGroup; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\RuleGroup; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; @@ -87,7 +88,7 @@ class DeleteController extends Controller $this->repository->destroy($ruleGroup, $moveTo); session()->flash('success', (string) trans('firefly.deleted_rule_group', ['title' => $title])); - app('preferences')->mark(); + Preferences::mark(); return redirect($this->getPreviousUrl('rule-groups.delete.url')); } diff --git a/app/Http/Controllers/RuleGroup/EditController.php b/app/Http/Controllers/RuleGroup/EditController.php index 877c8ddc97..637b004aac 100644 --- a/app/Http/Controllers/RuleGroup/EditController.php +++ b/app/Http/Controllers/RuleGroup/EditController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\RuleGroup; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\RuleGroupFormRequest; use FireflyIII\Models\RuleGroup; @@ -129,7 +130,7 @@ class EditController extends Controller $this->repository->update($ruleGroup, $data); session()->flash('success', (string) trans('firefly.updated_rule_group', ['title' => $ruleGroup->title])); - app('preferences')->mark(); + Preferences::mark(); $redirect = redirect($this->getPreviousUrl('rule-groups.edit.url')); if (1 === (int) $request->get('return_to_edit')) { session()->put('rule-groups.edit.fromUpdate', true); diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index 8a8a163082..94b6c9771d 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\System; +use FireflyIII\Support\Facades\Preferences; use Exception; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; @@ -149,7 +150,7 @@ class InstallController extends Controller } // clear cache as well. Cache::clear(); - app('preferences')->mark(); + Preferences::mark(); return true; } diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 8c8e1829a2..0ed269e73d 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; @@ -212,7 +213,7 @@ class TagController extends Controller $this->repository->destroy($tag); session()->flash('success', (string) trans('firefly.deleted_tag', ['tag' => $tagName])); - app('preferences')->mark(); + Preferences::mark(); return redirect($this->getPreviousUrl('tags.delete.url')); } @@ -231,7 +232,7 @@ class TagController extends Controller // default values: $subTitleIcon = 'fa-tag'; $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $start ??= session('start'); $end ??= session('end'); $location = $this->repository->getLocation($tag); @@ -275,7 +276,7 @@ class TagController extends Controller // default values: $subTitleIcon = 'fa-tag'; $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $periods = []; $subTitle = (string) trans('firefly.all_journals_for_tag', ['tag' => $tag->tag]); $start = $this->repository->firstUseDate($tag) ?? today(config('app.timezone')); @@ -309,7 +310,7 @@ class TagController extends Controller Log::debug('Data after storage', $result->toArray()); session()->flash('success', (string) trans('firefly.created_tag', ['tag' => $data['tag']])); - app('preferences')->mark(); + Preferences::mark(); // store attachment(s): /** @var null|array $files */ @@ -347,7 +348,7 @@ class TagController extends Controller $tag = $this->repository->update($tag, $data); session()->flash('success', (string) trans('firefly.updated_tag', ['tag' => $data['tag']])); - app('preferences')->mark(); + Preferences::mark(); // store new attachment(s): /** @var null|array $files */ diff --git a/app/Http/Controllers/Transaction/BulkController.php b/app/Http/Controllers/Transaction/BulkController.php index b0d62692c1..0e4e79bf00 100644 --- a/app/Http/Controllers/Transaction/BulkController.php +++ b/app/Http/Controllers/Transaction/BulkController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use FireflyIII\Events\UpdatedTransactionGroup; use FireflyIII\Http\Controllers\Controller; @@ -122,7 +123,7 @@ class BulkController extends Controller event(new UpdatedTransactionGroup($journal->transactionGroup, true, true, false)); } - app('preferences')->mark(); + Preferences::mark(); $request->session()->flash('success', trans_choice('firefly.mass_edited_transactions_success', $count)); // redirect to previous URL: diff --git a/app/Http/Controllers/Transaction/DeleteController.php b/app/Http/Controllers/Transaction/DeleteController.php index 1e82c2cd12..436d936ece 100644 --- a/app/Http/Controllers/Transaction/DeleteController.php +++ b/app/Http/Controllers/Transaction/DeleteController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use FireflyIII\Events\UpdatedAccount; use FireflyIII\Http\Controllers\Controller; @@ -129,7 +130,7 @@ class DeleteController extends Controller Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id)); event(new UpdatedAccount($account)); } - app('preferences')->mark(); + Preferences::mark(); return redirect($this->getPreviousUrl('transactions.delete.url')); } diff --git a/app/Http/Controllers/Transaction/EditController.php b/app/Http/Controllers/Transaction/EditController.php index 00f0e0bc62..a217962960 100644 --- a/app/Http/Controllers/Transaction/EditController.php +++ b/app/Http/Controllers/Transaction/EditController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; @@ -76,7 +77,7 @@ class EditController extends Controller */ public function edit(TransactionGroup $transactionGroup): Factory|\Illuminate\Contracts\View\View|Redirector|RedirectResponse { - app('preferences')->mark(); + Preferences::mark(); if (!$this->isEditableGroup($transactionGroup)) { return $this->redirectGroupToAccount($transactionGroup); @@ -98,7 +99,7 @@ class EditController extends Controller $previousUrl = str_replace($search, '', $previousUrl); // settings necessary for v2 - $optionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data; + $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data; if (!is_array($optionalFields)) { $optionalFields = []; } diff --git a/app/Http/Controllers/Transaction/IndexController.php b/app/Http/Controllers/Transaction/IndexController.php index 8c4d3a5db3..386ba1ec46 100644 --- a/app/Http/Controllers/Transaction/IndexController.php +++ b/app/Http/Controllers/Transaction/IndexController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; @@ -84,7 +85,7 @@ class IndexController extends Controller $subTitleIcon = config('firefly.transactionIconsByType.'.$objectType); $types = config('firefly.transactionTypesByType.'.$objectType); $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; if (!$start instanceof Carbon) { $start = session('start'); @@ -137,7 +138,7 @@ class IndexController extends Controller $subTitleIcon = config('firefly.transactionIconsByType.'.$objectType); $types = config('firefly.transactionTypesByType.'.$objectType); $page = (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $path = route('transactions.index.all', [$objectType]); $first = $this->repository->firstNull(); $start = $first instanceof TransactionJournal ? $first->date : new Carbon(); diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php index e927ff9754..abe01f4427 100644 --- a/app/Http/Controllers/Transaction/LinkController.php +++ b/app/Http/Controllers/Transaction/LinkController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\JournalLinkRequest; @@ -86,7 +87,7 @@ class LinkController extends Controller $this->repository->destroyLink($link); session()->flash('success', (string) trans('firefly.deleted_link')); - app('preferences')->mark(); + Preferences::mark(); return redirect((string) session('journal_links.delete.url')); } diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 3c70dfb089..5ec860e98e 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\TransactionTypeEnum; @@ -110,7 +111,7 @@ class MassController extends Controller Log::debug(sprintf('Could not find transaction journal #%d', $journalId)); } } - app('preferences')->mark(); + Preferences::mark(); session()->flash('success', trans_choice('firefly.mass_deleted_transactions_success', $count)); // redirect to previous URL: @@ -177,7 +178,7 @@ class MassController extends Controller } } - app('preferences')->mark(); + Preferences::mark(); session()->flash('success', trans_choice('firefly.mass_edited_transactions_success', $count)); // redirect to previous URL: diff --git a/app/Http/Controllers/TransactionCurrency/EditController.php b/app/Http/Controllers/TransactionCurrency/EditController.php index 6bf640391d..b2e9a1ff86 100644 --- a/app/Http/Controllers/TransactionCurrency/EditController.php +++ b/app/Http/Controllers/TransactionCurrency/EditController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\TransactionCurrency; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\CurrencyFormRequest; @@ -128,7 +129,7 @@ class EditController extends Controller $currency = $this->repository->update($currency, $data); Log::channel('audit')->info('Updated (POST) currency.', $data); $request->session()->flash('success', (string) trans('firefly.updated_currency', ['name' => $currency->name])); - app('preferences')->mark(); + Preferences::mark(); if (1 === (int) $request->get('return_to_edit')) { $request->session()->put('currencies.edit.fromUpdate', true); diff --git a/app/Http/Controllers/TransactionCurrency/IndexController.php b/app/Http/Controllers/TransactionCurrency/IndexController.php index fbaabe16ab..f2c264fd6f 100644 --- a/app/Http/Controllers/TransactionCurrency/IndexController.php +++ b/app/Http/Controllers/TransactionCurrency/IndexController.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\TransactionCurrency; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; @@ -73,7 +74,7 @@ class IndexController extends Controller /** @var User $user */ $user = auth()->user(); $page = 0 === (int) $request->get('page') ? 1 : (int) $request->get('page'); - $pageSize = (int) app('preferences')->get('listPageSize', 50)->data; + $pageSize = (int) Preferences::get('listPageSize', 50)->data; $collection = $this->repository->getAll(); // order so default and enabled are on top: diff --git a/app/Http/Middleware/InterestingMessage.php b/app/Http/Middleware/InterestingMessage.php index 70ca9fb2bf..4c84751eaf 100644 --- a/app/Http/Middleware/InterestingMessage.php +++ b/app/Http/Middleware/InterestingMessage.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Middleware; +use FireflyIII\Support\Facades\Preferences; use Closure; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Account; @@ -54,27 +55,27 @@ class InterestingMessage } if ($this->groupMessage($request)) { - app('preferences')->mark(); + Preferences::mark(); $this->handleGroupMessage($request); } if ($this->userGroupMessage($request)) { - app('preferences')->mark(); + Preferences::mark(); $this->handleUserGroupMessage($request); } if ($this->accountMessage($request)) { - app('preferences')->mark(); + Preferences::mark(); $this->handleAccountMessage($request); } if ($this->billMessage($request)) { - app('preferences')->mark(); + Preferences::mark(); $this->handleBillMessage($request); } if ($this->webhookMessage($request)) { - app('preferences')->mark(); + Preferences::mark(); $this->handleWebhookMessage($request); } if ($this->currencyMessage($request)) { - app('preferences')->mark(); + Preferences::mark(); $this->handleCurrencyMessage($request); } diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index 3d604b4afe..10f859435d 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Middleware; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Navigation; use Carbon\Carbon; use Closure; @@ -70,7 +71,7 @@ class Range // ignore preference. set the range to be the current month: if (!app('session')->has('start') && !app('session')->has('end')) { Log::debug('setRange: Session has no start or end.'); - $viewRange = app('preferences')->get('viewRange', '1M')->data; + $viewRange = Preferences::get('viewRange', '1M')->data; if (is_array($viewRange)) { $viewRange = '1M'; } @@ -138,7 +139,7 @@ class Range */ private function configureList(): void { - $pref = app('preferences')->get('list-length', config('firefly.list_length', 10))->data; + $pref = Preferences::get('list-length', config('firefly.list_length', 10))->data; app('view')->share('listLength', $pref); // share security message: diff --git a/app/Jobs/CreateRecurringTransactions.php b/app/Jobs/CreateRecurringTransactions.php index 9bbafdf3e4..16a3f2c9c3 100644 --- a/app/Jobs/CreateRecurringTransactions.php +++ b/app/Jobs/CreateRecurringTransactions.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Jobs; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Events\RequestedReportOnJournals; use FireflyIII\Events\StoredTransactionGroup; @@ -132,7 +133,7 @@ class CreateRecurringTransactions implements ShouldQueue $this->groupRepository->setUser($recurrence->user); // clear cache for user - app('preferences')->setForUser($recurrence->user, 'lastActivity', microtime()); + Preferences::setForUser($recurrence->user, 'lastActivity', microtime()); Log::debug(sprintf('Now at recurrence #%d of user #%d', $recurrence->id, $recurrence->user_id)); $createdReps = $this->handleRepetitions($recurrence); @@ -150,7 +151,7 @@ class CreateRecurringTransactions implements ShouldQueue Log::debug('Done with handle()'); // clear cache: - app('preferences')->mark(); + Preferences::mark(); } private function filterRecurrences(Collection $recurrences): Collection @@ -414,6 +415,9 @@ class CreateRecurringTransactions implements ShouldQueue $transactions->first(); $return = []; + + + /** @var RecurrenceTransaction $transaction */ foreach ($transactions as $index => $transaction) { $single = [ diff --git a/app/Notifications/ReturnsAvailableChannels.php b/app/Notifications/ReturnsAvailableChannels.php index 523e95bbaa..0d4d5dd523 100644 --- a/app/Notifications/ReturnsAvailableChannels.php +++ b/app/Notifications/ReturnsAvailableChannels.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Notifications; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Notifications\UrlValidator; use FireflyIII\User; use Illuminate\Support\Facades\Log; @@ -94,7 +95,7 @@ class ReturnsAvailableChannels $channels = ['mail']; if (true === config('notifications.channels.slack.enabled', false)) { - $slackUrl = (string) app('preferences')->getEncryptedForUser($user, 'slack_webhook_url', '')->data; + $slackUrl = (string) Preferences::getEncryptedForUser($user, 'slack_webhook_url', '')->data; if (UrlValidator::isValidWebhookURL($slackUrl)) { $channels[] = 'slack'; } @@ -102,20 +103,20 @@ class ReturnsAvailableChannels // // validate presence of of Ntfy settings. // if (true === config('notifications.channels.nfy.enabled', false)) { - // $ntfyTopic = (string) app('preferences')->getEncryptedForUser($user, 'ntfy_topic', '')->data; + // $ntfyTopic = (string) \FireflyIII\Support\Facades\Preferences::getEncryptedForUser($user, 'ntfy_topic', '')->data; // if ('' !== $ntfyTopic) { // Log::debug(sprintf('Enabled ntfy, "%s"', $ntfyTopic)); // $channels[] = NtfyChannel::class; // } - // if ('' === (string) app('preferences')->getEncryptedForUser($user, 'ntfy_topic', '')->data) { + // if ('' === (string) \FireflyIII\Support\Facades\Preferences::getEncryptedForUser($user, 'ntfy_topic', '')->data) { // Log::warning('No topic name for Ntfy, channel is disabled.'); // } // } // pushover if (true === config('notifications.channels.slack.enabled', false)) { - $pushoverAppToken = (string) app('preferences')->getEncryptedForUser($user, 'pushover_app_token', '')->data; - $pushoverUserToken = (string) app('preferences')->getEncryptedForUser($user, 'pushover_user_token', '')->data; + $pushoverAppToken = (string) Preferences::getEncryptedForUser($user, 'pushover_app_token', '')->data; + $pushoverUserToken = (string) Preferences::getEncryptedForUser($user, 'pushover_user_token', '')->data; if ('' === $pushoverAppToken || '' === $pushoverUserToken) { Log::warning('[b] No Pushover token, channel is disabled.'); } diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index 9726e41297..468abca8ad 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Recurring; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Factory\RecurrenceFactory; @@ -436,7 +437,7 @@ class RecurringRepository implements RecurringRepositoryInterface, UserGroupInte Log::debug('Now in repetitionDescription()'); /** @var Preference $pref */ - $pref = app('preferences')->getForUser($this->user, 'language', config('firefly.default_language', 'en_US')); + $pref = Preferences::getForUser($this->user, 'language', config('firefly.default_language', 'en_US')); $language = $pref->data; if (is_array($language)) { $language = 'en_US'; diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index be9abaf4df..2069994bcf 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Repositories\User; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use Carbon\Carbon; use Exception; @@ -57,12 +58,12 @@ class UserRepository implements UserRepositoryInterface $oldEmail = $user->email; // save old email as pref - app('preferences')->setForUser($user, 'previous_email_latest', $oldEmail); - app('preferences')->setForUser($user, 'previous_email_'.Carbon::now()->format('Y-m-d-H-i-s'), $oldEmail); + Preferences::setForUser($user, 'previous_email_latest', $oldEmail); + Preferences::setForUser($user, 'previous_email_'.Carbon::now()->format('Y-m-d-H-i-s'), $oldEmail); // set undo and confirm token: - app('preferences')->setForUser($user, 'email_change_undo_token', bin2hex(random_bytes(16))); - app('preferences')->setForUser($user, 'email_change_confirm_token', bin2hex(random_bytes(16))); + Preferences::setForUser($user, 'email_change_undo_token', bin2hex(random_bytes(16))); + Preferences::setForUser($user, 'email_change_confirm_token', bin2hex(random_bytes(16))); // update user $user->email = $newEmail; @@ -367,8 +368,8 @@ class UserRepository implements UserRepositoryInterface $oldEmail = $user->email; // save old email as pref - app('preferences')->setForUser($user, 'admin_previous_email_latest', $oldEmail); - app('preferences')->setForUser($user, 'admin_previous_email_'.Carbon::now()->format('Y-m-d-H-i-s'), $oldEmail); + Preferences::setForUser($user, 'admin_previous_email_latest', $oldEmail); + Preferences::setForUser($user, 'admin_previous_email_'.Carbon::now()->format('Y-m-d-H-i-s'), $oldEmail); $user->email = $newEmail; $user->save(); diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index 245410d31f..166792d150 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\Support; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use Carbon\Carbon; use Deprecated; @@ -193,7 +194,7 @@ trait AccountServiceTrait protected function createOBGroup(Account $account, array $data): TransactionGroup { Log::debug('Now going to create an OB group.'); - $language = app('preferences')->getForUser($account->user, 'language', 'en_US')->data; + $language = Preferences::getForUser($account->user, 'language', 'en_US')->data; if (is_array($language)) { $language = 'en_US'; } @@ -425,7 +426,7 @@ trait AccountServiceTrait throw new FireflyException('Amount for new liability credit was unexpectedly 0.'); } - $language = app('preferences')->getForUser($account->user, 'language', 'en_US')->data; + $language = Preferences::getForUser($account->user, 'language', 'en_US')->data; if (is_array($language)) { $language = 'en_US'; } @@ -615,7 +616,7 @@ trait AccountServiceTrait protected function createOBGroupV2(Account $account, string $openingBalance, Carbon $openingBalanceDate): TransactionGroup { Log::debug('Now going to create an OB group.'); - $language = app('preferences')->getForUser($account->user, 'language', 'en_US')->data; + $language = Preferences::getForUser($account->user, 'language', 'en_US')->data; if (is_array($language)) { $language = 'en_US'; } diff --git a/app/Services/Internal/Update/AccountUpdateService.php b/app/Services/Internal/Update/AccountUpdateService.php index ea1b758124..44c3dfedab 100644 --- a/app/Services/Internal/Update/AccountUpdateService.php +++ b/app/Services/Internal/Update/AccountUpdateService.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\Update; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Events\UpdatedAccount; @@ -291,7 +292,7 @@ class AccountUpdateService if (true === $account->active) { return; } - $preference = app('preferences')->getForUser($account->user, 'frontpageAccounts'); + $preference = Preferences::getForUser($account->user, 'frontpageAccounts'); if (null === $preference) { return; } @@ -310,6 +311,6 @@ class AccountUpdateService } } Log::debug('Final new array is', $new); - app('preferences')->setForUser($account->user, 'frontpageAccounts', $new); + Preferences::setForUser($account->user, 'frontpageAccounts', $new); } } diff --git a/app/Services/Internal/Update/GroupUpdateService.php b/app/Services/Internal/Update/GroupUpdateService.php index 58c245d201..db983cff16 100644 --- a/app/Services/Internal/Update/GroupUpdateService.php +++ b/app/Services/Internal/Update/GroupUpdateService.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\Update; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Events\TriggeredAuditLog; use FireflyIII\Exceptions\DuplicateTransactionException; use FireflyIII\Exceptions\FireflyException; @@ -83,7 +84,7 @@ class GroupUpdateService $this->updateTransactionJournal($transactionGroup, $first, reset($transactions)); $transactionGroup->touch(); $transactionGroup->refresh(); - app('preferences')->mark(); + Preferences::mark(); return $transactionGroup; } @@ -98,7 +99,7 @@ class GroupUpdateService Log::error('There were no transactions updated or created. Will not delete anything.'); $transactionGroup->touch(); $transactionGroup->refresh(); - app('preferences')->mark(); + Preferences::mark(); return $transactionGroup; } @@ -116,7 +117,7 @@ class GroupUpdateService $service->destroy($journal); } - app('preferences')->mark(); + Preferences::mark(); $transactionGroup->touch(); $transactionGroup->refresh(); diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index 44278679bb..64a901690b 100644 --- a/app/Services/Internal/Update/JournalUpdateService.php +++ b/app/Services/Internal/Update/JournalUpdateService.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\Update; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use Carbon\Exceptions\InvalidDateException; use Carbon\Exceptions\InvalidFormatException; @@ -165,7 +166,7 @@ class JournalUpdateService $this->updateAmount(); $this->updateForeignAmount(); - app('preferences')->mark(); + Preferences::mark(); $this->transactionJournal->refresh(); Log::debug('Done with update journal routine'); diff --git a/app/Support/Binder/CLIToken.php b/app/Support/Binder/CLIToken.php index d09da8c0b1..14a5ae6172 100644 --- a/app/Support/Binder/CLIToken.php +++ b/app/Support/Binder/CLIToken.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Binder; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Routing\Route; @@ -46,7 +47,7 @@ class CLIToken implements BinderInterface } foreach ($users as $user) { - $accessToken = app('preferences')->getForUser($user, 'access_token'); + $accessToken = Preferences::getForUser($user, 'access_token'); if (null !== $accessToken && $accessToken->data === $value) { Log::info(sprintf('Recognized user #%d (%s) from his access token.', $user->id, $user->email)); diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.php index 5365656511..1414e07c91 100644 --- a/app/Support/CacheProperties.php +++ b/app/Support/CacheProperties.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Support; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Support\Facades\Steam; use Illuminate\Support\Collection; @@ -44,7 +45,7 @@ class CacheProperties $this->properties = new Collection(); if (auth()->check()) { $this->addProperty(auth()->user()->id); - $this->addProperty(app('preferences')->lastActivity()); + $this->addProperty(Preferences::lastActivity()); $this->addProperty(Steam::anonymous()); } } diff --git a/app/Support/Cronjobs/AutoBudgetCronjob.php b/app/Support/Cronjobs/AutoBudgetCronjob.php index e4e82d2376..c9722c87fd 100644 --- a/app/Support/Cronjobs/AutoBudgetCronjob.php +++ b/app/Support/Cronjobs/AutoBudgetCronjob.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Cronjobs; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Jobs\CreateAutoBudgetLimits; use FireflyIII\Models\Configuration; @@ -62,7 +63,7 @@ class AutoBudgetCronjob extends AbstractCronjob } $this->fireAutoBudget(); - app('preferences')->mark(); + Preferences::mark(); } private function fireAutoBudget(): void diff --git a/app/Support/Cronjobs/BillWarningCronjob.php b/app/Support/Cronjobs/BillWarningCronjob.php index a358d5879e..be6d9e2f0d 100644 --- a/app/Support/Cronjobs/BillWarningCronjob.php +++ b/app/Support/Cronjobs/BillWarningCronjob.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Cronjobs; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Jobs\WarnAboutBills; @@ -74,7 +75,7 @@ class BillWarningCronjob extends AbstractCronjob $this->fireWarnings(); - app('preferences')->mark(); + Preferences::mark(); } private function fireWarnings(): void diff --git a/app/Support/Cronjobs/ExchangeRatesCronjob.php b/app/Support/Cronjobs/ExchangeRatesCronjob.php index 889d6e57de..98af3966d5 100644 --- a/app/Support/Cronjobs/ExchangeRatesCronjob.php +++ b/app/Support/Cronjobs/ExchangeRatesCronjob.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Cronjobs; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Jobs\DownloadExchangeRates; use FireflyIII\Models\Configuration; @@ -63,7 +64,7 @@ class ExchangeRatesCronjob extends AbstractCronjob } $this->fireExchangeRateJob(); - app('preferences')->mark(); + Preferences::mark(); } private function fireExchangeRateJob(): void diff --git a/app/Support/Cronjobs/RecurringCronjob.php b/app/Support/Cronjobs/RecurringCronjob.php index 5f4e11a4c2..297bfa8d66 100644 --- a/app/Support/Cronjobs/RecurringCronjob.php +++ b/app/Support/Cronjobs/RecurringCronjob.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Cronjobs; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Jobs\CreateRecurringTransactions; @@ -73,7 +74,7 @@ class RecurringCronjob extends AbstractCronjob $this->fireRecurring(); - app('preferences')->mark(); + Preferences::mark(); } private function fireRecurring(): void diff --git a/app/Support/Cronjobs/WebhookCronjob.php b/app/Support/Cronjobs/WebhookCronjob.php index 84ea6676f5..d6c57123de 100644 --- a/app/Support/Cronjobs/WebhookCronjob.php +++ b/app/Support/Cronjobs/WebhookCronjob.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Cronjobs; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Events\RequestedSendWebhookMessages; use FireflyIII\Exceptions\FireflyException; @@ -74,7 +75,7 @@ class WebhookCronjob extends AbstractCronjob $this->fireWebhookmessages(); - app('preferences')->mark(); + Preferences::mark(); } private function fireWebhookmessages(): void diff --git a/app/Support/Http/Api/CollectsAccountsFromFilter.php b/app/Support/Http/Api/CollectsAccountsFromFilter.php index 2911ed61f6..3c17a34d80 100644 --- a/app/Support/Http/Api/CollectsAccountsFromFilter.php +++ b/app/Support/Http/Api/CollectsAccountsFromFilter.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Api; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Enums\AccountTypeEnum; use Illuminate\Support\Collection; @@ -53,7 +54,7 @@ trait CollectsAccountsFromFilter // if no preselected, but no accounts: if ('empty' === $queryParameters['preselected'] && 0 === $collection->count()) { $defaultSet = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value])->pluck('id')->toArray(); - $frontpage = app('preferences')->get('frontpageAccounts', $defaultSet); + $frontpage = Preferences::get('frontpageAccounts', $defaultSet); if (!(is_array($frontpage->data) && count($frontpage->data) > 0)) { $frontpage->data = $defaultSet; diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.php index 5b7be59977..1f4e42b0f7 100644 --- a/app/Support/Http/Controllers/RequestInformation.php +++ b/app/Support/Http/Controllers/RequestInformation.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Controllers; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Exceptions\ValidationException; use FireflyIII\Http\Requests\RuleFormRequest; @@ -110,7 +111,7 @@ trait RequestInformation $shownDemo = true; // both must be array and either must be > 0 if (count($intro) > 0 || count($specialIntro) > 0) { - $shownDemo = app('preferences')->get($key, false)->data; + $shownDemo = Preferences::get($key, false)->data; } if (!is_bool($shownDemo)) { return true; diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index ce78a979f1..016605a3eb 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Support; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\IntervalException; @@ -381,7 +382,7 @@ class Navigation */ public function getViewRange(bool $correct): string { - $range = app('preferences')->get('viewRange', '1M')->data ?? '1M'; + $range = Preferences::get('viewRange', '1M')->data ?? '1M'; if (is_array($range)) { $range = '1M'; } diff --git a/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php b/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php index e55405de9e..52479f2de0 100644 --- a/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php +++ b/app/Support/Observers/RecalculatesAvailableBudgetsTrait.php @@ -25,6 +25,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Observers; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; @@ -161,7 +162,7 @@ trait RecalculatesAvailableBudgetsTrait // either overlap multiple available budget periods or be contained in a single one. // all have to be created or updated. try { - $viewRange = app('preferences')->getForUser($user, 'viewRange', '1M')->data; + $viewRange = Preferences::getForUser($user, 'viewRange', '1M')->data; } catch (ContainerExceptionInterface|NotFoundExceptionInterface $e) { Log::error($e->getMessage()); $viewRange = '1M'; diff --git a/app/Support/Search/OperatorQuerySearch.php b/app/Support/Search/OperatorQuerySearch.php index a8b8b6b961..38133e1daf 100644 --- a/app/Support/Search/OperatorQuerySearch.php +++ b/app/Support/Search/OperatorQuerySearch.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Search; +use FireflyIII\Support\Facades\Preferences; use Carbon\Carbon; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Enums\SearchDirection; @@ -238,7 +239,7 @@ class OperatorQuerySearch implements SearchInterface $this->collector->setUser($user); $this->collector->withAccountInformation()->withCategoryInformation()->withBudgetInformation(); - $this->setLimit((int)app('preferences')->getForUser($user, 'listPageSize', 50)->data); + $this->setLimit((int)Preferences::getForUser($user, 'listPageSize', 50)->data); } private function findCurrency(string $value): ?TransactionCurrency diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 45b3595a40..939a9069b4 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Support; +use FireflyIII\Support\Facades\Preferences; use Deprecated; use Carbon\Carbon; use Exception; @@ -573,7 +574,7 @@ class Steam */ public function getLanguage(): string // get preference { - $preference = app('preferences')->get('language', config('firefly.default_language', 'en_US'))->data; + $preference = Preferences::get('language', config('firefly.default_language', 'en_US'))->data; if (!is_string($preference)) { throw new FireflyException(sprintf('Preference "language" must be a string, but is unexpectedly a "%s".', gettype($preference))); } @@ -611,7 +612,7 @@ class Steam if (null !== $cached) { return $cached; } - $locale = app('preferences')->get('locale', config('firefly.default_locale', 'equal'))->data; + $locale = Preferences::get('locale', config('firefly.default_locale', 'equal'))->data; if (is_array($locale)) { $locale = 'equal'; } @@ -636,7 +637,7 @@ class Steam if (null !== $cached) { return $cached; } - $anonymous = app('preferences')->get('anonymous', config('firefly.default_preferences.anonymous', false))->data; + $anonymous = Preferences::get('anonymous', config('firefly.default_preferences.anonymous', false))->data; $singleton->setPreference('anonymous', $anonymous); return $anonymous; diff --git a/app/User.php b/app/User.php index 82c3f99bf5..d97b9a767b 100644 --- a/app/User.php +++ b/app/User.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Support\Facades\Log; use Deprecated; use Exception; @@ -357,7 +358,7 @@ class User extends Authenticatable } $email = $this->email; // see if user has alternative email address: - $pref = app('preferences')->getForUser($this, 'remote_guard_alt_email'); + $pref = Preferences::getForUser($this, 'remote_guard_alt_email'); if (null !== $pref) { $email = $pref->data; } @@ -390,8 +391,8 @@ class User extends Authenticatable public function routeNotificationForPushover(): PushoverReceiver { - $appToken = (string) app('preferences')->getEncrypted('pushover_app_token', '')->data; - $userToken = (string) app('preferences')->getEncrypted('pushover_user_token', '')->data; + $appToken = (string) Preferences::getEncrypted('pushover_app_token', '')->data; + $userToken = (string) Preferences::getEncrypted('pushover_user_token', '')->data; return PushoverReceiver::withUserKey($userToken)->withApplicationToken($appToken); } @@ -419,7 +420,7 @@ class User extends Authenticatable if ($notification instanceof VersionCheckResult) { return $res; } - $pref = app('preferences')->getEncryptedForUser($this, 'slack_webhook_url', '')->data; + $pref = Preferences::getEncryptedForUser($this, 'slack_webhook_url', '')->data; if (is_array($pref)) { return ''; } diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index c613f0064f..37ff7a4f81 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Validation; +use FireflyIII\Support\Facades\Preferences; use Config; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Exceptions\FireflyException; @@ -84,7 +85,7 @@ class FireflyValidator extends Validator return false; } - $secretPreference = app('preferences')->get('temp-mfa-secret'); + $secretPreference = Preferences::get('temp-mfa-secret'); $secret = $secretPreference->data ?? ''; if (is_array($secret)) { $secret = '';