From 56470bfbba3dc6b3411ab9e84e0e619d69e6c9b1 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 21 Feb 2025 08:32:55 +0100 Subject: [PATCH] Auto commit for release 'develop' on 2025-02-21 --- THANKS.md | 1 + .../Account/ReconcileController.php | 26 +++--- changelog.md | 12 +-- composer.lock | 82 +++++++++---------- config/firefly.php | 2 +- 5 files changed, 62 insertions(+), 61 deletions(-) diff --git a/THANKS.md b/THANKS.md index 08f7d1e678..90d3cf983f 100755 --- a/THANKS.md +++ b/THANKS.md @@ -4,6 +4,7 @@ Over time, many people have contributed to Firefly III. Their efforts are not al Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution. ## 2025 +- Jose Diaz-Gonzalez - SoftBrix ## 2024 diff --git a/app/Http/Controllers/Account/ReconcileController.php b/app/Http/Controllers/Account/ReconcileController.php index 095bfb6c34..8178076bdc 100644 --- a/app/Http/Controllers/Account/ReconcileController.php +++ b/app/Http/Controllers/Account/ReconcileController.php @@ -87,10 +87,10 @@ class ReconcileController extends Controller return redirect(route('accounts.index', [config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type))])); } - $currency = $this->accountRepos->getAccountCurrency($account) ?? $this->defaultCurrency; + $currency = $this->accountRepos->getAccountCurrency($account) ?? $this->defaultCurrency; // no start or end: - $range = app('navigation')->getViewRange(false); + $range = app('navigation')->getViewRange(false); // get start and end @@ -99,7 +99,7 @@ class ReconcileController extends Controller $start = clone session('start', app('navigation')->startOfPeriod(new Carbon(), $range)); /** @var Carbon $end */ - $end = clone session('end', app('navigation')->endOfPeriod(new Carbon(), $range)); + $end = clone session('end', app('navigation')->endOfPeriod(new Carbon(), $range)); } if (null === $end) { /** @var Carbon $end */ @@ -113,15 +113,15 @@ class ReconcileController extends Controller $start->startOfDay(); $end->endOfDay(); - $startDate = clone $start; + $startDate = clone $start; $startDate->subDay()->endOfDay(); // this is correct, subday endofday ends at 23:59:59 // both are validated and are correct. Log::debug(sprintf('reconcile: Call finalAccountBalance with date/time "%s"', $startDate->toIso8601String())); Log::debug(sprintf('reconcile2: Call finalAccountBalance with date/time "%s"', $end->toIso8601String())); - $startBalance = Steam::bcround(Steam::finalAccountBalance($account, $startDate)['balance'], $currency->decimal_places); - $endBalance = Steam::bcround(Steam::finalAccountBalance($account, $end)['balance'], $currency->decimal_places); - $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type)); - $subTitle = (string) trans('firefly.reconcile_account', ['account' => $account->name]); + $startBalance = Steam::bcround(Steam::finalAccountBalance($account, $startDate)['balance'], $currency->decimal_places); + $endBalance = Steam::bcround(Steam::finalAccountBalance($account, $end)['balance'], $currency->decimal_places); + $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type)); + $subTitle = (string) trans('firefly.reconcile_account', ['account' => $account->name]); // various links $transactionsUrl = route('accounts.reconcile.transactions', [$account->id, '%start%', '%end%']); @@ -162,7 +162,7 @@ class ReconcileController extends Controller } app('log')->debug('In ReconcileController::submit()'); - $data = $request->getAll(); + $data = $request->getAll(); /** @var string $journalId */ foreach ($data['journals'] as $journalId) { @@ -217,14 +217,14 @@ class ReconcileController extends Controller } // title: - $description = trans( + $description = trans( 'firefly.reconciliation_transaction_title', [ 'from' => $start->isoFormat($this->monthAndDayFormat), 'to' => $end->isoFormat($this->monthAndDayFormat), ] ); - $submission = [ + $submission = [ 'user' => auth()->user()->id, 'group_title' => null, 'transactions' => [ @@ -247,10 +247,10 @@ class ReconcileController extends Controller ]; /** @var TransactionGroupFactory $factory */ - $factory = app(TransactionGroupFactory::class); + $factory = app(TransactionGroupFactory::class); /** @var User $user */ - $user = auth()->user(); + $user = auth()->user(); $factory->setUser($user); try { diff --git a/changelog.md b/changelog.md index ccf470e37d..19d525e969 100644 --- a/changelog.md +++ b/changelog.md @@ -7,12 +7,12 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Fixed -- #9861 -- #9862 -- #9863 -- #9868 -- #9871 -- #9882 +- [Issue 9861](https://github.com/firefly-iii/firefly-iii/issues/9861) (lower piggy amount when full creates double audit log entry) reported by @4e868df3 +- [Issue 9862](https://github.com/firefly-iii/firefly-iii/issues/9862) (Can't retrieve all accounts with the same name via API) reported by @Toshik1978 +- [Issue 9863](https://github.com/firefly-iii/firefly-iii/issues/9863) (User preferences reset after restart) reported by @mico28 +- [Issue 9868](https://github.com/firefly-iii/firefly-iii/issues/9868) (API: `TransactionSplit` -> `transaction_journal_id` returns int, not String) reported by @dreautall +- [Issue 9871](https://github.com/firefly-iii/firefly-iii/issues/9871) (include net worth is ignored in the API - from PICO developer) reported by @fate8383 +- [Issue 9882](https://github.com/firefly-iii/firefly-iii/issues/9882) (Reconciliation bug on Docker instance) reported by @benjaminteyssier ## 6.2.7 - 2025-02-19 diff --git a/composer.lock b/composer.lock index f25084387e..e8e492b5ba 100644 --- a/composer.lock +++ b/composer.lock @@ -3703,16 +3703,16 @@ }, { "name": "nesbot/carbon", - "version": "3.8.5", + "version": "3.8.6", "source": { "type": "git", "url": "https://github.com/CarbonPHP/carbon.git", - "reference": "b1a53a27898639579a67de42e8ced5d5386aa9a4" + "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/b1a53a27898639579a67de42e8ced5d5386aa9a4", - "reference": "b1a53a27898639579a67de42e8ced5d5386aa9a4", + "url": "https://api.github.com/repos/CarbonPHP/carbon/zipball/ff2f20cf83bd4d503720632ce8a426dc747bf7fd", + "reference": "ff2f20cf83bd4d503720632ce8a426dc747bf7fd", "shasum": "" }, "require": { @@ -3805,7 +3805,7 @@ "type": "tidelift" } ], - "time": "2025-02-11T16:28:45+00:00" + "time": "2025-02-20T17:33:38+00:00" }, { "name": "nette/schema", @@ -6274,23 +6274,23 @@ }, { "name": "spatie/laravel-ignition", - "version": "2.9.0", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "62042df15314b829d0f26e02108f559018e2aad0" + "reference": "1baee07216d6748ebd3a65ba97381b051838707a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/62042df15314b829d0f26e02108f559018e2aad0", - "reference": "62042df15314b829d0f26e02108f559018e2aad0", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/1baee07216d6748ebd3a65ba97381b051838707a", + "reference": "1baee07216d6748ebd3a65ba97381b051838707a", "shasum": "" }, "require": { "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", - "illuminate/support": "^10.0|^11.0", + "illuminate/support": "^10.0|^11.0|^12.0", "php": "^8.1", "spatie/ignition": "^1.15", "symfony/console": "^6.2.3|^7.0", @@ -6299,12 +6299,12 @@ "require-dev": { "livewire/livewire": "^2.11|^3.3.5", "mockery/mockery": "^1.5.1", - "openai-php/client": "^0.8.1", - "orchestra/testbench": "8.22.3|^9.0", - "pestphp/pest": "^2.34", + "openai-php/client": "^0.8.1|^0.10", + "orchestra/testbench": "8.22.3|^9.0|^10.0", + "pestphp/pest": "^2.34|^3.7", "phpstan/extension-installer": "^1.3.1", - "phpstan/phpstan-deprecation-rules": "^1.1.1", - "phpstan/phpstan-phpunit": "^1.3.16", + "phpstan/phpstan-deprecation-rules": "^1.1.1|^2.0", + "phpstan/phpstan-phpunit": "^1.3.16|^2.0", "vlucas/phpdotenv": "^5.5" }, "suggest": { @@ -6361,7 +6361,7 @@ "type": "github" } ], - "time": "2024-12-02T08:43:31+00:00" + "time": "2025-02-20T13:13:55+00:00" }, { "name": "spatie/laravel-package-tools", @@ -10587,40 +10587,40 @@ }, { "name": "larastan/larastan", - "version": "v3.0.4", + "version": "v3.1.0", "source": { "type": "git", "url": "https://github.com/larastan/larastan.git", - "reference": "b394eba5805727423071fac9b53ea50dd7e920f4" + "reference": "dbb2dc20e5c8e1ed3ff289054e1955f269187312" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/larastan/larastan/zipball/b394eba5805727423071fac9b53ea50dd7e920f4", - "reference": "b394eba5805727423071fac9b53ea50dd7e920f4", + "url": "https://api.github.com/repos/larastan/larastan/zipball/dbb2dc20e5c8e1ed3ff289054e1955f269187312", + "reference": "dbb2dc20e5c8e1ed3ff289054e1955f269187312", "shasum": "" }, "require": { "ext-json": "*", - "illuminate/console": "^11.15.0", - "illuminate/container": "^11.15.0", - "illuminate/contracts": "^11.15.0", - "illuminate/database": "^11.15.0", - "illuminate/http": "^11.15.0", - "illuminate/pipeline": "^11.15.0", - "illuminate/support": "^11.15.0", + "illuminate/console": "^11.15.0 || ^12.0", + "illuminate/container": "^11.15.0 || ^12.0", + "illuminate/contracts": "^11.15.0 || ^12.0", + "illuminate/database": "^11.15.0 || ^12.0", + "illuminate/http": "^11.15.0 || ^12.0", + "illuminate/pipeline": "^11.15.0 || ^12.0", + "illuminate/support": "^11.15.0 || ^12.0", "php": "^8.2", "phpmyadmin/sql-parser": "^5.9.0", "phpstan/phpstan": "^2.1.3" }, "require-dev": { "doctrine/coding-standard": "^12.0", - "laravel/framework": "^11.15.0", + "laravel/framework": "^11.15.0 || ^12.0", "mockery/mockery": "^1.6", "nikic/php-parser": "^5.3", - "orchestra/canvas": "^v9.1.3", - "orchestra/testbench-core": "^9.5.2", + "orchestra/canvas": "^v9.1.3 || ^10.0", + "orchestra/testbench-core": "^9.5.2 || ^10.0", "phpstan/phpstan-deprecation-rules": "^2.0.0", - "phpunit/phpunit": "^10.5.16" + "phpunit/phpunit": "^10.5.35 || ^11.3.6" }, "suggest": { "orchestra/testbench": "Using Larastan for analysing a package needs Testbench" @@ -10633,7 +10633,7 @@ ] }, "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -10668,7 +10668,7 @@ ], "support": { "issues": "https://github.com/larastan/larastan/issues", - "source": "https://github.com/larastan/larastan/tree/v3.0.4" + "source": "https://github.com/larastan/larastan/tree/v3.1.0" }, "funding": [ { @@ -10676,7 +10676,7 @@ "type": "github" } ], - "time": "2025-02-06T21:03:36+00:00" + "time": "2025-02-20T15:25:15+00:00" }, { "name": "laravel-json-api/testing", @@ -11743,16 +11743,16 @@ }, { "name": "phpunit/phpunit", - "version": "11.5.8", + "version": "11.5.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c9bd61aab12f0fc5e82ecfe621ff518a1d1f1049" + "reference": "c91c830e7108a81e5845aeb6ba8fe3c1a4351c0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c9bd61aab12f0fc5e82ecfe621ff518a1d1f1049", - "reference": "c9bd61aab12f0fc5e82ecfe621ff518a1d1f1049", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c91c830e7108a81e5845aeb6ba8fe3c1a4351c0b", + "reference": "c91c830e7108a81e5845aeb6ba8fe3c1a4351c0b", "shasum": "" }, "require": { @@ -11762,7 +11762,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.1", + "myclabs/deep-copy": "^1.13.0", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.2", @@ -11824,7 +11824,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.8" + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.9" }, "funding": [ { @@ -11840,7 +11840,7 @@ "type": "tidelift" } ], - "time": "2025-02-18T06:26:59+00:00" + "time": "2025-02-21T06:08:50+00:00" }, { "name": "sebastian/cli-parser", diff --git a/config/firefly.php b/config/firefly.php index dbbcf59e37..606647601c 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -81,7 +81,7 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2025-02-20', + 'version' => 'develop/2025-02-21', 'api_version' => '2.1.0', // field is no longer used. 'db_version' => 25,