From 60aef0de1a34dcff268ca52df7a106c7c3a4a3a7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 23 Feb 2025 12:27:34 +0100 Subject: [PATCH] Mark as deprecated. --- .../UserGroups/Account/AccountRepository.php | 2 + .../Account/AccountRepositoryInterface.php | 7 +-- .../UserGroups/Bill/BillRepository.php | 2 + .../Bill/BillRepositoryInterface.php | 5 +-- .../Budget/AvailableBudgetRepository.php | 2 + .../AvailableBudgetRepositoryInterface.php | 5 +-- .../UserGroups/Budget/BudgetRepository.php | 2 + .../Budget/BudgetRepositoryInterface.php | 8 +--- .../Budget/OperationsRepository.php | 2 + .../Budget/OperationsRepositoryInterface.php | 5 +-- .../Category/CategoryRepository.php | 5 +++ .../Category/CategoryRepositoryInterface.php | 5 +++ .../Currency/CurrencyRepository.php | 2 + .../Currency/CurrencyRepositoryInterface.php | 12 ++--- .../ExchangeRate/ExchangeRateRepository.php | 45 ++++++++++--------- .../ExchangeRateRepositoryInterface.php | 13 ++++-- .../UserGroups/Journal/JournalRepository.php | 2 + .../Journal/JournalRepositoryInterface.php | 5 +-- .../PiggyBank/PiggyBankRepository.php | 2 + .../PiggyBankRepositoryInterface.php | 2 + .../UserGroups/Tag/TagRepository.php | 2 + .../UserGroups/Tag/TagRepositoryInterface.php | 5 +++ 22 files changed, 88 insertions(+), 52 deletions(-) diff --git a/app/Repositories/UserGroups/Account/AccountRepository.php b/app/Repositories/UserGroups/Account/AccountRepository.php index 912a4d0e0e..97877aeb3e 100644 --- a/app/Repositories/UserGroups/Account/AccountRepository.php +++ b/app/Repositories/UserGroups/Account/AccountRepository.php @@ -40,6 +40,8 @@ use Illuminate\Support\Facades\DB; /** * Class AccountRepository + * + * @deprecated */ class AccountRepository implements AccountRepositoryInterface { diff --git a/app/Repositories/UserGroups/Account/AccountRepositoryInterface.php b/app/Repositories/UserGroups/Account/AccountRepositoryInterface.php index 17b3fad59b..3af1e70aa3 100644 --- a/app/Repositories/UserGroups/Account/AccountRepositoryInterface.php +++ b/app/Repositories/UserGroups/Account/AccountRepositoryInterface.php @@ -27,11 +27,12 @@ namespace FireflyIII\Repositories\UserGroups\Account; use FireflyIII\Models\Account; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\UserGroup; -use FireflyIII\User; use Illuminate\Support\Collection; /** * Interface AccountRepositoryInterface + * + * @deprecated */ interface AccountRepositoryInterface { @@ -82,9 +83,5 @@ interface AccountRepositoryInterface public function searchAccount(string $query, array $types, int $page, int $limit): Collection; - public function setUser(User $user): void; - - public function setUserGroup(UserGroup $userGroup): void; - public function update(Account $account, array $data): Account; } diff --git a/app/Repositories/UserGroups/Bill/BillRepository.php b/app/Repositories/UserGroups/Bill/BillRepository.php index ffeb688792..ad2558a70f 100644 --- a/app/Repositories/UserGroups/Bill/BillRepository.php +++ b/app/Repositories/UserGroups/Bill/BillRepository.php @@ -36,6 +36,8 @@ use Illuminate\Support\Facades\Log; /** * Class BillRepository + * + * @deprecated */ class BillRepository implements BillRepositoryInterface { diff --git a/app/Repositories/UserGroups/Bill/BillRepositoryInterface.php b/app/Repositories/UserGroups/Bill/BillRepositoryInterface.php index 6bf9d979a5..7c2819022e 100644 --- a/app/Repositories/UserGroups/Bill/BillRepositoryInterface.php +++ b/app/Repositories/UserGroups/Bill/BillRepositoryInterface.php @@ -26,11 +26,12 @@ namespace FireflyIII\Repositories\UserGroups\Bill; use Carbon\Carbon; use FireflyIII\Models\Bill; -use FireflyIII\User; use Illuminate\Support\Collection; /** * Interface BillRepositoryInterface + * + * @deprecated */ interface BillRepositoryInterface { @@ -59,8 +60,6 @@ interface BillRepositoryInterface */ public function nextDateMatch(Bill $bill, Carbon $date): Carbon; - public function setUser(User $user): void; - /** * Collect multi-currency of sum of bills already paid. */ diff --git a/app/Repositories/UserGroups/Budget/AvailableBudgetRepository.php b/app/Repositories/UserGroups/Budget/AvailableBudgetRepository.php index f1b9fa96f8..e6118cb938 100644 --- a/app/Repositories/UserGroups/Budget/AvailableBudgetRepository.php +++ b/app/Repositories/UserGroups/Budget/AvailableBudgetRepository.php @@ -32,6 +32,8 @@ use Illuminate\Support\Facades\Log; /** * Class AvailableBudgetRepository + * + * @deprecated */ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface { diff --git a/app/Repositories/UserGroups/Budget/AvailableBudgetRepositoryInterface.php b/app/Repositories/UserGroups/Budget/AvailableBudgetRepositoryInterface.php index 6d1015f348..33a2c7b203 100644 --- a/app/Repositories/UserGroups/Budget/AvailableBudgetRepositoryInterface.php +++ b/app/Repositories/UserGroups/Budget/AvailableBudgetRepositoryInterface.php @@ -25,14 +25,13 @@ declare(strict_types=1); namespace FireflyIII\Repositories\UserGroups\Budget; use Carbon\Carbon; -use FireflyIII\User; /** * Interface AvailableBudgetRepositoryInterface + * + * @deprecated */ interface AvailableBudgetRepositoryInterface { public function getAvailableBudgetWithCurrency(Carbon $start, Carbon $end): array; - - public function setUser(User $user): void; } diff --git a/app/Repositories/UserGroups/Budget/BudgetRepository.php b/app/Repositories/UserGroups/Budget/BudgetRepository.php index f86e58e601..cb43479b71 100644 --- a/app/Repositories/UserGroups/Budget/BudgetRepository.php +++ b/app/Repositories/UserGroups/Budget/BudgetRepository.php @@ -29,6 +29,8 @@ use Illuminate\Support\Collection; /** * Class BudgetRepository + * + * @deprecated */ class BudgetRepository implements BudgetRepositoryInterface { diff --git a/app/Repositories/UserGroups/Budget/BudgetRepositoryInterface.php b/app/Repositories/UserGroups/Budget/BudgetRepositoryInterface.php index c6929275b5..021736f595 100644 --- a/app/Repositories/UserGroups/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/UserGroups/Budget/BudgetRepositoryInterface.php @@ -24,20 +24,16 @@ declare(strict_types=1); namespace FireflyIII\Repositories\UserGroups\Budget; -use FireflyIII\Models\UserGroup; -use FireflyIII\User; use Illuminate\Support\Collection; /** * Interface BudgetRepositoryInterface + * + * @deprecated */ interface BudgetRepositoryInterface { public function getActiveBudgets(): Collection; public function getBudgets(): Collection; - - public function setUser(User $user): void; - - public function setUserGroup(UserGroup $userGroup): void; } diff --git a/app/Repositories/UserGroups/Budget/OperationsRepository.php b/app/Repositories/UserGroups/Budget/OperationsRepository.php index 349daf0a71..63a0b22644 100644 --- a/app/Repositories/UserGroups/Budget/OperationsRepository.php +++ b/app/Repositories/UserGroups/Budget/OperationsRepository.php @@ -33,6 +33,8 @@ use Illuminate\Support\Collection; /** * Class OperationsRepository + * + * @deprecated */ class OperationsRepository implements OperationsRepositoryInterface { diff --git a/app/Repositories/UserGroups/Budget/OperationsRepositoryInterface.php b/app/Repositories/UserGroups/Budget/OperationsRepositoryInterface.php index e1eb8762a1..a96b94f658 100644 --- a/app/Repositories/UserGroups/Budget/OperationsRepositoryInterface.php +++ b/app/Repositories/UserGroups/Budget/OperationsRepositoryInterface.php @@ -25,11 +25,12 @@ declare(strict_types=1); namespace FireflyIII\Repositories\UserGroups\Budget; use Carbon\Carbon; -use FireflyIII\User; use Illuminate\Support\Collection; /** * Interface OperationsRepositoryInterface + * + * @deprecated */ interface OperationsRepositoryInterface { @@ -39,6 +40,4 @@ interface OperationsRepositoryInterface * as possible. Amounts are always negative. */ public function listExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?Collection $budgets = null): array; - - public function setUser(User $user): void; } diff --git a/app/Repositories/UserGroups/Category/CategoryRepository.php b/app/Repositories/UserGroups/Category/CategoryRepository.php index dd489d1bcd..2b93a540cf 100644 --- a/app/Repositories/UserGroups/Category/CategoryRepository.php +++ b/app/Repositories/UserGroups/Category/CategoryRepository.php @@ -28,6 +28,11 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Support\Collection; +/** + * Class CategoryRepository + * + * @deprecated + */ class CategoryRepository implements CategoryRepositoryInterface { use UserGroupTrait; diff --git a/app/Repositories/UserGroups/Category/CategoryRepositoryInterface.php b/app/Repositories/UserGroups/Category/CategoryRepositoryInterface.php index 5c5c1242f6..1a8cc54a4c 100644 --- a/app/Repositories/UserGroups/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/UserGroups/Category/CategoryRepositoryInterface.php @@ -26,6 +26,11 @@ namespace FireflyIII\Repositories\UserGroups\Category; use Illuminate\Support\Collection; +/** + * Interface CategoryRepositoryInterface + * + * @deprecated + */ interface CategoryRepositoryInterface { /** diff --git a/app/Repositories/UserGroups/Currency/CurrencyRepository.php b/app/Repositories/UserGroups/Currency/CurrencyRepository.php index 428ddf0da3..73bce5a06b 100644 --- a/app/Repositories/UserGroups/Currency/CurrencyRepository.php +++ b/app/Repositories/UserGroups/Currency/CurrencyRepository.php @@ -43,6 +43,8 @@ use Illuminate\Support\Facades\Log; /** * Class CurrencyRepository + * + * @deprecated */ class CurrencyRepository implements CurrencyRepositoryInterface { diff --git a/app/Repositories/UserGroups/Currency/CurrencyRepositoryInterface.php b/app/Repositories/UserGroups/Currency/CurrencyRepositoryInterface.php index 8982498eb4..c49b3b4fb8 100644 --- a/app/Repositories/UserGroups/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/UserGroups/Currency/CurrencyRepositoryInterface.php @@ -27,15 +27,17 @@ namespace FireflyIII\Repositories\UserGroups\Currency; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\UserGroup; -use FireflyIII\User; use Illuminate\Support\Collection; +/** + * Interface CurrencyRepositoryInterface + * + * @deprecated + */ interface CurrencyRepositoryInterface { public function currencyInUse(TransactionCurrency $currency): bool; - public function getUserGroup(): UserGroup; - /** * Currency is in use where exactly. */ @@ -86,14 +88,14 @@ interface CurrencyRepositoryInterface public function getByIds(array $ids): Collection; + public function getUserGroup(): UserGroup; + public function isFallbackCurrency(TransactionCurrency $currency): bool; public function makeDefault(TransactionCurrency $currency): void; public function searchCurrency(string $search, int $limit): Collection; - public function setUser(User $user): void; - /** * @throws FireflyException */ diff --git a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php index 3384fc1f41..2460d7d572 100644 --- a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php +++ b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepository.php @@ -31,10 +31,27 @@ use FireflyIII\Support\Repositories\UserGroup\UserGroupTrait; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Collection; +/** + * Class ExchangeRateRepository + * + * @deprecated + */ class ExchangeRateRepository implements ExchangeRateRepositoryInterface { use UserGroupTrait; + #[\Override] + public function deleteRate(CurrencyExchangeRate $rate): void + { + $this->userGroup->currencyExchangeRates()->where('id', $rate->id)->delete(); + } + + #[\Override] + public function getAll(): Collection + { + return $this->userGroup->currencyExchangeRates()->orderBy('date', 'ASC')->get(); + } + #[\Override] public function getRates(TransactionCurrency $from, TransactionCurrency $to): Collection { @@ -71,24 +88,6 @@ class ExchangeRateRepository implements ExchangeRateRepositoryInterface ; } - #[\Override] - public function deleteRate(CurrencyExchangeRate $rate): void - { - $this->userGroup->currencyExchangeRates()->where('id', $rate->id)->delete(); - } - - #[\Override] - public function updateExchangeRate(CurrencyExchangeRate $object, string $rate, ?Carbon $date = null): CurrencyExchangeRate - { - $object->rate = $rate; - if (null !== $date) { - $object->date = $date; - } - $object->save(); - - return $object; - } - #[\Override] public function storeExchangeRate(TransactionCurrency $from, TransactionCurrency $to, string $rate, Carbon $date): CurrencyExchangeRate { @@ -106,8 +105,14 @@ class ExchangeRateRepository implements ExchangeRateRepositoryInterface } #[\Override] - public function getAll(): Collection + public function updateExchangeRate(CurrencyExchangeRate $object, string $rate, ?Carbon $date = null): CurrencyExchangeRate { - return $this->userGroup->currencyExchangeRates()->orderBy('date', 'ASC')->get(); + $object->rate = $rate; + if (null !== $date) { + $object->date = $date; + } + $object->save(); + + return $object; } } diff --git a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepositoryInterface.php b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepositoryInterface.php index ba2c83d9aa..00e164d15e 100644 --- a/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepositoryInterface.php +++ b/app/Repositories/UserGroups/ExchangeRate/ExchangeRateRepositoryInterface.php @@ -29,17 +29,22 @@ use FireflyIII\Models\CurrencyExchangeRate; use FireflyIII\Models\TransactionCurrency; use Illuminate\Support\Collection; +/** + * Interface ExchangeRateRepositoryInterface + * + * @deprecated + */ interface ExchangeRateRepositoryInterface { - public function getRates(TransactionCurrency $from, TransactionCurrency $to): Collection; + public function deleteRate(CurrencyExchangeRate $rate): void; public function getAll(): Collection; + public function getRates(TransactionCurrency $from, TransactionCurrency $to): Collection; + public function getSpecificRateOnDate(TransactionCurrency $from, TransactionCurrency $to, Carbon $date): ?CurrencyExchangeRate; - public function deleteRate(CurrencyExchangeRate $rate): void; + public function storeExchangeRate(TransactionCurrency $from, TransactionCurrency $to, string $rate, Carbon $date): CurrencyExchangeRate; public function updateExchangeRate(CurrencyExchangeRate $object, string $rate, ?Carbon $date = null): CurrencyExchangeRate; - - public function storeExchangeRate(TransactionCurrency $from, TransactionCurrency $to, string $rate, Carbon $date): CurrencyExchangeRate; } diff --git a/app/Repositories/UserGroups/Journal/JournalRepository.php b/app/Repositories/UserGroups/Journal/JournalRepository.php index 6b141c5b09..8926573acd 100644 --- a/app/Repositories/UserGroups/Journal/JournalRepository.php +++ b/app/Repositories/UserGroups/Journal/JournalRepository.php @@ -30,6 +30,8 @@ use Illuminate\Support\Collection; /** * Class JournalRepository + * + * @deprecated */ class JournalRepository implements JournalRepositoryInterface { diff --git a/app/Repositories/UserGroups/Journal/JournalRepositoryInterface.php b/app/Repositories/UserGroups/Journal/JournalRepositoryInterface.php index 71bfd8f518..c8321fcd7c 100644 --- a/app/Repositories/UserGroups/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/UserGroups/Journal/JournalRepositoryInterface.php @@ -24,11 +24,12 @@ declare(strict_types=1); namespace FireflyIII\Repositories\UserGroups\Journal; -use FireflyIII\User; use Illuminate\Support\Collection; /** * Interface JournalRepositoryInterface + * + * @deprecated */ interface JournalRepositoryInterface { @@ -36,6 +37,4 @@ interface JournalRepositoryInterface * Search in journal descriptions. */ public function searchJournalDescriptions(array $query, int $limit): Collection; - - public function setUser(User $user): void; } diff --git a/app/Repositories/UserGroups/PiggyBank/PiggyBankRepository.php b/app/Repositories/UserGroups/PiggyBank/PiggyBankRepository.php index e45d568990..c1312306f7 100644 --- a/app/Repositories/UserGroups/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/UserGroups/PiggyBank/PiggyBankRepository.php @@ -30,6 +30,8 @@ use Illuminate\Support\Collection; /** * Class PiggyBankRepository + * + * @deprecated */ class PiggyBankRepository implements PiggyBankRepositoryInterface { diff --git a/app/Repositories/UserGroups/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/UserGroups/PiggyBank/PiggyBankRepositoryInterface.php index 32a98d5423..cf39595a4b 100644 --- a/app/Repositories/UserGroups/PiggyBank/PiggyBankRepositoryInterface.php +++ b/app/Repositories/UserGroups/PiggyBank/PiggyBankRepositoryInterface.php @@ -28,6 +28,8 @@ use Illuminate\Support\Collection; /** * Interface PiggyBankRepositoryInterface + * + * @deprecated */ interface PiggyBankRepositoryInterface { diff --git a/app/Repositories/UserGroups/Tag/TagRepository.php b/app/Repositories/UserGroups/Tag/TagRepository.php index 7ec5dc4926..49f9c2e044 100644 --- a/app/Repositories/UserGroups/Tag/TagRepository.php +++ b/app/Repositories/UserGroups/Tag/TagRepository.php @@ -30,6 +30,8 @@ use Illuminate\Support\Collection; /** * Class TagRepository + * + * @deprecated */ class TagRepository implements TagRepositoryInterface { diff --git a/app/Repositories/UserGroups/Tag/TagRepositoryInterface.php b/app/Repositories/UserGroups/Tag/TagRepositoryInterface.php index 1d65350890..f5aa677560 100644 --- a/app/Repositories/UserGroups/Tag/TagRepositoryInterface.php +++ b/app/Repositories/UserGroups/Tag/TagRepositoryInterface.php @@ -26,6 +26,11 @@ namespace FireflyIII\Repositories\UserGroups\Tag; use Illuminate\Support\Collection; +/** + * Interface TagRepositoryInterface + * + * @deprecated + */ interface TagRepositoryInterface { /**