Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2026-08-15
JC5a7983f6d411a
diff --git a/app/Api/V1/Controllers/Autocomplete/AccountController.php b/app/Api/V1/Controllers/Autocomplete/AccountController.phpindex 532d7f9a6e..667763ab6d 100644--- a/app/Api/V1/Controllers/Autocomplete/AccountController.php+++ b/app/Api/V1/Controllers/Autocomplete/AccountController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\AccountTypeEnum;@@ -38,6 +37,7 @@ use FireflyIII\Support\Http\Api\AccountFilter;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;+use Override;/*** Class AccountControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/BillController.php b/app/Api/V1/Controllers/Autocomplete/BillController.phpindex 35ebcc614f..694dbcebe3 100644--- a/app/Api/V1/Controllers/Autocomplete/BillController.php+++ b/app/Api/V1/Controllers/Autocomplete/BillController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;@@ -32,6 +31,7 @@ use FireflyIII\Models\Bill;use FireflyIII\Repositories\Bill\BillRepositoryInterface;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class BillControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/BudgetController.php b/app/Api/V1/Controllers/Autocomplete/BudgetController.phpindex cf8ae73936..92ed277ee4 100644--- a/app/Api/V1/Controllers/Autocomplete/BudgetController.php+++ b/app/Api/V1/Controllers/Autocomplete/BudgetController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;@@ -32,6 +31,7 @@ use FireflyIII\Models\Budget;use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class BudgetControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/CategoryController.php b/app/Api/V1/Controllers/Autocomplete/CategoryController.phpindex a33ed248c7..c8ccd50e78 100644--- a/app/Api/V1/Controllers/Autocomplete/CategoryController.php+++ b/app/Api/V1/Controllers/Autocomplete/CategoryController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;@@ -32,6 +31,7 @@ use FireflyIII\Models\Category;use FireflyIII\Repositories\Category\CategoryRepositoryInterface;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class CategoryControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php b/app/Api/V1/Controllers/Autocomplete/CurrencyController.phpindex e242421945..02b4ef0657 100644--- a/app/Api/V1/Controllers/Autocomplete/CurrencyController.php+++ b/app/Api/V1/Controllers/Autocomplete/CurrencyController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use Deprecated;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;@@ -34,6 +33,7 @@ use FireflyIII\Models\TransactionCurrency;use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class CurrencyControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.phpindex a2222c9e37..e015bd46c9 100644--- a/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php+++ b/app/Api/V1/Controllers/Autocomplete/ObjectGroupController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;@@ -32,6 +31,7 @@ use FireflyIII\Models\ObjectGroup;use FireflyIII\Repositories\ObjectGroup\ObjectGroupRepositoryInterface;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class ObjectGroupControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.phpindex 8f46e12234..5c879b0f0b 100644--- a/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php+++ b/app/Api/V1/Controllers/Autocomplete/PiggyBankController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;@@ -35,6 +34,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;use FireflyIII\Support\Facades\Amount;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class PiggyBankControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.phpindex f1e60c8bda..29600b36fe 100644--- a/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php+++ b/app/Api/V1/Controllers/Autocomplete/RecurrenceController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;@@ -32,6 +31,7 @@ use FireflyIII\Models\Recurrence;use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class RecurrenceControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/RuleController.php b/app/Api/V1/Controllers/Autocomplete/RuleController.phpindex 1aded334e6..c371217df8 100644--- a/app/Api/V1/Controllers/Autocomplete/RuleController.php+++ b/app/Api/V1/Controllers/Autocomplete/RuleController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;@@ -32,6 +31,7 @@ use FireflyIII\Models\Rule;use FireflyIII\Repositories\Rule\RuleRepositoryInterface;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class RuleControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.phpindex 22d04d02c4..dd7f602580 100644--- a/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php+++ b/app/Api/V1/Controllers/Autocomplete/RuleGroupController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;@@ -32,6 +31,7 @@ use FireflyIII\Models\RuleGroup;use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class RuleGroupControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/TagController.php b/app/Api/V1/Controllers/Autocomplete/TagController.phpindex 667ecf6553..a4f455c73e 100644--- a/app/Api/V1/Controllers/Autocomplete/TagController.php+++ b/app/Api/V1/Controllers/Autocomplete/TagController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;@@ -32,6 +31,7 @@ use FireflyIII\Models\Tag;use FireflyIII\Repositories\Tag\TagRepositoryInterface;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class TagControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/TransactionController.php b/app/Api/V1/Controllers/Autocomplete/TransactionController.phpindex ee4fb7e952..df3e36b45c 100644--- a/app/Api/V1/Controllers/Autocomplete/TransactionController.php+++ b/app/Api/V1/Controllers/Autocomplete/TransactionController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteTransactionApiRequest;@@ -36,6 +35,7 @@ use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterfaceuse Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Support\Collection;+use Override;/*** Class TransactionControllerdiff --git a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.phpindex a923d76d84..a21990d1ad 100644--- a/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php+++ b/app/Api/V1/Controllers/Autocomplete/TransactionTypeController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Autocomplete;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteApiRequest;use FireflyIII\Enums\UserRoleEnum;@@ -32,6 +31,7 @@ use FireflyIII\Models\TransactionType;use FireflyIII\Repositories\TransactionType\TransactionTypeRepositoryInterface;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class TransactionTypeControllerdiff --git a/app/Api/V1/Controllers/Chart/BalanceController.php b/app/Api/V1/Controllers/Chart/BalanceController.phpindex dc294c030a..7885bab44a 100644--- a/app/Api/V1/Controllers/Chart/BalanceController.php+++ b/app/Api/V1/Controllers/Chart/BalanceController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Chart;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Chart\ChartRequest;use FireflyIII\Enums\TransactionTypeEnum;@@ -37,6 +36,7 @@ use FireflyIII\Support\Http\Api\CleansChartData;use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class BalanceControllerdiff --git a/app/Api/V1/Controllers/Chart/BudgetController.php b/app/Api/V1/Controllers/Chart/BudgetController.phpindex d2231465b8..bad1304a1d 100644--- a/app/Api/V1/Controllers/Chart/BudgetController.php+++ b/app/Api/V1/Controllers/Chart/BudgetController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Chart;-use Override;use Carbon\Carbon;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\DateRangeRequest;@@ -44,6 +43,7 @@ use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Support\Collection;use Illuminate\Support\Facades\Log;+use Override;/*** Class BudgetControllerdiff --git a/app/Api/V1/Controllers/Chart/CategoryController.php b/app/Api/V1/Controllers/Chart/CategoryController.phpindex 13470d62ee..f2c96f179d 100644--- a/app/Api/V1/Controllers/Chart/CategoryController.php+++ b/app/Api/V1/Controllers/Chart/CategoryController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Chart;-use Override;use Carbon\Carbon;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\DateRangeRequest;@@ -42,6 +41,7 @@ use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;+use Override;/*** Class BudgetControllerdiff --git a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php b/app/Api/V1/Controllers/Data/Bulk/TransactionController.phpindex f6919e1ac7..8e2b194e93 100644--- a/app/Api/V1/Controllers/Data/Bulk/TransactionController.php+++ b/app/Api/V1/Controllers/Data/Bulk/TransactionController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Data\Bulk;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Data\Bulk\TransactionRequest;use FireflyIII\Enums\UserRoleEnum;@@ -32,6 +31,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Services\Internal\Destroy\AccountDestroyService;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class TransactionControllerdiff --git a/app/Api/V1/Controllers/Data/DestroyController.php b/app/Api/V1/Controllers/Data/DestroyController.phpindex 8032cafc76..494f1a91b3 100644--- a/app/Api/V1/Controllers/Data/DestroyController.php+++ b/app/Api/V1/Controllers/Data/DestroyController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Data;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Data\DestroyRequest;use FireflyIII\Enums\AccountTypeEnum;@@ -51,6 +50,7 @@ use FireflyIII\Support\Facades\Preferences;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Support\Facades\Log;+use Override;/*** Class DestroyControllerdiff --git a/app/Api/V1/Controllers/Data/Export/ExportController.php b/app/Api/V1/Controllers/Data/Export/ExportController.phpindex 271a8c7164..c3c7ce42e7 100644--- a/app/Api/V1/Controllers/Data/Export/ExportController.php+++ b/app/Api/V1/Controllers/Data/Export/ExportController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Data\Export;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;use FireflyIII\Enums\UserRoleEnum;@@ -32,6 +31,7 @@ use FireflyIII\Exceptions\FireflyException;use FireflyIII\Support\Export\ExportDataGenerator;use Illuminate\Http\Request;use Illuminate\Http\Response as LaravelResponse;+use Override;use Safe\Exceptions\DatetimeException;use function Safe\date;diff --git a/app/Api/V1/Controllers/Data/PurgeController.php b/app/Api/V1/Controllers/Data/PurgeController.phpindex 7493b02cad..d3d81457e6 100644--- a/app/Api/V1/Controllers/Data/PurgeController.php+++ b/app/Api/V1/Controllers/Data/PurgeController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Data;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Models\Account;@@ -42,6 +41,7 @@ use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;use FireflyIII\User;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;/*** Class PurgeControllerdiff --git a/app/Api/V1/Controllers/Insight/Income/TagController.php b/app/Api/V1/Controllers/Insight/Income/TagController.phpindex 94be2ae461..df99eef909 100644--- a/app/Api/V1/Controllers/Insight/Income/TagController.php+++ b/app/Api/V1/Controllers/Insight/Income/TagController.php@@ -158,10 +158,7 @@ final class TagController extends Controller'currency_id' => (string) $foreignCurrencyId,'currency_code' => $journal['foreign_currency_code'],];- $response[$foreignKey]['difference'] = bcadd(- (string) $response[$foreignKey]['difference'],- Steam::positive($journal['foreign_amount'])- );+ $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];}}diff --git a/app/Api/V1/Controllers/Insight/Transfer/TagController.php b/app/Api/V1/Controllers/Insight/Transfer/TagController.phpindex b7b85fd376..f92a7aa9f0 100644--- a/app/Api/V1/Controllers/Insight/Transfer/TagController.php+++ b/app/Api/V1/Controllers/Insight/Transfer/TagController.php@@ -155,10 +155,7 @@ final class TagController extends Controller'currency_id' => (string) $foreignCurrencyId,'currency_code' => $journal['foreign_currency_code'],];- $response[$foreignKey]['difference'] = bcadd(- (string) $response[$foreignKey]['difference'],- Steam::positive($journal['foreign_amount'])- );+ $response[$foreignKey]['difference'] = bcadd((string) $response[$foreignKey]['difference'], Steam::positive($journal['foreign_amount']));$response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float}}diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.phpindex fb38722383..94aed4d919 100644--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;-use Override;use Carbon\Carbon;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\DestroyRequest;@@ -37,6 +36,7 @@ use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;final class DestroyController extends Controller{diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.phpindex d83c6d81e2..f426a86476 100644--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/IndexController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Enums\UserRoleEnum;use FireflyIII\Repositories\ExchangeRate\ExchangeRateRepositoryInterface;@@ -33,6 +32,7 @@ use FireflyIII\Transformers\ExchangeRateTransformer;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Pagination\LengthAwarePaginator;+use Override;/*** Class ShowControllerdiff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.phpindex 448e74bdb1..4b44b64d02 100644--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/ShowController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;-use Override;use Carbon\Carbon;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Enums\UserRoleEnum;@@ -36,6 +35,7 @@ use FireflyIII\Transformers\ExchangeRateTransformer;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Pagination\LengthAwarePaginator;+use Override;use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;/**diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.phpindex 4b7c7efddb..c400d41f36 100644--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/StoreController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;-use Override;use Carbon\Carbon;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\StoreByCurrenciesRequest;@@ -43,6 +42,7 @@ use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;use Illuminate\Pagination\LengthAwarePaginator;use Illuminate\Support\Collection;+use Override;final class StoreController extends Controller{diff --git a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.phpindex eccaf286a1..701a56fe11 100644--- a/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php+++ b/app/Api/V1/Controllers/Models/CurrencyExchangeRate/UpdateController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\CurrencyExchangeRate;-use Override;use Carbon\Carbon;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Models\CurrencyExchangeRate\UpdateRequest;@@ -37,6 +36,7 @@ use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;use FireflyIII\Transformers\ExchangeRateTransformer;use Illuminate\Http\JsonResponse;use Illuminate\Http\Request;+use Override;use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;final class UpdateController extends Controllerdiff --git a/app/Api/V1/Controllers/Models/Transaction/StoreController.php b/app/Api/V1/Controllers/Models/Transaction/StoreController.phpindex b961f8a4ab..e21ae4cf32 100644--- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php+++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Transaction;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Models\Transaction\StoreRequest;use FireflyIII\Enums\UserRoleEnum;@@ -43,6 +42,7 @@ use Illuminate\Support\Facades\Log;use Illuminate\Support\Facades\Validator;use Illuminate\Validation\ValidationException;use League\Fractal\Resource\Item;+use Override;use Symfony\Component\HttpKernel\Exception\GoneHttpException;use Symfony\Component\HttpKernel\Exception\HttpException;diff --git a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php b/app/Api/V1/Controllers/Models/Transaction/UpdateController.phpindex ca86eb6544..bd63b29f98 100644--- a/app/Api/V1/Controllers/Models/Transaction/UpdateController.php+++ b/app/Api/V1/Controllers/Models/Transaction/UpdateController.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII\Api\V1\Controllers\Models\Transaction;-use Override;use FireflyIII\Api\V1\Controllers\Controller;use FireflyIII\Api\V1\Requests\Models\Transaction\UpdateRequest;use FireflyIII\Events\Model\TransactionGroup\TransactionGroupEventFlags;@@ -41,6 +40,7 @@ use FireflyIII\User;use Illuminate\Http\JsonResponse;use Illuminate\Support\Facades\Log;use League\Fractal\Resource\Item;+use Override;use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;/**diff --git a/app/Http/Controllers/Budget/BudgetLimitController.php b/app/Http/Controllers/Budget/BudgetLimitController.phpindex 04d75cd738..de7337738f 100644--- a/app/Http/Controllers/Budget/BudgetLimitController.php+++ b/app/Http/Controllers/Budget/BudgetLimitController.php@@ -198,13 +198,7 @@ final class BudgetLimitController extends Controllerif ($request->expectsJson()) {$array = $limit->toArray();// add some extra metadata:- $spentArr = $this->opsRepository->sumExpenses(- $limit->start_date,- $limit->end_date,- null,- new Collection()->push($budget),- $currency- );+ $spentArr = $this->opsRepository->sumExpenses($limit->start_date, $limit->end_date, null, new Collection()->push($budget), $currency);$array['spent'] = $spentArr[$currency->id]['sum'] ?? '0';$array['left_formatted'] = Amount::formatAnything($limit->transactionCurrency, bcadd($array['spent'], (string) $array['amount']));$array['amount_formatted'] = Amount::formatAnything($limit->transactionCurrency, $limit['amount']);diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.phpindex d40d4432a3..215ebbd484 100644--- a/app/Http/Controllers/Budget/IndexController.php+++ b/app/Http/Controllers/Budget/IndexController.php@@ -284,10 +284,7 @@ final class IndexController extends Controllerif (array_key_exists($currency->id, $spentArr) && array_key_exists('sum', $spentArr[$currency->id])) {$array['spent'][$currency->id]['spent'] = $spentArr[$currency->id]['sum'];- $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub(- $spentInLimits[$currency->id],- $spentArr[$currency->id]['sum']- ));+ $array['spent'][$currency->id]['spent_outside'] = Steam::negative(bcsub($spentInLimits[$currency->id], $spentArr[$currency->id]['sum']));$array['spent'][$currency->id]['currency_id'] = $currency->id;$array['spent'][$currency->id]['currency_symbol'] = $currency->symbol;$array['spent'][$currency->id]['currency_decimal_places'] = $currency->decimal_places;diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.phpindex f4b32fe5c5..ad724137dc 100644--- a/app/Http/Controllers/Chart/BudgetController.php+++ b/app/Http/Controllers/Chart/BudgetController.php@@ -539,13 +539,7 @@ final class BudgetController extends Controller}// get spent amount in this period for this currency.- $sum = $this->opsRepository->sumExpenses(- $currentStart,- $currentEnd,- $accounts,- new Collection()->push($budget),- $currency- );+ $sum = $this->opsRepository->sumExpenses($currentStart, $currentEnd, $accounts, new Collection()->push($budget), $currency);$amount = Steam::positive($sum[$currency->id]['sum'] ?? '0');$chartData[0]['entries'][$title] = Steam::bcround($amount, $currency->decimal_places);diff --git a/app/Jobs/CreateAutoBudgetLimits.php b/app/Jobs/CreateAutoBudgetLimits.phpindex d61661dd50..93cf5e9364 100644--- a/app/Jobs/CreateAutoBudgetLimits.php+++ b/app/Jobs/CreateAutoBudgetLimits.php@@ -122,13 +122,7 @@ class CreateAutoBudgetLimits implements ShouldQueue// if has one, calculate expenses and use that as a base.$repository = app(OperationsRepositoryInterface::class);$repository->setUser($autoBudget->budget->user);- $spent = $repository->sumExpenses(- $previousStart,- $previousEnd,- null,- new Collection()->push($autoBudget->budget),- $autoBudget->transactionCurrency- );+ $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);$currencyId = $autoBudget->transaction_currency_id;$spentAmount = $spent[$currencyId]['sum'] ?? '0';Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));@@ -218,13 +212,7 @@ class CreateAutoBudgetLimits implements ShouldQueue// if has one, calculate expenses and use that as a base.$repository = app(OperationsRepositoryInterface::class);$repository->setUser($autoBudget->budget->user);- $spent = $repository->sumExpenses(- $previousStart,- $previousEnd,- null,- new Collection()->push($autoBudget->budget),- $autoBudget->transactionCurrency- );+ $spent = $repository->sumExpenses($previousStart, $previousEnd, null, new Collection()->push($autoBudget->budget), $autoBudget->transactionCurrency);$currencyId = $autoBudget->transaction_currency_id;$spentAmount = $spent[$currencyId]['sum'] ?? '0';Log::debug(sprintf('Spent in previous budget period (%s-%s) is %s', $previousStart->format('Y-m-d'), $previousEnd->format('Y-m-d'), $spentAmount));diff --git a/app/Support/Http/Controllers/AugumentData.php b/app/Support/Http/Controllers/AugumentData.phpindex a507156873..a3a940b1ba 100644--- a/app/Support/Http/Controllers/AugumentData.php+++ b/app/Support/Http/Controllers/AugumentData.php@@ -222,14 +222,7 @@ trait AugumentData$currentEnd->addMonth();}// primary currency amount.- $expenses = $opsRepository->sumExpenses(- $currentStart,- $currentEnd,- null,- $budgetCollection,- $entry->transactionCurrency,- $this->convertToPrimary- );+ $expenses = $opsRepository->sumExpenses($currentStart, $currentEnd, null, $budgetCollection, $entry->transactionCurrency, $this->convertToPrimary);$spent = $expenses[$currency->id]['sum'] ?? '0';$entry->pc_spent = $spent;diff --git a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php b/app/Support/JsonApi/Enrichments/RecurringEnrichment.phpindex 2428353cb0..d0c09bf027 100644--- a/app/Support/JsonApi/Enrichments/RecurringEnrichment.php+++ b/app/Support/JsonApi/Enrichments/RecurringEnrichment.php@@ -354,11 +354,7 @@ class RecurringEnrichment implements EnrichmentInterface/** @var RecurrenceRepetition $repetition */foreach ($set as $repetition) {- $recurrence = $this->collection->filter(- static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id- )- ->first()- ;+ $recurrence = $this->collection->filter(static fn (Recurrence $item): bool => (int) $item->id === (int) $repetition->recurrence_id)->first();$fromDate = clone ($recurrence->latest_date ?? $recurrence->first_date);$recurrenceId = (int) $repetition->recurrence_id;$repId = (int) $repetition->id;diff --git a/app/User.php b/app/User.phpindex 732353b2eb..729a7874cf 100644--- a/app/User.php+++ b/app/User.php@@ -24,7 +24,6 @@ declare(strict_types=1);namespace FireflyIII;-use Override;use Deprecated;use Exception;use FireflyIII\Enums\UserRoleEnum;@@ -72,6 +71,7 @@ use Illuminate\Support\Str;use Laravel\Passport\Contracts\OAuthenticatable;use Laravel\Passport\HasApiTokens;use NotificationChannels\Pushover\PushoverReceiver;+use Override;use SensitiveParameter;use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;diff --git a/composer.lock b/composer.lockindex bf356a2705..f28a821348 100644--- a/composer.lock+++ b/composer.lock@@ -4833,16 +4833,16 @@},{"name": "pragmarx/google2fa",- "version": "v9.0.0",+ "version": "v9.1.0","source": {"type": "git","url": "https://github.com/antonioribeiro/google2fa.git",- "reference": "e6bc62dd6ae83acc475f57912e27466019a1f2cf"+ "reference": "f00bc788c555adfb6765c437ff3538e59cd88af1"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/e6bc62dd6ae83acc475f57912e27466019a1f2cf",- "reference": "e6bc62dd6ae83acc475f57912e27466019a1f2cf",+ "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/f00bc788c555adfb6765c437ff3538e59cd88af1",+ "reference": "f00bc788c555adfb6765c437ff3538e59cd88af1","shasum": ""},"require": {@@ -4850,8 +4850,11 @@"php": "^7.1|^8.0"},"require-dev": {- "phpstan/phpstan": "^1.9",- "phpunit/phpunit": "^7.5.15|^8.5|^9.0"+ "phpstan/phpstan": "^1.0|^2.0",+ "phpstan/phpstan-phpunit": "^1.0|^2.0",+ "phpunit/phpunit": "~9|~10|~11|~12|~13",+ "psalm/plugin-phpunit": "^0.19|^0.20",+ "vimeo/psalm": "^5.26|^6.13"},"type": "library","autoload": {@@ -4874,14 +4877,23 @@"keywords": ["2fa","Authentication",+ "MFA","Two Factor Authentication",- "google2fa"+ "google-authenticator",+ "google2fa",+ "hotp",+ "otp",+ "rfc4226",+ "rfc6238",+ "totp"],"support": {+ "docs": "https://github.com/antonioribeiro/google2fa#readme","issues": "https://github.com/antonioribeiro/google2fa/issues",- "source": "https://github.com/antonioribeiro/google2fa/tree/v9.0.0"+ "security": "https://github.com/antonioribeiro/google2fa/security/policy",+ "source": "https://github.com/antonioribeiro/google2fa"},- "time": "2025-09-19T22:51:08+00:00"+ "time": "2026-08-15T13:22:01+00:00"},{"name": "pragmarx/google2fa-qrcode",@@ -5020,16 +5032,16 @@},{"name": "predis/predis",- "version": "v3.5.1",+ "version": "v3.6.0","source": {"type": "git","url": "https://github.com/predis/predis.git",- "reference": "5c996db191ee2d9bafe651f454b1fca16754271b"+ "reference": "2ff20c08bb63697245ffee3f198d1673086c302d"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/predis/predis/zipball/5c996db191ee2d9bafe651f454b1fca16754271b",- "reference": "5c996db191ee2d9bafe651f454b1fca16754271b",+ "url": "https://api.github.com/repos/predis/predis/zipball/2ff20c08bb63697245ffee3f198d1673086c302d",+ "reference": "2ff20c08bb63697245ffee3f198d1673086c302d","shasum": ""},"require": {@@ -5071,7 +5083,7 @@],"support": {"issues": "https://github.com/predis/predis/issues",- "source": "https://github.com/predis/predis/tree/v3.5.1"+ "source": "https://github.com/predis/predis/tree/v3.6.0"},"funding": [{@@ -5079,7 +5091,7 @@"type": "github"}],- "time": "2026-06-11T16:56:53+00:00"+ "time": "2026-08-14T23:07:56+00:00"},{"name": "psr/cache",@@ -10632,19 +10644,21 @@},{"name": "hamcrest/hamcrest-php",- "version": "v2.1.1",+ "version": "v3.0.0","source": {"type": "git","url": "https://github.com/hamcrest/hamcrest-php.git",- "reference": "f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487"+ "reference": "b61cd040da1a4925bc90a51c074f5297e7c0fa52"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487",- "reference": "f8b1c0173b22fa6ec77a81fe63e5b01eba7e6487",+ "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/b61cd040da1a4925bc90a51c074f5297e7c0fa52",+ "reference": "b61cd040da1a4925bc90a51c074f5297e7c0fa52","shasum": ""},"require": {+ "ext-ctype": "*",+ "ext-dom": "*","php": "^7.4|^8.0"},"replace": {@@ -10653,13 +10667,15 @@"kodova/hamcrest-php": "*"},"require-dev": {+ "phpstan/phpstan": "^2.1",+ "phpstan/phpstan-phpunit": "^2.0","phpunit/php-file-iterator": "^1.4 || ^2.0 || ^3.0","phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0 || ^8.0 || ^9.0"},"type": "library","extra": {"branch-alias": {- "dev-master": "2.1-dev"+ "dev-master": "3.0-dev"}},"autoload": {@@ -10677,9 +10693,9 @@],"support": {"issues": "https://github.com/hamcrest/hamcrest-php/issues",- "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.1.1"+ "source": "https://github.com/hamcrest/hamcrest-php/tree/v3.0.0"},- "time": "2025-04-30T06:54:44+00:00"+ "time": "2026-03-17T11:56:53+00:00"},{"name": "iamcal/sql-parser",@@ -10951,29 +10967,28 @@},{"name": "mockery/mockery",- "version": "1.6.12",+ "version": "1.6.13","source": {"type": "git","url": "https://github.com/mockery/mockery.git",- "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699"+ "reference": "9cb54414cdcd2ec5ca292e7ba19dba3a3444885d"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699",- "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699",+ "url": "https://api.github.com/repos/mockery/mockery/zipball/9cb54414cdcd2ec5ca292e7ba19dba3a3444885d",+ "reference": "9cb54414cdcd2ec5ca292e7ba19dba3a3444885d","shasum": ""},"require": {- "hamcrest/hamcrest-php": "^2.0.1",- "lib-pcre": ">=7.0",+ "hamcrest/hamcrest-php": "^2.0 || ^3.0","php": ">=7.3"},"conflict": {"phpunit/phpunit": "<8.0"},"require-dev": {- "phpunit/phpunit": "^8.5 || ^9.6.17",- "symplify/easy-coding-standard": "^12.1.14"+ "phpunit/phpunit": "^9.6.36",+ "symplify/easy-coding-standard": "^13.2.17"},"type": "library","autoload": {@@ -11030,7 +11045,7 @@"security": "https://github.com/mockery/mockery/security/advisories","source": "https://github.com/mockery/mockery"},- "time": "2024-05-16T03:13:13+00:00"+ "time": "2026-08-15T03:07:32+00:00"},{"name": "myclabs/deep-copy",diff --git a/config/firefly.php b/config/firefly.phpindex 25e28677bb..e1c9e01690 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,8 +78,8 @@ return ['running_balance_column' => (bool)env_default_when_empty(env('USE_RUNNING_BALANCE'), true), // this is only the default value, is not used.// see cer.php for exchange rates feature flag.],-'version' => 'develop/2026-08-14',-'build_time' => 1786704844,+'version' => 'develop/2026-08-15',+'build_time' => 1786821199,'api_version' => '2.1.0', // field is no longer used.'db_version' => 28, // field is no longer used.diff --git a/package-lock.json b/package-lock.jsonindex 6e3248afe6..096d0fd2eb 100644--- a/package-lock.json+++ b/package-lock.json@@ -946,9 +946,9 @@}},"node_modules/concurrently": {- "version": "10.0.4",- "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-10.0.4.tgz",- "integrity": "sha512-trZql+7l/0+WRAsAnEdctr4+iiOS6ZrViI6H8QWcCF9MFS/LT0dKpe8vluB1to6it+OxSI4VospFTIFMW8DJRw==",+ "version": "10.0.5",+ "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-10.0.5.tgz",+ "integrity": "sha512-JaP/CoftUrCcAFW/g//RbgEGwlelnEae6cfBLgH6ZdO6s8jPkn6p9SB9u6pdVxYXoiSnFqseOlHfrEfF82TVOg==","dev": true,"license": "MIT","dependencies": {