Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-06-12
JC5657b95485cda
diff --git a/app/Api/V1/Controllers/Chart/AccountController.php b/app/Api/V1/Controllers/Chart/AccountController.phpindex 4f6a1ab509..5b0c35373c 100644--- a/app/Api/V1/Controllers/Chart/AccountController.php+++ b/app/Api/V1/Controllers/Chart/AccountController.php@@ -162,7 +162,7 @@ class AccountController extends Controller$defaultSet = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray();/** @var Preference $frontpage */- $frontpage = Preferences::get('frontpageAccounts', $defaultSet);+ $frontpage = Preferences::get('frontpageAccounts', $defaultSet);if (!(is_array($frontpage->data) && count($frontpage->data) > 0)) {$frontpage->data = $defaultSet;diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.phpindex a9022ed2af..fbdde03e1c 100644--- a/app/Exceptions/Handler.php+++ b/app/Exceptions/Handler.php@@ -59,11 +59,12 @@ use function Safe\parse_url;class Handler extends ExceptionHandler{public static ?Throwable $lastError = null;+/*** @var array<int, class-string<Throwable>>*/protected $dontReport- = [+ = [AuthenticationException::class,LaravelValidationException::class,NotFoundHttpException::class,@@ -217,13 +218,13 @@ class Handler extends ExceptionHandlerpublic function report(Throwable $e): void{self::$lastError = $e;- $doMailError = (bool) config('firefly.send_error_message');+ $doMailError = (bool) config('firefly.send_error_message');if ($this->shouldntReportLocal($e) || !$doMailError) {parent::report($e);return;}- $userData = [+ $userData = ['id' => 0,'email' => '[email protected]',];@@ -232,9 +233,9 @@ class Handler extends ExceptionHandler$userData['email'] = auth()->user()->email;}- $headers = request()->headers->all();+ $headers = request()->headers->all();- $data = [+ $data = ['class' => $e::class,'errorMessage' => $e->getMessage(),'time' => Carbon::now()->format('r'),@@ -252,8 +253,8 @@ class Handler extends ExceptionHandler];// create job that will mail.- $ipAddress = request()->ip() ?? '0.0.0.0';- $job = new MailError($userData, (string) config('firefly.site_owner'), $ipAddress, $data);+ $ipAddress = request()->ip() ?? '0.0.0.0';+ $job = new MailError($userData, (string) config('firefly.site_owner'), $ipAddress, $data);dispatch($job);parent::report($e);diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.phpindex 75d23b70e1..6957627628 100644--- a/app/Http/Middleware/Authenticate.php+++ b/app/Http/Middleware/Authenticate.php@@ -101,6 +101,7 @@ class Authenticateif ($result) {$user = $this->auth->guard($guard)->user();$this->validateBlockedUser($user, $guards);+// According to PHPstan the method returns void, but we'll see.return $this->auth->shouldUse($guard); // @phpstan-ignore-line}@@ -109,7 +110,7 @@ class Authenticate// this is a massive hack, but if the hander has the oauth exception// at this point we can report its error instead of a generic one.$message = 'Unauthenticated.';- if(Handler::$lastError instanceof OAuthServerException) {+ if (Handler::$lastError instanceof OAuthServerException) {$message = Handler::$lastError->getHint();}diff --git a/composer.lock b/composer.lockindex 719e779ea1..c5ec11d427 100644--- a/composer.lock+++ b/composer.lock@@ -939,16 +939,16 @@},{"name": "filp/whoops",- "version": "2.18.1",+ "version": "2.18.2","source": {"type": "git","url": "https://github.com/filp/whoops.git",- "reference": "8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26"+ "reference": "89dabca1490bc77dbcab41c2b20968c7e44bf7c3"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/filp/whoops/zipball/8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26",- "reference": "8fcc6a862f2e7b94eb4221fd0819ddba3d30ab26",+ "url": "https://api.github.com/repos/filp/whoops/zipball/89dabca1490bc77dbcab41c2b20968c7e44bf7c3",+ "reference": "89dabca1490bc77dbcab41c2b20968c7e44bf7c3","shasum": ""},"require": {@@ -998,7 +998,7 @@],"support": {"issues": "https://github.com/filp/whoops/issues",- "source": "https://github.com/filp/whoops/tree/2.18.1"+ "source": "https://github.com/filp/whoops/tree/2.18.2"},"funding": [{@@ -1006,7 +1006,7 @@"type": "github"}],- "time": "2025-06-03T18:56:14+00:00"+ "time": "2025-06-11T20:42:19+00:00"},{"name": "firebase/php-jwt",@@ -3711,16 +3711,16 @@},{"name": "nesbot/carbon",- "version": "3.9.1",+ "version": "3.10.0","source": {"type": "git","url": "https://github.com/CarbonPHP/carbon.git",- "reference": "ced71f79398ece168e24f7f7710462f462310d4d"+ "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ced71f79398ece168e24f7f7710462f462310d4d",- "reference": "ced71f79398ece168e24f7f7710462f462310d4d",+ "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/c1397390dd0a7e0f11660f0ae20f753d88c1f3d9",+ "reference": "c1397390dd0a7e0f11660f0ae20f753d88c1f3d9","shasum": ""},"require": {@@ -3728,9 +3728,9 @@"ext-json": "*","php": "^8.1","psr/clock": "^1.0",- "symfony/clock": "^6.3 || ^7.0",+ "symfony/clock": "^6.3.12 || ^7.0","symfony/polyfill-mbstring": "^1.0",- "symfony/translation": "^4.4.18 || ^5.2.1|| ^6.0 || ^7.0"+ "symfony/translation": "^4.4.18 || ^5.2.1 || ^6.0 || ^7.0"},"provide": {"psr/clock-implementation": "1.0"@@ -3738,14 +3738,13 @@"require-dev": {"doctrine/dbal": "^3.6.3 || ^4.0","doctrine/orm": "^2.15.2 || ^3.0",- "friendsofphp/php-cs-fixer": "^3.57.2",+ "friendsofphp/php-cs-fixer": "^3.75.0","kylekatarnls/multi-tester": "^2.5.3",- "ondrejmirtes/better-reflection": "^6.25.0.4","phpmd/phpmd": "^2.15.0",- "phpstan/extension-installer": "^1.3.1",- "phpstan/phpstan": "^1.11.2",- "phpunit/phpunit": "^10.5.20",- "squizlabs/php_codesniffer": "^3.9.0"+ "phpstan/extension-installer": "^1.4.3",+ "phpstan/phpstan": "^2.1.17",+ "phpunit/phpunit": "^10.5.46",+ "squizlabs/php_codesniffer": "^3.13.0"},"bin": ["bin/carbon"@@ -3813,7 +3812,7 @@"type": "tidelift"}],- "time": "2025-05-01T19:51:51+00:00"+ "time": "2025-06-12T10:24:28+00:00"},{"name": "nette/schema",diff --git a/config/firefly.php b/config/firefly.phpindex 1bcc8c1c0f..95155172f1 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,7 +78,7 @@ return ['running_balance_column' => env('USE_RUNNING_BALANCE', false),// see cer.php for exchange rates feature flag.],- 'version' => '6.2.17',+ 'version' => 'develop/2025-06-12','api_version' => '2.1.0', // field is no longer used.'db_version' => 25,diff --git a/package-lock.json b/package-lock.jsonindex 08f5b60b5b..c99d616286 100644--- a/package-lock.json+++ b/package-lock.json@@ -3108,9 +3108,9 @@"license": "MIT"},"node_modules/@types/node": {- "version": "24.0.0",- "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.0.tgz",- "integrity": "sha512-yZQa2zm87aRVcqDyH5+4Hv9KYgSdgwX1rFnGvpbzMaC7YAljmhBET93TPiTd3ObwTL+gSpIzPKg5BqVxdCvxKg==",+ "version": "24.0.1",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.0.1.tgz",+ "integrity": "sha512-MX4Zioh39chHlDJbKmEgydJDS3tspMP/lnQC67G3SWsTnb9NeYVWOjkxpOSy4oMfPs4StcWHwBrvUb4ybfnuaw==","dev": true,"license": "MIT","dependencies": {@@ -7155,9 +7155,9 @@}},"node_modules/immutable": {- "version": "5.1.2",- "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.2.tgz",- "integrity": "sha512-qHKXW1q6liAk1Oys6umoaZbDRqjcjgSrbnrifHsfsttza7zcvRAsL7mMV6xWcyhwQy7Xj5v4hhbr6b+iDYwlmQ==",+ "version": "5.1.3",+ "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz",+ "integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==","dev": true,"license": "MIT"},@@ -8857,9 +8857,9 @@}},"node_modules/postcss": {- "version": "8.5.4",- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.4.tgz",- "integrity": "sha512-QSa9EBe+uwlGTFmHsPKokv3B/oEMQZxfqW0QqNCyhpa6mB1afzulwn8hihglqAb2pOw+BJgNlmXQ8la2VeHB7w==",+ "version": "8.5.5",+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.5.tgz",+ "integrity": "sha512-d/jtm+rdNT8tpXuHY5MMtcbJFBkhXE6593XVR9UoGCH8jSFGci7jGvMGH5RYd5PBJW+00NZQt6gf7CbagJCrhg==","dev": true,"funding": [{