diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index 4603e9497d..c9169673b5 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -29,6 +29,7 @@ use Carbon\Exceptions\InvalidFormatException; use FireflyIII\Exceptions\BadHttpHeaderException; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Support\Facades\Amount; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Steam; use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait; use FireflyIII\Transformers\AbstractTransformer; @@ -159,7 +160,7 @@ abstract class Controller extends BaseController /** @var User $user */ $user = auth()->user(); - $pageSize = (int)app('preferences')->getForUser($user, 'listPageSize', 50)->data; + $pageSize = (int)Preferences::getForUser($user, 'listPageSize', 50)->data; $bag->set($integer, $pageSize); } } diff --git a/app/Api/V1/Controllers/Data/DestroyController.php b/app/Api/V1/Controllers/Data/DestroyController.php index 87e791be7c..86180cf44c 100644 --- a/app/Api/V1/Controllers/Data/DestroyController.php +++ b/app/Api/V1/Controllers/Data/DestroyController.php @@ -46,6 +46,7 @@ use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Services\Internal\Destroy\AccountDestroyService; use FireflyIII\Services\Internal\Destroy\JournalDestroyService; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Log; @@ -102,7 +103,7 @@ class DestroyController extends Controller default => throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects)), }; - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/Account/DestroyController.php b/app/Api/V1/Controllers/Models/Account/DestroyController.php index fc23429f76..d772b44557 100644 --- a/app/Api/V1/Controllers/Models/Account/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Account/DestroyController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\Account; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Http\JsonResponse; /** @@ -60,7 +61,7 @@ class DestroyController extends Controller public function destroy(Account $account): JsonResponse { $this->repository->destroy($account, null); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/Account/UpdateController.php b/app/Api/V1/Controllers/Models/Account/UpdateController.php index 5118b1116d..5ae8f5b45d 100644 --- a/app/Api/V1/Controllers/Models/Account/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Account/UpdateController.php @@ -28,6 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Models\Account\UpdateRequest; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\JsonApi\Enrichments\AccountEnrichment; use FireflyIII\Transformers\AccountTransformer; use FireflyIII\User; @@ -74,7 +75,7 @@ class UpdateController extends Controller $account = $this->repository->update($account, $data); $manager = $this->getManager(); $account->refresh(); - app('preferences')->mark(); + Preferences::mark(); // enrich /** @var User $admin */ diff --git a/app/Api/V1/Controllers/Models/Attachment/DestroyController.php b/app/Api/V1/Controllers/Models/Attachment/DestroyController.php index c7ee0d20e5..09cfbe1557 100644 --- a/app/Api/V1/Controllers/Models/Attachment/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Attachment/DestroyController.php @@ -28,6 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Middleware\ApiDemoUser; use FireflyIII\Models\Attachment; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Log; @@ -74,7 +75,7 @@ class DestroyController extends Controller } $this->repository->destroy($attachment); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/Bill/DestroyController.php b/app/Api/V1/Controllers/Models/Bill/DestroyController.php index d62697d950..a709c73ec2 100644 --- a/app/Api/V1/Controllers/Models/Bill/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Bill/DestroyController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\Bill; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Models\Bill; use FireflyIII\Repositories\Bill\BillRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Http\JsonResponse; /** @@ -61,7 +62,7 @@ class DestroyController extends Controller public function destroy(Bill $bill): JsonResponse { $this->repository->destroy($bill); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/Budget/DestroyController.php b/app/Api/V1/Controllers/Models/Budget/DestroyController.php index 93e2f738ec..05ee1da9e8 100644 --- a/app/Api/V1/Controllers/Models/Budget/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Budget/DestroyController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\Budget; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Models\Budget; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Http\JsonResponse; /** @@ -61,7 +62,7 @@ class DestroyController extends Controller public function destroy(Budget $budget): JsonResponse { $this->repository->destroy($budget); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php b/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php index 7c037dafd1..af96515cfb 100644 --- a/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php +++ b/app/Api/V1/Controllers/Models/BudgetLimit/DestroyController.php @@ -29,6 +29,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Http\JsonResponse; @@ -71,7 +72,7 @@ class DestroyController extends Controller throw new FireflyException('20028: The budget limit does not belong to the budget.'); } $this->blRepository->destroyBudgetLimit($budgetLimit); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/Category/DestroyController.php b/app/Api/V1/Controllers/Models/Category/DestroyController.php index 29c58b2015..7d7295596f 100644 --- a/app/Api/V1/Controllers/Models/Category/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Category/DestroyController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\Category; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Http\JsonResponse; /** @@ -61,7 +62,7 @@ class DestroyController extends Controller public function destroy(Category $category): JsonResponse { $this->repository->destroy($category); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php b/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php index 02c229057a..097abb404b 100644 --- a/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php +++ b/app/Api/V1/Controllers/Models/ObjectGroup/DestroyController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Models\ObjectGroup; use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Http\JsonResponse; @@ -64,7 +65,7 @@ class DestroyController extends Controller public function destroy(ObjectGroup $objectGroup): JsonResponse { $this->repository->destroy($objectGroup); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php b/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php index 5b5736e767..ce77892d37 100644 --- a/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php +++ b/app/Api/V1/Controllers/Models/PiggyBank/DestroyController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Models\PiggyBank; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Http\JsonResponse; /** @@ -61,7 +62,7 @@ class DestroyController extends Controller public function destroy(PiggyBank $piggyBank): JsonResponse { $this->repository->destroy($piggyBank); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php b/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php index fa67c50147..8d596798d9 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/DestroyController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\Recurrence; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Models\Recurrence; use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Http\JsonResponse; /** @@ -61,7 +62,7 @@ class DestroyController extends Controller public function destroy(Recurrence $recurrence): JsonResponse { $this->repository->destroy($recurrence); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/Rule/DestroyController.php b/app/Api/V1/Controllers/Models/Rule/DestroyController.php index 2144a5e34f..e8a9dbd124 100644 --- a/app/Api/V1/Controllers/Models/Rule/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Rule/DestroyController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\Rule; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Models\Rule; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Http\JsonResponse; @@ -65,7 +66,7 @@ class DestroyController extends Controller public function destroy(Rule $rule): JsonResponse { $this->ruleRepository->destroy($rule); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php b/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php index e5ac3ccf71..9924ba1c75 100644 --- a/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php +++ b/app/Api/V1/Controllers/Models/RuleGroup/DestroyController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Models\RuleGroup; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Http\JsonResponse; @@ -65,7 +66,7 @@ class DestroyController extends Controller public function destroy(RuleGroup $ruleGroup): JsonResponse { $this->ruleGroupRepository->destroy($ruleGroup, null); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/Tag/DestroyController.php b/app/Api/V1/Controllers/Models/Tag/DestroyController.php index 2f46224b32..fa6a31071a 100644 --- a/app/Api/V1/Controllers/Models/Tag/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Tag/DestroyController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\Tag; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Models\Tag; use FireflyIII\Repositories\Tag\TagRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Http\JsonResponse; @@ -65,7 +66,7 @@ class DestroyController extends Controller public function destroy(Tag $tag): JsonResponse { $this->repository->destroy($tag); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php index f77339b188..ecf6a28432 100644 --- a/app/Api/V1/Controllers/Models/Transaction/DestroyController.php +++ b/app/Api/V1/Controllers/Models/Transaction/DestroyController.php @@ -32,6 +32,7 @@ use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepository; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Log; @@ -92,7 +93,7 @@ class DestroyController extends Controller $this->groupRepository->destroy($transactionGroup); - app('preferences')->mark(); + Preferences::mark(); /** @var Account $account */ foreach ($accounts as $account) { @@ -112,7 +113,7 @@ class DestroyController extends Controller public function destroyJournal(TransactionJournal $transactionJournal): JsonResponse { $this->repository->destroyJournal($transactionJournal); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/Transaction/StoreController.php b/app/Api/V1/Controllers/Models/Transaction/StoreController.php index 37acce2eb6..6a7e603d5d 100644 --- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php +++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php @@ -33,6 +33,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; use FireflyIII\Rules\IsDuplicateTransaction; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Http\Api\TransactionFilter; use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment; use FireflyIII\Transformers\TransactionGroupTransformer; @@ -107,7 +108,7 @@ class StoreController extends Controller throw new ValidationException($validator); } - app('preferences')->mark(); + Preferences::mark(); $applyRules = $data['apply_rules'] ?? true; $fireWebhooks = $data['fire_webhooks'] ?? true; event(new StoredTransactionGroup($transactionGroup, $applyRules, $fireWebhooks)); diff --git a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php index 6db7503671..02fbb9b023 100644 --- a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php @@ -30,6 +30,7 @@ use FireflyIII\Events\UpdatedTransactionGroup; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionGroup; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\JsonApi\Enrichments\TransactionGroupEnrichment; use FireflyIII\Transformers\TransactionGroupTransformer; use FireflyIII\User; @@ -79,7 +80,7 @@ class UpdateController extends Controller $newHash = $this->groupRepository->getCompareHash($transactionGroup); $manager = $this->getManager(); - app('preferences')->mark(); + Preferences::mark(); $applyRules = $data['apply_rules'] ?? true; $fireWebhooks = $data['fire_webhooks'] ?? true; $runRecalculations = $oldHash !== $newHash; diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php index b4aca8b763..a40d05dd2f 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php @@ -29,6 +29,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Validator; @@ -89,7 +90,7 @@ class DestroyController extends Controller } $this->repository->destroy($currency); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php index 56b61b9c99..b225556b54 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/StoreController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\StoreRequest; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Http\Api\AccountFilter; use FireflyIII\Support\Http\Api\TransactionFilter; use FireflyIII\Transformers\CurrencyTransformer; @@ -71,7 +72,7 @@ class StoreController extends Controller $currency = $this->repository->store($request->getAll()); if (true === $request->boolean('default')) { $this->repository->makePrimary($currency); - app('preferences')->mark(); + Preferences::mark(); } $manager = $this->getManager(); diff --git a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php index f76bfaf8a2..ca8b3f14da 100644 --- a/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php +++ b/app/Api/V1/Controllers/Models/TransactionCurrency/UpdateController.php @@ -29,6 +29,7 @@ use FireflyIII\Api\V1\Requests\Models\TransactionCurrency\UpdateRequest; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Http\Api\AccountFilter; use FireflyIII\Support\Http\Api\TransactionFilter; use FireflyIII\Transformers\CurrencyTransformer; @@ -105,7 +106,7 @@ class UpdateController extends Controller $this->repository->enable($currency); $this->repository->makePrimary($currency); - app('preferences')->mark(); + Preferences::mark(); $manager = $this->getManager(); $currency->refreshForUser($user); @@ -172,14 +173,13 @@ class UpdateController extends Controller $currency = $this->repository->update($currency, $data); - app('preferences')->mark(); + Preferences::mark(); $manager = $this->getManager(); $currency->refreshForUser($user); /** @var CurrencyTransformer $transformer */ $transformer = app(CurrencyTransformer::class); - $transformer->setParameters($this->parameters); $resource = new Item($currency, $transformer, 'currencies'); diff --git a/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php index e5c0b5ff46..25c2b85008 100644 --- a/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php +++ b/app/Api/V1/Controllers/Models/TransactionLink/DestroyController.php @@ -27,6 +27,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionLink; use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Models\TransactionJournalLink; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Http\JsonResponse; @@ -66,7 +67,7 @@ class DestroyController extends Controller public function destroy(TransactionJournalLink $link): JsonResponse { $this->repository->destroyLink($link); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php b/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php index 7abbff55d7..df18a2ba62 100644 --- a/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php +++ b/app/Api/V1/Controllers/Models/TransactionLinkType/DestroyController.php @@ -28,6 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\LinkType; use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Http\Api\TransactionFilter; use FireflyIII\User; use Illuminate\Http\JsonResponse; @@ -73,7 +74,7 @@ class DestroyController extends Controller throw new FireflyException('200020: Link type cannot be changed.'); } $this->repository->destroy($linkType); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Api/V1/Controllers/Models/UserGroup/UpdateController.php b/app/Api/V1/Controllers/Models/UserGroup/UpdateController.php index e1a9e517e5..f118a5a960 100644 --- a/app/Api/V1/Controllers/Models/UserGroup/UpdateController.php +++ b/app/Api/V1/Controllers/Models/UserGroup/UpdateController.php @@ -28,6 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller; use FireflyIII\Api\V1\Requests\Models\UserGroup\UpdateRequest; use FireflyIII\Models\UserGroup; use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Transformers\UserGroupTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Log; @@ -59,7 +60,7 @@ class UpdateController extends Controller $data = $request->getData(); $userGroup = $this->repository->update($userGroup, $data); $userGroup->refresh(); - app('preferences')->mark(); + Preferences::mark(); $transformer = new UserGroupTransformer(); $transformer->setParameters($this->parameters); diff --git a/app/Api/V1/Controllers/User/PreferencesController.php b/app/Api/V1/Controllers/User/PreferencesController.php index e5a97f7628..9c0be7163e 100644 --- a/app/Api/V1/Controllers/User/PreferencesController.php +++ b/app/Api/V1/Controllers/User/PreferencesController.php @@ -29,6 +29,7 @@ use FireflyIII\Api\V1\Requests\User\PreferenceStoreRequest; use FireflyIII\Api\V1\Requests\User\PreferenceUpdateRequest; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Preference; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Transformers\PreferenceTransformer; use Illuminate\Http\JsonResponse; use Illuminate\Pagination\LengthAwarePaginator; @@ -52,7 +53,7 @@ class PreferencesController extends Controller */ public function index(): JsonResponse { - $collection = app('preferences')->all(); + $collection = Preferences::all(); $manager = $this->getManager(); $count = $collection->count(); $pageSize = $this->parameters->get('limit'); @@ -110,7 +111,7 @@ class PreferencesController extends Controller throw new FireflyException('Please use api/v1/currencies/default instead.'); } - $pref = app('preferences')->set($data['name'], $data['data']); + $pref = Preferences::set($data['name'], $data['data']); /** @var PreferenceTransformer $transformer */ $transformer = app(PreferenceTransformer::class); @@ -135,7 +136,7 @@ class PreferencesController extends Controller $manager = $this->getManager(); $data = $request->getAll(); - $pref = app('preferences')->set($preference->name, $data['data']); + $pref = Preferences::set($preference->name, $data['data']); /** @var PreferenceTransformer $transformer */ $transformer = app(PreferenceTransformer::class); diff --git a/app/Api/V1/Controllers/Webhook/DestroyController.php b/app/Api/V1/Controllers/Webhook/DestroyController.php index 4899c7be20..98ee5f0586 100644 --- a/app/Api/V1/Controllers/Webhook/DestroyController.php +++ b/app/Api/V1/Controllers/Webhook/DestroyController.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Webhook; use FireflyIII\Models\WebhookAttempt; use FireflyIII\Models\WebhookMessage; use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use Illuminate\Http\JsonResponse; use Illuminate\Support\Facades\Log; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -70,7 +71,7 @@ class DestroyController extends Controller Log::channel('audit')->info(sprintf('User destroys webhook #%d.', $webhook->id)); $this->repository->destroy($webhook); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } @@ -101,7 +102,7 @@ class DestroyController extends Controller Log::channel('audit')->info(sprintf('User destroys webhook #%d, message #%d, attempt #%d.', $webhook->id, $message->id, $attempt->id)); $this->repository->destroyAttempt($attempt); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } @@ -128,7 +129,7 @@ class DestroyController extends Controller Log::channel('audit')->info(sprintf('User destroys webhook #%d, message #%d.', $webhook->id, $message->id)); $this->repository->destroyMessage($message); - app('preferences')->mark(); + Preferences::mark(); return response()->json([], 204); } diff --git a/app/Console/Commands/Correction/CorrectsFrontpageAccounts.php b/app/Console/Commands/Correction/CorrectsFrontpageAccounts.php index 11a2926f6e..ab2b522115 100644 --- a/app/Console/Commands/Correction/CorrectsFrontpageAccounts.php +++ b/app/Console/Commands/Correction/CorrectsFrontpageAccounts.php @@ -28,6 +28,7 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Models\Preference; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Console\Command; @@ -47,7 +48,7 @@ class CorrectsFrontpageAccounts extends Command /** @var User $user */ foreach ($users as $user) { - $preference = app('preferences')->getForUser($user, 'frontpageAccounts'); + $preference = Preferences::getForUser($user, 'frontpageAccounts'); if (null !== $preference) { $this->fixPreference($preference); } @@ -79,6 +80,6 @@ class CorrectsFrontpageAccounts extends Command } } } - app('preferences')->setForUser($preference->user, 'frontpageAccounts', $fixed); + Preferences::setForUser($preference->user, 'frontpageAccounts', $fixed); } } diff --git a/app/Console/Commands/Correction/CreatesAccessTokens.php b/app/Console/Commands/Correction/CreatesAccessTokens.php index 92603c83a6..ef478d8da2 100644 --- a/app/Console/Commands/Correction/CreatesAccessTokens.php +++ b/app/Console/Commands/Correction/CreatesAccessTokens.php @@ -27,6 +27,7 @@ namespace FireflyIII\Console\Commands\Correction; use Exception; use FireflyIII\Console\Commands\ShowsFriendlyMessages; use FireflyIII\Repositories\User\UserRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Console\Command; @@ -54,10 +55,10 @@ class CreatesAccessTokens extends Command /** @var User $user */ foreach ($users as $user) { - $pref = app('preferences')->getForUser($user, 'access_token'); + $pref = Preferences::getForUser($user, 'access_token'); if (null === $pref) { $token = $user->generateAccessToken(); - app('preferences')->setForUser($user, 'access_token', $token); + Preferences::setForUser($user, 'access_token', $token); $this->friendlyInfo(sprintf('Generated access token for user %s', $user->email)); ++$count; } diff --git a/app/Console/Commands/Upgrade/UpgradesBillsToRules.php b/app/Console/Commands/Upgrade/UpgradesBillsToRules.php index a244f74738..7575dc31e3 100644 --- a/app/Console/Commands/Upgrade/UpgradesBillsToRules.php +++ b/app/Console/Commands/Upgrade/UpgradesBillsToRules.php @@ -33,6 +33,7 @@ use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Console\Command; @@ -114,7 +115,7 @@ class UpgradesBillsToRules extends Command $this->ruleRepository->setUser($user); /** @var Preference $lang */ - $lang = app('preferences')->getForUser($user, 'language', 'en_US'); + $lang = Preferences::getForUser($user, 'language', 'en_US'); $language = null !== $lang->data && !is_array($lang->data) ? (string) $lang->data : 'en_US'; $groupTitle = (string) trans('firefly.rulegroup_for_bills_title', [], $language); $ruleGroup = $this->ruleGroupRepository->findByTitle($groupTitle); diff --git a/app/Console/Commands/VerifiesAccessToken.php b/app/Console/Commands/VerifiesAccessToken.php index 906980df68..3726eb6a36 100644 --- a/app/Console/Commands/VerifiesAccessToken.php +++ b/app/Console/Commands/VerifiesAccessToken.php @@ -26,6 +26,7 @@ namespace FireflyIII\Console\Commands; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Repositories\User\UserRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Support\Facades\Log; @@ -79,7 +80,7 @@ trait VerifiesAccessToken return false; } - $accessToken = app('preferences')->getForUser($user, 'access_token'); + $accessToken = Preferences::getForUser($user, 'access_token'); if (null === $accessToken) { Log::error(sprintf('User #%d has no access token, so cannot access command line options.', $userId)); diff --git a/app/Handlers/Events/AutomationHandler.php b/app/Handlers/Events/AutomationHandler.php index 7a59a78a10..9d60e4dc5b 100644 --- a/app/Handlers/Events/AutomationHandler.php +++ b/app/Handlers/Events/AutomationHandler.php @@ -30,6 +30,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\TransactionGroup; use FireflyIII\Notifications\User\TransactionCreation; use FireflyIII\Repositories\User\UserRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\Transformers\TransactionGroupTransformer; use Illuminate\Support\Facades\Notification; @@ -52,7 +53,7 @@ class AutomationHandler $user = $repository->find($event->userId); /** @var bool $sendReport */ - $sendReport = app('preferences')->getForUser($user, 'notification_transaction_creation', false)->data; + $sendReport = Preferences::getForUser($user, 'notification_transaction_creation', false)->data; if (false === $sendReport) { app('log')->debug('Not sending report, because config says so.'); diff --git a/app/Handlers/Events/Model/RuleHandler.php b/app/Handlers/Events/Model/RuleHandler.php index ea3bb107c8..9655368b52 100644 --- a/app/Handlers/Events/Model/RuleHandler.php +++ b/app/Handlers/Events/Model/RuleHandler.php @@ -27,6 +27,7 @@ namespace FireflyIII\Handlers\Events\Model; use FireflyIII\Events\Model\Rule\RuleActionFailedOnArray; use FireflyIII\Events\Model\Rule\RuleActionFailedOnObject; use FireflyIII\Notifications\User\RuleActionFailed; +use FireflyIII\Support\Facades\Preferences; use GuzzleHttp\Exception\ClientException; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Notification; @@ -42,7 +43,7 @@ class RuleHandler $rule = $ruleAction->rule; /** @var bool $preference */ - $preference = app('preferences')->getForUser($rule->user, 'notification_rule_action_failures', true)->data; + $preference = Preferences::getForUser($rule->user, 'notification_rule_action_failures', true)->data; if (false === $preference) { return; } @@ -71,7 +72,7 @@ class RuleHandler $rule = $ruleAction->rule; /** @var bool $preference */ - $preference = app('preferences')->getForUser($rule->user, 'notification_rule_action_failures', true)->data; + $preference = Preferences::getForUser($rule->user, 'notification_rule_action_failures', true)->data; if (false === $preference) { return; } diff --git a/app/Handlers/Events/UserEventHandler.php b/app/Handlers/Events/UserEventHandler.php index db1fdd4134..1971dd0ade 100644 --- a/app/Handlers/Events/UserEventHandler.php +++ b/app/Handlers/Events/UserEventHandler.php @@ -51,6 +51,7 @@ use FireflyIII\Notifications\User\UserLogin; use FireflyIII\Notifications\User\UserNewPassword; use FireflyIII\Notifications\User\UserRegistration as UserRegistrationNotification; use FireflyIII\Repositories\User\UserRepositoryInterface; +use FireflyIII\Support\Facades\Preferences; use FireflyIII\User; use Illuminate\Auth\Events\Login; use Illuminate\Support\Facades\Log; @@ -174,9 +175,9 @@ class UserEventHandler $user = $event->user; if ($repository->hasRole($user, 'demo')) { // set user back to English. - app('preferences')->setForUser($user, 'language', 'en_US'); - app('preferences')->setForUser($user, 'locale', 'equal'); - app('preferences')->mark(); + Preferences::setForUser($user, 'language', 'en_US'); + Preferences::setForUser($user, 'locale', 'equal'); + Preferences::mark(); } } @@ -188,7 +189,7 @@ class UserEventHandler return; // do not email demo user. } - $list = app('preferences')->getForUser($user, 'login_ip_history', [])->data; + $list = Preferences::getForUser($user, 'login_ip_history', [])->data; if (!is_array($list)) { $list = []; } @@ -217,7 +218,7 @@ class UserEventHandler $list[$index]['notified'] = true; } - app('preferences')->setForUser($user, 'login_ip_history', $list); + Preferences::setForUser($user, 'login_ip_history', $list); } public function sendAdminRegistrationNotification(RegisteredUser $event): void @@ -257,7 +258,7 @@ class UserEventHandler $newEmail = $event->newEmail; $oldEmail = $event->oldEmail; $user = $event->user; - $token = app('preferences')->getForUser($user, 'email_change_confirm_token', 'invalid'); + $token = Preferences::getForUser($user, 'email_change_confirm_token', 'invalid'); $url = route('profile.confirm-email-change', [$token->data]); try { @@ -281,7 +282,7 @@ class UserEventHandler $newEmail = $event->newEmail; $oldEmail = $event->oldEmail; $user = $event->user; - $token = app('preferences')->getForUser($user, 'email_change_undo_token', 'invalid'); + $token = Preferences::getForUser($user, 'email_change_undo_token', 'invalid'); $hashed = hash('sha256', sprintf('%s%s', (string) config('app.key'), $oldEmail)); $url = route('profile.undo-email-change', [$token->data, $hashed]); @@ -455,7 +456,7 @@ class UserEventHandler try { /** @var array $preference */ - $preference = app('preferences')->getForUser($user, 'login_ip_history', [])->data; + $preference = Preferences::getForUser($user, 'login_ip_history', [])->data; } catch (FireflyException $e) { // don't care. app('log')->error($e->getMessage()); @@ -491,8 +492,8 @@ class UserEventHandler $preference = array_values($preference); /** @var bool $send */ - $send = app('preferences')->getForUser($user, 'notification_user_login', true)->data; - app('preferences')->setForUser($user, 'login_ip_history', $preference); + $send = Preferences::getForUser($user, 'notification_user_login', true)->data; + Preferences::setForUser($user, 'login_ip_history', $preference); if (false === $inArray && true === $send) { event(new DetectedNewIPAddress($user)); diff --git a/app/Helpers/Fiscal/FiscalHelper.php b/app/Helpers/Fiscal/FiscalHelper.php index 53aad1fef3..c9450d597e 100644 --- a/app/Helpers/Fiscal/FiscalHelper.php +++ b/app/Helpers/Fiscal/FiscalHelper.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Helpers\Fiscal; use Carbon\Carbon; +use FireflyIII\Support\Facades\Preferences; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; @@ -40,7 +41,7 @@ class FiscalHelper implements FiscalHelperInterface */ public function __construct() { - $this->useCustomFiscalYear = (bool) app('preferences')->get('customFiscalYear', false)->data; + $this->useCustomFiscalYear = (bool) Preferences::get('customFiscalYear', false)->data; } /** @@ -74,7 +75,7 @@ class FiscalHelper implements FiscalHelperInterface // get start mm-dd. Then create a start date in the year passed. $startDate = clone $date; if (true === $this->useCustomFiscalYear) { - $prefStartStr = app('preferences')->get('fiscalYearStart', '01-01')->data; + $prefStartStr = Preferences::get('fiscalYearStart', '01-01')->data; if (is_array($prefStartStr)) { $prefStartStr = '01-01'; } diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php index 42ad889244..6420ac67fd 100644 --- a/app/Jobs/MailError.php +++ b/app/Jobs/MailError.php @@ -56,7 +56,7 @@ class MailError extends Job implements ShouldQueue $debug = $this->exception; unset($debug['stackTrace'], $debug['headers']); - app('log')->error(sprintf('Exception is: %s', json_encode($debug))); + Log::error(sprintf('Exception is: %s', json_encode($debug))); } /** @@ -92,17 +92,17 @@ class MailError extends Job implements ShouldQueue } catch (Exception|TransportException $e) { $message = $e->getMessage(); if (str_contains($message, 'Bcc')) { - app('log')->warning('[Bcc] Could not email or log the error. Please validate your email settings, use the .env.example file as a guide.'); + Log::warning('[Bcc] Could not email or log the error. Please validate your email settings, use the .env.example file as a guide.'); return; } if (str_contains($message, 'RFC 2822')) { - app('log')->warning('[RFC] Could not email or log the error. Please validate your email settings, use the .env.example file as a guide.'); + Log::warning('[RFC] Could not email or log the error. Please validate your email settings, use the .env.example file as a guide.'); return; } - app('log')->error($e->getMessage()); - app('log')->error($e->getTraceAsString()); + Log::error($e->getMessage()); + Log::error($e->getTraceAsString()); } } }