Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-07-31
JC50c03ec5ddd92
diff --git a/app/Api/V1/Controllers/Models/Bill/ShowController.php b/app/Api/V1/Controllers/Models/Bill/ShowController.phpindex 07b60bb735..2b2988aa79 100644--- a/app/Api/V1/Controllers/Models/Bill/ShowController.php+++ b/app/Api/V1/Controllers/Models/Bill/ShowController.php@@ -118,7 +118,7 @@ class ShowController extends Controller$enrichment->setNative($this->nativeCurrency);$enrichment->setStart($this->parameters->get('start'));$enrichment->setEnd($this->parameters->get('end'));- $bill = $enrichment->enrichSingle($bill);+ $bill = $enrichment->enrichSingle($bill);/** @var BillTransformer $transformer */$transformer = app(BillTransformer::class);diff --git a/app/Api/V1/Controllers/Models/Bill/StoreController.php b/app/Api/V1/Controllers/Models/Bill/StoreController.phpindex a3adea7416..98b02558b2 100644--- a/app/Api/V1/Controllers/Models/Bill/StoreController.php+++ b/app/Api/V1/Controllers/Models/Bill/StoreController.php@@ -83,7 +83,7 @@ class StoreController extends Controller$enrichment->setNative($this->nativeCurrency);$enrichment->setStart($this->parameters->get('start'));$enrichment->setEnd($this->parameters->get('end'));- $bill = $enrichment->enrichSingle($bill);+ $bill = $enrichment->enrichSingle($bill);/** @var BillTransformer $transformer */$transformer = app(BillTransformer::class);diff --git a/app/Api/V1/Controllers/Models/Bill/UpdateController.php b/app/Api/V1/Controllers/Models/Bill/UpdateController.phpindex 1081e1fe5b..f41907b137 100644--- a/app/Api/V1/Controllers/Models/Bill/UpdateController.php+++ b/app/Api/V1/Controllers/Models/Bill/UpdateController.php@@ -78,7 +78,7 @@ class UpdateController extends Controller$enrichment->setNative($this->nativeCurrency);$enrichment->setStart($this->parameters->get('start'));$enrichment->setEnd($this->parameters->get('end'));- $bill = $enrichment->enrichSingle($bill);+ $bill = $enrichment->enrichSingle($bill);/** @var BillTransformer $transformer */$transformer = app(BillTransformer::class);diff --git a/app/Http/Controllers/Bill/IndexController.php b/app/Http/Controllers/Bill/IndexController.phpindex 159a9c5c80..bd89b64edc 100644--- a/app/Http/Controllers/Bill/IndexController.php+++ b/app/Http/Controllers/Bill/IndexController.php@@ -95,7 +95,7 @@ class IndexController extends Controller$enrichment->setNative($this->defaultCurrency);$enrichment->setStart($tempStart);$enrichment->setEnd($end);- $collection = $enrichment->enrich($collection);+ $collection = $enrichment->enrich($collection);$parameters->set('start', $tempStart);diff --git a/app/Http/Controllers/Bill/ShowController.php b/app/Http/Controllers/Bill/ShowController.phpindex bd6cb150c8..bf5306b791 100644--- a/app/Http/Controllers/Bill/ShowController.php+++ b/app/Http/Controllers/Bill/ShowController.php@@ -146,14 +146,14 @@ class ShowController extends Controller// enrich/** @var User $admin */- $admin = auth()->user();- $enrichment = new SubscriptionEnrichment();+ $admin = auth()->user();+ $enrichment = new SubscriptionEnrichment();$enrichment->setUser($admin);$enrichment->setConvertToNative($this->convertToNative);$enrichment->setNative($this->defaultCurrency);$enrichment->setStart($start);$enrichment->setEnd($end);- $bill = $enrichment->enrichSingle($bill);+ $bill = $enrichment->enrichSingle($bill);/** @var BillTransformer $transformer */$transformer = app(BillTransformer::class);diff --git a/composer.lock b/composer.lockindex e554df534e..25e763c963 100644--- a/composer.lock+++ b/composer.lock@@ -11552,16 +11552,16 @@},{"name": "phpunit/phpunit",- "version": "12.2.8",+ "version": "12.2.9","source": {"type": "git","url": "https://github.com/sebastianbergmann/phpunit.git",- "reference": "49dc7c0669b97c7a36f63411635f48eedc140eb4"+ "reference": "442c06d0a952a5dbffba181cff969b91fdc9bada"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/49dc7c0669b97c7a36f63411635f48eedc140eb4",- "reference": "49dc7c0669b97c7a36f63411635f48eedc140eb4",+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/442c06d0a952a5dbffba181cff969b91fdc9bada",+ "reference": "442c06d0a952a5dbffba181cff969b91fdc9bada","shasum": ""},"require": {@@ -11629,7 +11629,7 @@"support": {"issues": "https://github.com/sebastianbergmann/phpunit/issues","security": "https://github.com/sebastianbergmann/phpunit/security/policy",- "source": "https://github.com/sebastianbergmann/phpunit/tree/12.2.8"+ "source": "https://github.com/sebastianbergmann/phpunit/tree/12.2.9"},"funding": [{@@ -11653,7 +11653,7 @@"type": "tidelift"}],- "time": "2025-07-30T05:58:18+00:00"+ "time": "2025-07-31T07:12:16+00:00"},{"name": "rector/rector",diff --git a/config/firefly.php b/config/firefly.phpindex 10c5e0fa02..edd77d6eec 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -79,7 +79,7 @@ return [// see cer.php for exchange rates feature flag.],'version' => 'develop/2025-07-31',- 'build_time' => 1753939947,+ 'build_time' => 1753950885,'api_version' => '2.1.0', // field is no longer used.'db_version' => 26,diff --git a/package-lock.json b/package-lock.jsonindex 94a54d3e98..2cc9829e9a 100644--- a/package-lock.json+++ b/package-lock.json@@ -5700,9 +5700,9 @@"license": "MIT"},"node_modules/electron-to-chromium": {- "version": "1.5.192",- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.192.tgz",- "integrity": "sha512-rP8Ez0w7UNw/9j5eSXCe10o1g/8B1P5SM90PCCMVkIRQn2R0LEHWz4Eh9RnxkniuDe1W0cTSOB3MLlkTGDcuCg==",+ "version": "1.5.193",+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.193.tgz",+ "integrity": "sha512-eePuBZXM9OVCwfYUhd2OzESeNGnWmLyeu0XAEjf7xjijNjHFdeJSzuRUGN4ueT2tEYo5YqjHramKEFxz67p3XA==","dev": true,"license": "ISC"},@@ -6360,9 +6360,9 @@}},"node_modules/follow-redirects": {- "version": "1.15.9",- "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",- "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",+ "version": "1.15.10",+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.10.tgz",+ "integrity": "sha512-V7O/fFKM539IC2bweloFWuoiJ9OtI3W2uIqJPWM8IT5xxNyt73QtvVqmSpcDmk07ivmmlKB+rRY0vpQjIYNtKw==","dev": true,"funding": [{