From 1b06211152fb3c26f8fbaa53fe477e13eda7c26b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2023 08:43:28 +0100 Subject: [PATCH] Add different setUser call. --- .../Controllers/Autocomplete/RecurrenceController.php | 1 + app/Repositories/Account/AccountRepository.php | 9 ++++++--- .../Account/AccountRepositoryInterface.php | 5 +++-- app/Repositories/Account/AccountTasker.php | 9 ++++++--- app/Repositories/Account/AccountTaskerInterface.php | 5 +++-- app/Repositories/Account/OperationsRepository.php | 9 ++++++--- .../Account/OperationsRepositoryInterface.php | 5 +++-- app/Repositories/Attachment/AttachmentRepository.php | 9 ++++++--- .../Attachment/AttachmentRepositoryInterface.php | 5 +++-- app/Repositories/Bill/BillRepository.php | 9 ++++++--- app/Repositories/Bill/BillRepositoryInterface.php | 5 +++-- app/Repositories/Budget/AvailableBudgetRepository.php | 9 ++++++--- .../Budget/AvailableBudgetRepositoryInterface.php | 5 +++-- app/Repositories/Budget/BudgetLimitRepository.php | 9 ++++++--- .../Budget/BudgetLimitRepositoryInterface.php | 5 +++-- app/Repositories/Budget/BudgetRepository.php | 9 ++++++--- app/Repositories/Budget/BudgetRepositoryInterface.php | 5 +++-- app/Repositories/Budget/NoBudgetRepository.php | 9 ++++++--- .../Budget/NoBudgetRepositoryInterface.php | 5 +++-- app/Repositories/Budget/OperationsRepository.php | 9 ++++++--- .../Budget/OperationsRepositoryInterface.php | 5 +++-- app/Repositories/Category/CategoryRepository.php | 10 ++++++---- .../Category/CategoryRepositoryInterface.php | 5 +++-- app/Repositories/Category/NoCategoryRepository.php | 9 ++++++--- .../Category/NoCategoryRepositoryInterface.php | 5 +++-- app/Repositories/Category/OperationsRepository.php | 9 ++++++--- .../Category/OperationsRepositoryInterface.php | 5 +++-- app/Repositories/Currency/CurrencyRepository.php | 9 ++++++--- .../Currency/CurrencyRepositoryInterface.php | 5 +++-- app/Repositories/Journal/JournalAPIRepository.php | 9 ++++++--- .../Journal/JournalAPIRepositoryInterface.php | 5 +++-- app/Repositories/Journal/JournalCLIRepository.php | 7 ++++--- .../Journal/JournalCLIRepositoryInterface.php | 5 +++-- app/Repositories/Journal/JournalRepository.php | 9 ++++++--- .../Journal/JournalRepositoryInterface.php | 5 +++-- app/Repositories/LinkType/LinkTypeRepository.php | 9 ++++++--- .../LinkType/LinkTypeRepositoryInterface.php | 7 +++---- .../ObjectGroup/ObjectGroupRepository.php | 9 ++++++--- .../ObjectGroup/ObjectGroupRepositoryInterface.php | 5 +++-- app/Repositories/PiggyBank/PiggyBankRepository.php | 9 ++++++--- .../PiggyBank/PiggyBankRepositoryInterface.php | 5 +++-- app/Repositories/Recurring/RecurringRepository.php | 11 ++++++----- .../Recurring/RecurringRepositoryInterface.php | 7 +++---- app/Repositories/Rule/RuleRepository.php | 9 ++++++--- app/Repositories/Rule/RuleRepositoryInterface.php | 5 +++-- app/Repositories/RuleGroup/RuleGroupRepository.php | 9 ++++++--- .../RuleGroup/RuleGroupRepositoryInterface.php | 5 +++-- app/Repositories/Tag/OperationsRepository.php | 9 ++++++--- .../Tag/OperationsRepositoryInterface.php | 5 +++-- app/Repositories/Tag/TagRepository.php | 9 ++++++--- app/Repositories/Tag/TagRepositoryInterface.php | 5 +++-- .../TransactionGroup/TransactionGroupRepository.php | 9 ++++++--- .../TransactionGroupRepositoryInterface.php | 7 +++---- app/Repositories/Webhook/WebhookRepository.php | 9 ++++++--- .../Webhook/WebhookRepositoryInterface.php | 7 +++---- 55 files changed, 242 insertions(+), 146 deletions(-) diff --git a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php index c19de8e24c..1065b9ea1a 100644 --- a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php +++ b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php @@ -45,6 +45,7 @@ class RecurrenceController extends Controller $this->middleware( function ($request, $next) { $this->repository = app(RecurringRepositoryInterface::class); + $this->repository->setUser(auth()->user()); return $next($request); diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index caf53bfffb..0acbd64fa0 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -38,6 +38,7 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Services\Internal\Destroy\AccountDestroyService; use FireflyIII\Services\Internal\Update\AccountUpdateService; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Support\Collection; @@ -273,11 +274,13 @@ class AccountRepository implements AccountRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index 85b26128aa..8a843d0257 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -31,6 +31,7 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -302,9 +303,9 @@ interface AccountRepositoryInterface public function searchAccountNr(string $query, array $types, int $limit): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index 33661f9d6c..ebebc39e4e 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Account; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use JsonException; use Log; @@ -309,10 +310,12 @@ class AccountTasker implements AccountTaskerInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } } diff --git a/app/Repositories/Account/AccountTaskerInterface.php b/app/Repositories/Account/AccountTaskerInterface.php index d7ff2c184d..64d9ea50e4 100644 --- a/app/Repositories/Account/AccountTaskerInterface.php +++ b/app/Repositories/Account/AccountTaskerInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Account; use Carbon\Carbon; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -60,7 +61,7 @@ interface AccountTaskerInterface public function getIncomeReport(Carbon $start, Carbon $end, Collection $accounts): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; } diff --git a/app/Repositories/Account/OperationsRepository.php b/app/Repositories/Account/OperationsRepository.php index c6524f02e5..d39005b951 100644 --- a/app/Repositories/Account/OperationsRepository.php +++ b/app/Repositories/Account/OperationsRepository.php @@ -28,6 +28,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -78,11 +79,13 @@ class OperationsRepository implements OperationsRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Account/OperationsRepositoryInterface.php b/app/Repositories/Account/OperationsRepositoryInterface.php index e70e27f4a4..2741d8b134 100644 --- a/app/Repositories/Account/OperationsRepositoryInterface.php +++ b/app/Repositories/Account/OperationsRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Account; use Carbon\Carbon; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -60,9 +61,9 @@ interface OperationsRepositoryInterface public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Sum of withdrawal journals in period for a set of accounts, grouped per currency. Amounts are always negative. diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 85dd226ae2..d3c56cdaee 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -31,6 +31,7 @@ use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Models\Attachment; use FireflyIII\Models\Note; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Storage; @@ -152,11 +153,13 @@ class AttachmentRepository implements AttachmentRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index 50d2d3b8a9..119219a0d1 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Attachment; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Attachment; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -69,9 +70,9 @@ interface AttachmentRepositoryInterface public function getNoteText(Attachment $attachment): ?string; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 0884bdd790..a0100010c6 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -39,6 +39,7 @@ use FireflyIII\Services\Internal\Destroy\BillDestroyService; use FireflyIII\Services\Internal\Update\BillUpdateService; use FireflyIII\Support\CacheProperties; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Query\JoinClause; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -198,11 +199,13 @@ class BillRepository implements BillRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index 372d2da8b1..735eae4af5 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Bill; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -315,9 +316,9 @@ interface BillRepositoryInterface public function setOrder(Bill $bill, int $order): void; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.php index a1a080e987..3c0219c3b3 100644 --- a/app/Repositories/Budget/AvailableBudgetRepository.php +++ b/app/Repositories/Budget/AvailableBudgetRepository.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; @@ -220,11 +221,13 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php index 7537291f96..a8cd88c105 100644 --- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -133,9 +134,9 @@ interface AvailableBudgetRepositoryInterface public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Budget/BudgetLimitRepository.php b/app/Repositories/Budget/BudgetLimitRepository.php index bdd7d4b73c..8d96a3c20e 100644 --- a/app/Repositories/Budget/BudgetLimitRepository.php +++ b/app/Repositories/Budget/BudgetLimitRepository.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; use JsonException; @@ -271,11 +272,13 @@ class BudgetLimitRepository implements BudgetLimitRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php index 3c6c914c8a..0c21bbdb09 100644 --- a/app/Repositories/Budget/BudgetLimitRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetLimitRepositoryInterface.php @@ -28,6 +28,7 @@ use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -99,9 +100,9 @@ interface BudgetLimitRepositoryInterface public function getBudgetLimits(Budget $budget, Carbon $start = null, Carbon $end = null): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 4b62b0737a..dfddf55500 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -41,6 +41,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Services\Internal\Destroy\BudgetDestroyService; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\QueryException; use Illuminate\Support\Collection; use JsonException; @@ -144,11 +145,13 @@ class BudgetRepository implements BudgetRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index ab86074dc6..34ef2f921a 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\AutoBudget; use FireflyIII\Models\Budget; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -191,9 +192,9 @@ interface BudgetRepositoryInterface public function setBudgetOrder(Budget $budget, int $order): void; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * Used in the v2 API to calculate the amount of money spent in all active budgets. diff --git a/app/Repositories/Budget/NoBudgetRepository.php b/app/Repositories/Budget/NoBudgetRepository.php index 83e099d858..c0ab8aca59 100644 --- a/app/Repositories/Budget/NoBudgetRepository.php +++ b/app/Repositories/Budget/NoBudgetRepository.php @@ -28,6 +28,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -138,11 +139,13 @@ class NoBudgetRepository implements NoBudgetRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Budget/NoBudgetRepositoryInterface.php b/app/Repositories/Budget/NoBudgetRepositoryInterface.php index f431b59522..0ee20f50ef 100644 --- a/app/Repositories/Budget/NoBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/NoBudgetRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Budget; use Carbon\Carbon; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -44,9 +45,9 @@ interface NoBudgetRepositoryInterface public function getNoBudgetPeriodReport(Collection $accounts, Carbon $start, Carbon $end): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param Collection $accounts diff --git a/app/Repositories/Budget/OperationsRepository.php b/app/Repositories/Budget/OperationsRepository.php index 4f983d051e..9aa5c8a765 100644 --- a/app/Repositories/Budget/OperationsRepository.php +++ b/app/Repositories/Budget/OperationsRepository.php @@ -31,6 +31,7 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; @@ -200,11 +201,13 @@ class OperationsRepository implements OperationsRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Budget/OperationsRepositoryInterface.php b/app/Repositories/Budget/OperationsRepositoryInterface.php index 6ff33a97c3..2771c548dc 100644 --- a/app/Repositories/Budget/OperationsRepositoryInterface.php +++ b/app/Repositories/Budget/OperationsRepositoryInterface.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Models\Budget; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -70,9 +71,9 @@ interface OperationsRepositoryInterface public function listExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index cbfd18453e..38f339b140 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -36,6 +36,7 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Services\Internal\Destroy\CategoryDestroyService; use FireflyIII\Services\Internal\Update\CategoryUpdateService; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; use Storage; @@ -196,13 +197,14 @@ class CategoryRepository implements CategoryRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } - /** * @param Category $category */ diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index b660fe9332..aefbeeecdd 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Category; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -151,9 +152,9 @@ interface CategoryRepositoryInterface public function searchCategory(string $query, int $limit): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Category/NoCategoryRepository.php b/app/Repositories/Category/NoCategoryRepository.php index 0e1845ff67..7077a4d0ad 100644 --- a/app/Repositories/Category/NoCategoryRepository.php +++ b/app/Repositories/Category/NoCategoryRepository.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -90,11 +91,13 @@ class NoCategoryRepository implements NoCategoryRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Category/NoCategoryRepositoryInterface.php b/app/Repositories/Category/NoCategoryRepositoryInterface.php index 483f3f505d..d01207ebf6 100644 --- a/app/Repositories/Category/NoCategoryRepositoryInterface.php +++ b/app/Repositories/Category/NoCategoryRepositoryInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Category; use Carbon\Carbon; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -60,9 +61,9 @@ interface NoCategoryRepositoryInterface public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Sum of withdrawal journals in period without a category, grouped per currency. Amounts are always negative. diff --git a/app/Repositories/Category/OperationsRepository.php b/app/Repositories/Category/OperationsRepository.php index a2dabc2a7d..667c01e3d9 100644 --- a/app/Repositories/Category/OperationsRepository.php +++ b/app/Repositories/Category/OperationsRepository.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -116,11 +117,13 @@ class OperationsRepository implements OperationsRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Category/OperationsRepositoryInterface.php b/app/Repositories/Category/OperationsRepositoryInterface.php index 1a30eee764..45db040c73 100644 --- a/app/Repositories/Category/OperationsRepositoryInterface.php +++ b/app/Repositories/Category/OperationsRepositoryInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Category; use Carbon\Carbon; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -92,9 +93,9 @@ interface OperationsRepositoryInterface public function listTransferredOut(Carbon $start, Carbon $end, Collection $accounts, ?Collection $categories = null): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Sum of withdrawal journals in period for a set of categories, grouped per currency. Amounts are always negative. diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index 96ff6e83a1..7d4c7cf352 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -39,6 +39,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\Services\Internal\Destroy\CurrencyDestroyService; use FireflyIII\Services\Internal\Update\CurrencyUpdateService; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use JsonException; use Log; @@ -487,11 +488,13 @@ class CurrencyRepository implements CurrencyRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index 7c45bf9e27..eab7f80549 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -29,6 +29,7 @@ use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Models\Preference; use FireflyIII\Models\TransactionCurrency; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -229,9 +230,9 @@ interface CurrencyRepositoryInterface public function setExchangeRate(TransactionCurrency $fromCurrency, TransactionCurrency $toCurrency, Carbon $date, float $rate): CurrencyExchangeRate; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Journal/JournalAPIRepository.php b/app/Repositories/Journal/JournalAPIRepository.php index 03547080cc..f3f4936972 100644 --- a/app/Repositories/Journal/JournalAPIRepository.php +++ b/app/Repositories/Journal/JournalAPIRepository.php @@ -28,6 +28,7 @@ use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Storage; @@ -110,10 +111,12 @@ class JournalAPIRepository implements JournalAPIRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } } diff --git a/app/Repositories/Journal/JournalAPIRepositoryInterface.php b/app/Repositories/Journal/JournalAPIRepositoryInterface.php index 16dd484b79..e828aeea33 100644 --- a/app/Repositories/Journal/JournalAPIRepositoryInterface.php +++ b/app/Repositories/Journal/JournalAPIRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Journal; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -70,7 +71,7 @@ interface JournalAPIRepositoryInterface public function getPiggyBankEvents(TransactionJournal $journal): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; } diff --git a/app/Repositories/Journal/JournalCLIRepository.php b/app/Repositories/Journal/JournalCLIRepository.php index 1e2e7b454a..2ce476df6a 100644 --- a/app/Repositories/Journal/JournalCLIRepository.php +++ b/app/Repositories/Journal/JournalCLIRepository.php @@ -28,6 +28,7 @@ use DB; use FireflyIII\Models\TransactionJournal; use FireflyIII\Support\CacheProperties; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use stdClass; @@ -227,10 +228,10 @@ class JournalCLIRepository implements JournalCLIRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - return; + // empty } } diff --git a/app/Repositories/Journal/JournalCLIRepositoryInterface.php b/app/Repositories/Journal/JournalCLIRepositoryInterface.php index b226973bda..6b2aa4cb86 100644 --- a/app/Repositories/Journal/JournalCLIRepositoryInterface.php +++ b/app/Repositories/Journal/JournalCLIRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\Journal; use Carbon\Carbon; use FireflyIII\Models\TransactionJournal; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -114,7 +115,7 @@ interface JournalCLIRepositoryInterface public function getTags(TransactionJournal $journal): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; } diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index b48ed7fc75..4eea809d37 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -37,6 +37,7 @@ use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService; use FireflyIII\Services\Internal\Update\JournalUpdateService; use FireflyIII\Support\CacheProperties; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -252,11 +253,13 @@ class JournalRepository implements JournalRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 2dac2b5d3d..de844443f6 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -30,6 +30,7 @@ use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -143,9 +144,9 @@ interface JournalRepositoryInterface public function searchJournalDescriptions(string $search, int $limit): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * Update budget for a journal. diff --git a/app/Repositories/LinkType/LinkTypeRepository.php b/app/Repositories/LinkType/LinkTypeRepository.php index d1578db0df..e24c613dc9 100644 --- a/app/Repositories/LinkType/LinkTypeRepository.php +++ b/app/Repositories/LinkType/LinkTypeRepository.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Note; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; @@ -199,11 +200,13 @@ class LinkTypeRepository implements LinkTypeRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php index 9c3c9f338a..54f984b09a 100644 --- a/app/Repositories/LinkType/LinkTypeRepositoryInterface.php +++ b/app/Repositories/LinkType/LinkTypeRepositoryInterface.php @@ -27,6 +27,7 @@ use FireflyIII\Models\LinkType; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournalLink; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -124,11 +125,9 @@ interface LinkTypeRepositoryInterface public function getLinks(TransactionJournal $journal): Collection; /** - * Set the user for this instance. - * - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepository.php b/app/Repositories/ObjectGroup/ObjectGroupRepository.php index 35a42991fa..84005207da 100644 --- a/app/Repositories/ObjectGroup/ObjectGroupRepository.php +++ b/app/Repositories/ObjectGroup/ObjectGroupRepository.php @@ -28,6 +28,7 @@ use DB; use FireflyIII\Models\ObjectGroup; use FireflyIII\Models\PiggyBank; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; @@ -151,11 +152,13 @@ class ObjectGroupRepository implements ObjectGroupRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if (null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php index 2a5b2c44e7..0b1de76abb 100644 --- a/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php +++ b/app/Repositories/ObjectGroup/ObjectGroupRepositoryInterface.php @@ -26,6 +26,7 @@ namespace FireflyIII\Repositories\ObjectGroup; use FireflyIII\Models\ObjectGroup; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -89,9 +90,9 @@ interface ObjectGroupRepositoryInterface public function setOrder(ObjectGroup $objectGroup, int $newOrder): ObjectGroup; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param ObjectGroup $objectGroup diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 88c65e0b16..609ad08eab 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -34,6 +34,7 @@ use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use JsonException; use Log; @@ -274,11 +275,13 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php index d786a77364..c3e4640dcd 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php @@ -29,6 +29,7 @@ use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBankRepetition; use FireflyIII\Models\TransactionJournal; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -253,9 +254,9 @@ interface PiggyBankRepositoryInterface public function setOrder(PiggyBank $piggyBank, int $newOrder): bool; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * Store new piggy bank. diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index 1d3dff571e..cdfafd90b4 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -43,6 +43,7 @@ use FireflyIII\Support\Repositories\Recurring\CalculateXOccurrences; use FireflyIII\Support\Repositories\Recurring\CalculateXOccurrencesSince; use FireflyIII\Support\Repositories\Recurring\FiltersWeekends; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Builder; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -345,13 +346,13 @@ class RecurringRepository implements RecurringRepositoryInterface } /** - * Set user for in repository. - * - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Recurring/RecurringRepositoryInterface.php b/app/Repositories/Recurring/RecurringRepositoryInterface.php index c4fca83361..14e483c05c 100644 --- a/app/Repositories/Recurring/RecurringRepositoryInterface.php +++ b/app/Repositories/Recurring/RecurringRepositoryInterface.php @@ -29,6 +29,7 @@ use FireflyIII\Models\Recurrence; use FireflyIII\Models\RecurrenceRepetition; use FireflyIII\Models\RecurrenceTransaction; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -226,11 +227,9 @@ interface RecurringRepositoryInterface public function searchRecurrence(string $query, int $limit): Collection; /** - * Set user for in repository. - * - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Store a new recurring transaction. diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 77c3ddd85b..92e59c360c 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -32,6 +32,7 @@ use FireflyIII\Models\RuleTrigger; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Support\Search\OperatorQuerySearch; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; @@ -361,11 +362,13 @@ class RuleRepository implements RuleRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php index 5f2577737e..9c70180933 100644 --- a/app/Repositories/Rule/RuleRepositoryInterface.php +++ b/app/Repositories/Rule/RuleRepositoryInterface.php @@ -28,6 +28,7 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleTrigger; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -162,9 +163,9 @@ interface RuleRepositoryInterface public function setOrder(Rule $rule, int $newOrder): void; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index e71c6f6f51..6413eae1a7 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -29,6 +29,7 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleTrigger; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Support\Collection; use Log; @@ -443,11 +444,13 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php index f2fa871fde..9ab7eeabcd 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php +++ b/app/Repositories/RuleGroup/RuleGroupRepositoryInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\RuleGroup; use FireflyIII\Models\RuleGroup; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -164,9 +165,9 @@ interface RuleGroupRepositoryInterface public function setOrder(RuleGroup $ruleGroup, int $newOrder): void; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data diff --git a/app/Repositories/Tag/OperationsRepository.php b/app/Repositories/Tag/OperationsRepository.php index fc06b62718..607a0ef36e 100644 --- a/app/Repositories/Tag/OperationsRepository.php +++ b/app/Repositories/Tag/OperationsRepository.php @@ -28,6 +28,7 @@ use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\GroupCollectorInterface; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; @@ -117,11 +118,13 @@ class OperationsRepository implements OperationsRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Tag/OperationsRepositoryInterface.php b/app/Repositories/Tag/OperationsRepositoryInterface.php index f5f6dd09b1..6e1b6cba24 100644 --- a/app/Repositories/Tag/OperationsRepositoryInterface.php +++ b/app/Repositories/Tag/OperationsRepositoryInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\Tag; use Carbon\Carbon; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -63,9 +64,9 @@ interface OperationsRepositoryInterface public function listIncome(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $tags = null): array; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Sum of withdrawal journals in period for a set of tags, grouped per currency. Amounts are always negative. diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 8e37750467..3fb171b204 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -34,6 +34,7 @@ use FireflyIII\Models\Note; use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionType; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Log; use Storage; @@ -109,11 +110,13 @@ class TagRepository implements TagRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index 0a5bbd76cc..1f5a0b3804 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -27,6 +27,7 @@ use Carbon\Carbon; use FireflyIII\Models\Location; use FireflyIII\Models\Tag; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -163,9 +164,9 @@ interface TagRepositoryInterface public function searchTags(string $query, int $limit): Collection; /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user); + public function setUser(User|Authenticatable|null $user): void; /** * This method stores a tag. diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.php index c88f1fca85..7dbb3b1ccc 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php @@ -45,6 +45,7 @@ use FireflyIII\Services\Internal\Destroy\TransactionGroupDestroyService; use FireflyIII\Services\Internal\Update\GroupUpdateService; use FireflyIII\Support\NullArrayObject; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; use JsonException; @@ -189,11 +190,13 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface } /** - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php b/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php index 36a1186d4c..e1e6ee8ca4 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php @@ -29,6 +29,7 @@ use FireflyIII\Models\Location; use FireflyIII\Models\TransactionGroup; use FireflyIII\Support\NullArrayObject; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -150,11 +151,9 @@ interface TransactionGroupRepositoryInterface public function getTags(int $journalId): array; /** - * Set the user. - * - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * Create a new transaction group. diff --git a/app/Repositories/Webhook/WebhookRepository.php b/app/Repositories/Webhook/WebhookRepository.php index f9ee12bb74..6ac981a73f 100644 --- a/app/Repositories/Webhook/WebhookRepository.php +++ b/app/Repositories/Webhook/WebhookRepository.php @@ -27,6 +27,7 @@ use FireflyIII\Models\Webhook; use FireflyIII\Models\WebhookAttempt; use FireflyIII\Models\WebhookMessage; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; use Str; @@ -104,11 +105,13 @@ class WebhookRepository implements WebhookRepositoryInterface } /** - * @inheritDoc + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void + public function setUser(User|Authenticatable|null $user): void { - $this->user = $user; + if(null !== $user) { + $this->user = $user; + } } /** diff --git a/app/Repositories/Webhook/WebhookRepositoryInterface.php b/app/Repositories/Webhook/WebhookRepositoryInterface.php index 04201667b2..9b2c21e3ba 100644 --- a/app/Repositories/Webhook/WebhookRepositoryInterface.php +++ b/app/Repositories/Webhook/WebhookRepositoryInterface.php @@ -27,6 +27,7 @@ use FireflyIII\Models\Webhook; use FireflyIII\Models\WebhookAttempt; use FireflyIII\Models\WebhookMessage; use FireflyIII\User; +use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Support\Collection; /** @@ -78,11 +79,9 @@ interface WebhookRepositoryInterface public function getReadyMessages(Webhook $webhook): Collection; /** - * Set user. - * - * @param User $user + * @param User|Authenticatable|null $user */ - public function setUser(User $user): void; + public function setUser(User|Authenticatable|null $user): void; /** * @param array $data