Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix #10454
James Cole2ba5b6ae49bb
diff --git a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php b/app/Api/V1/Controllers/Autocomplete/CurrencyController.phpindex 3db9b03095..5b49ed3a06 100644--- a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php+++ b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;+use Deprecated;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;use FireflyIII\Models\TransactionCurrency;@@ -83,9 +84,8 @@ class CurrencyController extends Controller/*** Documentation for this endpoint is at:* https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/autocomplete/getCurrenciesCodeAC- *- * @deprecated*/+ #[Deprecated]public function currenciesWithCode(AutocompleteRequest $request): JsonResponse{$data = $request->getData();diff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.phpindex c8848c8565..ed60536f1b 100644--- a/app/Api/V1/Controllers/Chart/BudgetController.php+++ b/app/Api/V1/Controllers/Chart/BudgetController.php@@ -237,9 +237,7 @@ class BudgetController extends Controller/** @var array $entry */// only spent the entry where the entry's currency matches the budget limit's currency// so $filtered will only have 1 or 0 entries- $filtered = array_filter($spent, function ($entry) use ($limitCurrencyId) {- return $entry['currency_id'] === $limitCurrencyId;- });+ $filtered = array_filter($spent, fn($entry) => $entry['currency_id'] === $limitCurrencyId);$result = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);if (1 === count($result)) {$compare = bccomp($limit->amount, (string) app('steam')->positive($result[$limitCurrencyId]['spent']));diff --git a/app/Handlers/Events/VersionCheckEventHandler.php b/app/Handlers/Events/VersionCheckEventHandler.phpindex b8005b70ee..a7ac2c62c3 100644--- a/app/Handlers/Events/VersionCheckEventHandler.php+++ b/app/Handlers/Events/VersionCheckEventHandler.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Handlers\Events;+use Deprecated;use Carbon\Carbon;use FireflyIII\Events\RequestedVersionCheckStatus;use FireflyIII\Exceptions\FireflyException;@@ -42,9 +43,8 @@ class VersionCheckEventHandler* Checks with GitHub to see if there is a new version.** @throws FireflyException- *- * @deprecated ?*/+ #[Deprecated(message: '?')]public function checkForUpdates(RequestedVersionCheckStatus $event): void{Log::debug('Now in checkForUpdates()');diff --git a/app/Helpers/Report/NetWorth.php b/app/Helpers/Report/NetWorth.phpindex cc09678a6f..f917fad788 100644--- a/app/Helpers/Report/NetWorth.php+++ b/app/Helpers/Report/NetWorth.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Helpers\Report;+use Deprecated;use Carbon\Carbon;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Exceptions\FireflyException;@@ -134,9 +135,7 @@ class NetWorth implements NetWorthInterface$this->currencyRepos->setUserGroup($this->userGroup);}- /**- * @deprecated- */+ #[Deprecated]public function sumNetWorthByCurrency(Carbon $date): array{/**diff --git a/app/Helpers/Report/NetWorthInterface.php b/app/Helpers/Report/NetWorthInterface.phpindex 518213c035..6891b57c82 100644--- a/app/Helpers/Report/NetWorthInterface.php+++ b/app/Helpers/Report/NetWorthInterface.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Helpers\Report;+use Deprecated;use Carbon\Carbon;use FireflyIII\Models\UserGroup;use FireflyIII\User;@@ -53,8 +54,7 @@ interface NetWorthInterface* TODO move to repository** Same as above but cleaner function with less dependencies.- *- * @deprecated*/+ #[Deprecated]public function sumNetWorthByCurrency(Carbon $date): array;}diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.phpindex cc3ff13787..c54b30ec64 100644--- a/app/Http/Controllers/Json/BoxController.php+++ b/app/Http/Controllers/Json/BoxController.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Http\Controllers\Json;+use Deprecated;use Carbon\Carbon;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Enums\TransactionTypeEnum;@@ -46,9 +47,8 @@ class BoxController extends Controller/*** Deprecated method, no longer in use.- *- * @deprecated*/+ #[Deprecated]public function available(): JsonResponse{return response()->json([]);diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.phpindex f04a17d968..2ec270541f 100644--- a/app/Repositories/Budget/AvailableBudgetRepository.php+++ b/app/Repositories/Budget/AvailableBudgetRepository.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Budget;+use Deprecated;use Carbon\Carbon;use FireflyIII\Models\AvailableBudget;use FireflyIII\Models\TransactionCurrency;@@ -205,9 +206,7 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface, U;}- /**- * @deprecated- */+ #[Deprecated]public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget{/** @var null|AvailableBudget */diff --git a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.phpindex 9889f72c50..3d54e3f20b 100644--- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php+++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Budget;+use Deprecated;use Carbon\Carbon;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\AvailableBudget;@@ -66,9 +67,7 @@ interface AvailableBudgetRepositoryInterface*/public function get(?Carbon $start = null, ?Carbon $end = null): Collection;- /**- * @deprecated- */+ #[Deprecated]public function getAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end): string;public function getAvailableBudgetWithCurrency(Carbon $start, Carbon $end): array;@@ -90,9 +89,7 @@ interface AvailableBudgetRepositoryInterface*/public function getByCurrencyDate(Carbon $start, Carbon $end, TransactionCurrency $currency): ?AvailableBudget;- /**- * @deprecated- */+ #[Deprecated]public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): AvailableBudget;public function store(array $data): ?AvailableBudget;diff --git a/app/Repositories/Budget/NoBudgetRepositoryInterface.php b/app/Repositories/Budget/NoBudgetRepositoryInterface.phpindex efa8d9e24d..f35cbba670 100644--- a/app/Repositories/Budget/NoBudgetRepositoryInterface.php+++ b/app/Repositories/Budget/NoBudgetRepositoryInterface.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Budget;+use Deprecated;use Carbon\Carbon;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\TransactionCurrency;@@ -44,9 +45,7 @@ use Illuminate\Support\Collection;*/interface NoBudgetRepositoryInterface{- /**- * @deprecated- */+ #[Deprecated]public function getNoBudgetPeriodReport(Collection $accounts, Carbon $start, Carbon $end): array;public function sumExpenses(Carbon $start, Carbon $end, ?Collection $accounts = null, ?TransactionCurrency $currency = null): array;diff --git a/app/Repositories/Budget/OperationsRepository.php b/app/Repositories/Budget/OperationsRepository.phpindex fe37be9050..d6d95e2d31 100644--- a/app/Repositories/Budget/OperationsRepository.php+++ b/app/Repositories/Budget/OperationsRepository.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Budget;+use Deprecated;use Carbon\Carbon;use FireflyIII\Enums\TransactionTypeEnum;use FireflyIII\Helpers\Collector\GroupCollectorInterface;@@ -74,9 +75,8 @@ class OperationsRepository implements OperationsRepositoryInterface, UserGroupIn/*** This method is being used to generate the budget overview in the year/multi-year report. Its used* in both the year/multi-year budget overview AND in the accompanying chart.- *- * @deprecated*/+ #[Deprecated]public function getBudgetPeriodReport(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): array{$carbonFormat = app('navigation')->preferredCarbonFormat($start, $end);diff --git a/app/Repositories/Budget/OperationsRepositoryInterface.php b/app/Repositories/Budget/OperationsRepositoryInterface.phpindex 5def0c5c88..632574a81c 100644--- a/app/Repositories/Budget/OperationsRepositoryInterface.php+++ b/app/Repositories/Budget/OperationsRepositoryInterface.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Repositories\Budget;+use Deprecated;use Carbon\Carbon;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Budget;@@ -51,9 +52,7 @@ interface OperationsRepositoryInterface*/public function budgetedPerDay(Budget $budget): string;- /**- * @deprecated- */+ #[Deprecated]public function getBudgetPeriodReport(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): array;/**diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.phpindex b0b4c86f37..f84266febd 100644--- a/app/Repositories/PiggyBank/PiggyBankRepository.php+++ b/app/Repositories/PiggyBank/PiggyBankRepository.php@@ -444,7 +444,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface, UserGroupInte{$piggyBank->piggyBankEvents()->delete();foreach ($piggyBank->accounts as $account) {- if (0 !== bccomp('0', $account->pivot->current_amount)) {+ if (0 !== bccomp('0', (string) $account->pivot->current_amount)) {event(new ChangedAmount($piggyBank, $account->pivot->current_amount, null, null));}}diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.phpindex 1657fd3cf7..fe56ce3ac3 100644--- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php+++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php@@ -443,7 +443,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface,/** @var Transaction $transaction */foreach ($journal->transactions as $transaction) {if (-1 === bccomp('0', (string)$transaction->amount)) {- $sum = bcadd($sum, $transaction->amount);+ $sum = bcadd($sum, (string) $transaction->amount);$names = sprintf('%s%s', $names, $transaction->account->name);}}diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.phpindex 15fe51dfdd..95471d1032 100644--- a/app/Services/Internal/Support/AccountServiceTrait.php+++ b/app/Services/Internal/Support/AccountServiceTrait.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII\Services\Internal\Support;+use Deprecated;use Carbon\Carbon;use FireflyIII\Enums\AccountTypeEnum;use FireflyIII\Exceptions\DuplicateTransactionException;@@ -193,8 +194,8 @@ trait AccountServiceTrait/*** @throws FireflyException* *- * @deprecated*/+ #[Deprecated]protected function createOBGroup(Account $account, array $data): TransactionGroup{app('log')->debug('Now going to create an OB group.');diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.phpindex ca0f41af68..c542c2c35f 100644--- a/app/Services/Internal/Update/JournalUpdateService.php+++ b/app/Services/Internal/Update/JournalUpdateService.php@@ -825,7 +825,13 @@ class JournalUpdateServicepublic function isCompareHashChanged(): bool{Log::debug(sprintf('Now in %s', __METHOD__));- $compareHash = $this->transactionGroupRepository->getCompareHash($this->transactionGroup);+ $compareHash = hash('sha256', sprintf('%s', Carbon::now()->getTimestamp()));+ if(!$this->transactionGroup instanceof TransactionGroup) {+ $compareHash = $this->transactionGroupRepository->getCompareHash($this->transactionJournal->transactionGroup);+ }+ if($this->transactionGroup instanceof TransactionGroup) {+ $this->transactionGroupRepository->getCompareHash($this->transactionGroup);+ }Log::debug(sprintf('Compare hash is "%s".', $compareHash));Log::debug(sprintf('Start compare hash is "%s".', $this->startCompareHash));diff --git a/app/Support/Amount.php b/app/Support/Amount.phpindex e58c313aac..9c0a6a9d79 100644--- a/app/Support/Amount.php+++ b/app/Support/Amount.php@@ -23,6 +23,7 @@ declare(strict_types=1);namespace FireflyIII\Support;+use Deprecated;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Transaction;use FireflyIII\Models\TransactionCurrency;@@ -195,25 +196,19 @@ class Amountreturn $user->currencies()->orderBy('code', 'ASC')->get();}- /**- * @deprecated- */+ #[Deprecated]public function getDefaultCurrency(): TransactionCurrency{return $this->getNativeCurrency();}- /**- * @deprecated use getDefaultCurrencyByUserGroup instead- */+ #[Deprecated(message: 'use getDefaultCurrencyByUserGroup instead')]public function getDefaultCurrencyByUser(User $user): TransactionCurrency{return $this->getDefaultCurrencyByUserGroup($user->userGroup);}- /**- * @deprecated- */+ #[Deprecated]public function getDefaultCurrencyByUserGroup(UserGroup $userGroup): TransactionCurrency{return $this->getNativeCurrencyByUserGroup($userGroup);diff --git a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.phpindex afd96bcf59..3d5d40db50 100644--- a/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php+++ b/app/Support/JsonApi/Enrichments/TransactionGroupEnrichment.php@@ -54,7 +54,7 @@ class TransactionGroupEnrichment implements EnrichmentInterfaceprivate array $notes; // @phpstan-ignore-lineprivate array $tags;private User $user;- private TransactionCurrency $nativeCurrency;+ private readonly TransactionCurrency $nativeCurrency;private UserGroup $userGroup;public function __construct()diff --git a/app/User.php b/app/User.phpindex fd7221c9ef..3ebadaf347 100644--- a/app/User.php+++ b/app/User.php@@ -24,6 +24,7 @@ declare(strict_types=1);namespace FireflyIII;+use Deprecated;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Events\RequestedNewPassword;use FireflyIII\Exceptions\FireflyException;@@ -188,9 +189,8 @@ class User extends Authenticatable* Get the models LDAP domain.** @return string- *- * @deprecated*/+ #[Deprecated]public function getLdapDomain(){return $this->{$this->getLdapDomainColumn()};@@ -200,9 +200,8 @@ class User extends Authenticatable* Get the database column name of the domain.** @return string- *- * @deprecated*/+ #[Deprecated]public function getLdapDomainColumn(){return 'domain';@@ -212,9 +211,8 @@ class User extends Authenticatable* Get the models LDAP GUID.** @return string- *- * @deprecated*/+ #[Deprecated]public function getLdapGuid(){return $this->{$this->getLdapGuidColumn()};@@ -224,9 +222,8 @@ class User extends Authenticatable* Get the models LDAP GUID database column name.** @return string- *- * @deprecated*/+ #[Deprecated]public function getLdapGuidColumn(){return 'objectguid';@@ -468,9 +465,8 @@ class User extends Authenticatable* Set the models LDAP domain.** @param string $domain- *- * @deprecated*/+ #[Deprecated]public function setLdapDomain($domain): void{$this->{$this->getLdapDomainColumn()} = $domain;@@ -480,9 +476,8 @@ class User extends Authenticatable* Set the models LDAP GUID.** @param string $guid- *- * @deprecated*/+ #[Deprecated]public function setLdapGuid($guid): void{$this->{$this->getLdapGuidColumn()} = $guid;