From f52bc0e242b0d04df3f667a108bd63265fd6808a Mon Sep 17 00:00:00 2001 From: JC5 Date: Sun, 12 Oct 2025 16:06:57 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20Auto=20commit=20for=20release=20?= =?UTF-8?q?'develop'=20on=202025-10-12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Factory/TransactionJournalFactory.php | 22 +++++++++---------- .../Internal/Support/JournalServiceTrait.php | 2 +- composer.lock | 12 +++++----- config/firefly.php | 4 ++-- package-lock.json | 12 +++++----- .../Api/Models/Account/ShowControllerTest.php | 1 - 6 files changed, 26 insertions(+), 27 deletions(-) diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index ed9249f72b..cd47828c9d 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -221,23 +221,23 @@ class TransactionJournalFactory ]; Log::debug('Source info:', $sourceInfo); Log::debug('Destination info:', $destInfo); - $destinationAccount = null; - $sourceAccount = null; - if(TransactionTypeEnum::DEPOSIT->value === $type->type) { - Log::debug(sprintf('Transaction type is deposit, start with destination first.')); - $destinationAccount = $this->getAccount($type->type, 'destination', $destInfo); - $sourceAccount = $this->getAccount($type->type, 'source', $sourceInfo, $destinationAccount); + $destinationAccount = null; + $sourceAccount = null; + if (TransactionTypeEnum::DEPOSIT->value === $type->type) { + Log::debug('Transaction type is deposit, start with destination first.'); + $destinationAccount = $this->getAccount($type->type, 'destination', $destInfo); + $sourceAccount = $this->getAccount($type->type, 'source', $sourceInfo, $destinationAccount); } - if(TransactionTypeEnum::DEPOSIT->value !== $type->type) { - Log::debug(sprintf('Transaction type is not deposit, start with source first.')); - $sourceAccount = $this->getAccount($type->type, 'source', $sourceInfo); - $destinationAccount = $this->getAccount($type->type, 'destination', $destInfo, $sourceAccount); + if (TransactionTypeEnum::DEPOSIT->value !== $type->type) { + Log::debug('Transaction type is not deposit, start with source first.'); + $sourceAccount = $this->getAccount($type->type, 'source', $sourceInfo); + $destinationAccount = $this->getAccount($type->type, 'destination', $destInfo, $sourceAccount); } Log::debug('Done with getAccount(2x)'); // there is a safety catch here. If either account is NULL, they will be replaced with the cash account. - if(null === $destinationAccount) { + if (null === $destinationAccount) { Log::warning('Destination account is NULL, will replace with cash account.'); $destinationAccount = $this->accountRepository->getCashAccount(); } diff --git a/app/Services/Internal/Support/JournalServiceTrait.php b/app/Services/Internal/Support/JournalServiceTrait.php index 992aa8777d..ec9a7dec3e 100644 --- a/app/Services/Internal/Support/JournalServiceTrait.php +++ b/app/Services/Internal/Support/JournalServiceTrait.php @@ -88,7 +88,7 @@ trait JournalServiceTrait // the account that Firefly III creates must be "creatable", aka select the one we can create from the list just in case $creatableType = $this->getCreatableType($expectedTypes[$transactionType]); - Log::debug(sprintf('Creatable type is "%s"', $creatableType ), $expectedTypes[$transactionType]); + Log::debug(sprintf('Creatable type is "%s"', $creatableType), $expectedTypes[$transactionType]); // if the result is NULL but the ID is set, an account could exist of the wrong type. // that data can be used to create a new account of the right type. diff --git a/composer.lock b/composer.lock index 8ea016fcc7..0797b98e0e 100644 --- a/composer.lock +++ b/composer.lock @@ -11920,16 +11920,16 @@ }, { "name": "rector/rector", - "version": "2.2.2", + "version": "2.2.3", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "5b353f7457b9a0c63fc91ef340f5d119a40991ed" + "reference": "d27f976a332a87b5d03553c2e6f04adbe5da034f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/5b353f7457b9a0c63fc91ef340f5d119a40991ed", - "reference": "5b353f7457b9a0c63fc91ef340f5d119a40991ed", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/d27f976a332a87b5d03553c2e6f04adbe5da034f", + "reference": "d27f976a332a87b5d03553c2e6f04adbe5da034f", "shasum": "" }, "require": { @@ -11968,7 +11968,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/2.2.2" + "source": "https://github.com/rectorphp/rector/tree/2.2.3" }, "funding": [ { @@ -11976,7 +11976,7 @@ "type": "github" } ], - "time": "2025-10-09T19:50:20+00:00" + "time": "2025-10-11T21:50:23+00:00" }, { "name": "sebastian/cli-parser", diff --git a/config/firefly.php b/config/firefly.php index e8b8df4e28..c33eba108d 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -78,8 +78,8 @@ return [ 'running_balance_column' => env('USE_RUNNING_BALANCE', false), // see cer.php for exchange rates feature flag. ], - 'version' => 'develop/2025-10-11', - 'build_time' => 1760188898, + 'version' => 'develop/2025-10-12', + 'build_time' => 1760277899, '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.json index 7e058505f3..4b64ccf86c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3173,9 +3173,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "24.7.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.7.1.tgz", - "integrity": "sha512-CmyhGZanP88uuC5GpWU9q+fI61j2SkhO3UGMUdfYRE6Bcy0ccyzn1Rqj9YAB/ZY4kOXmNf0ocah5GtphmLMP6Q==", + "version": "24.7.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.7.2.tgz", + "integrity": "sha512-/NbVmcGTP+lj5oa4yiYxxeBjRivKQ5Ns1eSZeB99ExsEQ6rX5XYU1Zy/gGxY/ilqtD4Etx9mKyrPxZRetiahhA==", "dev": true, "license": "MIT", "dependencies": { @@ -4521,9 +4521,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001749", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001749.tgz", - "integrity": "sha512-0rw2fJOmLfnzCRbkm8EyHL8SvI2Apu5UbnQuTsJ0ClgrH8hcwFooJ1s5R0EP8o8aVrFu8++ae29Kt9/gZAZp/Q==", + "version": "1.0.30001750", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001750.tgz", + "integrity": "sha512-cuom0g5sdX6rw00qOoLNSFCJ9/mYIsuSOA+yzpDw8eopiFqcVwQvZHqov0vmEighRxX++cfC0Vg1G+1Iy/mSpQ==", "dev": true, "funding": [ { diff --git a/tests/integration/Api/Models/Account/ShowControllerTest.php b/tests/integration/Api/Models/Account/ShowControllerTest.php index 6975558388..e952e63b16 100644 --- a/tests/integration/Api/Models/Account/ShowControllerTest.php +++ b/tests/integration/Api/Models/Account/ShowControllerTest.php @@ -28,7 +28,6 @@ namespace Tests\integration\Api\Models\Account; use FireflyIII\Enums\AccountTypeEnum; use FireflyIII\Models\Account; use FireflyIII\User; -use Override; use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\integration\TestCase;