Auto commit for release 'develop' on 2025-02-21

Merge pull request #9880 from josegonzalez/patch-1
fix: ignore the Procfile when building the docker image
2025-12-29 06:31:21 +00:00 · 2025-02-21 08:32:55 +01:00 · 2025-02-21 08:06:04 +01:00 · 2025-02-21 06:20:17 +01:00 · 2025-02-21 06:18:11 +01:00 · 2025-02-20 14:51:04 -05:00
11 changed files with 66 additions and 48 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1 @@
+Procfile
--- 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
--- a/app/Api/V1/Controllers/Models/Transaction/StoreController.php
+++ b/app/Api/V1/Controllers/Models/Transaction/StoreController.php
@@ -90,6 +90,7 @@ class StoreController extends Controller
        $data['user']       = auth()->user();
        $data['user_group'] = $this->userGroup;

+
        Log::channel('audit')->info('Store new transaction over API.', $data);

        try {
--- a/app/Api/V2/Controllers/Model/Transaction/StoreController.php
+++ b/app/Api/V2/Controllers/Model/Transaction/StoreController.php
@@ -73,6 +73,7 @@ class StoreController extends Controller
        $userGroup          = $request->getUserGroup();
        $data['user_group'] = $userGroup;

+
        // overrule user group and see where we end up.
        // what happens when we refer to a budget that is not in this user group?

--- a/app/Console/Commands/Upgrade/UpgradesToGroups.php
+++ b/app/Console/Commands/Upgrade/UpgradesToGroups.php
@@ -238,7 +238,8 @@ class UpgradesToGroups extends Command
        return [
            'type'                => strtolower($journal->transactionType->type),
            'date'                => $journal->date,
-            'user'                => $journal->user_id,
+            'user'                => $journal->user,
+            'user_group'          => $journal->user->userGroup,
            'currency_id'         => $transaction->transaction_currency_id,
            'foreign_currency_id' => $transaction->foreign_currency_id,
            'amount'              => $transaction->amount,
--- a/app/Http/Controllers/Account/ReconcileController.php
+++ b/app/Http/Controllers/Account/ReconcileController.php
@@ -229,7 +229,8 @@ class ReconcileController extends Controller
            'group_title'  => null,
            'transactions' => [
                [
-                    'user'                => auth()->user()->id,
+                    'user'                => auth()->user(),
+                    'user_group'          => auth()->user()->userGroup,
                    'type'                => strtolower(TransactionTypeEnum::RECONCILIATION->value),
                    'date'                => $end,
                    'order'               => 0,
--- a/app/Http/Controllers/Transaction/ShowController.php
+++ b/app/Http/Controllers/Transaction/ShowController.php
@@ -103,7 +103,7 @@ class ShowController extends Controller

        foreach (array_keys($groupArray['transactions']) as $index) {
            $groupArray['transactions'][$index]['tags'] = $this->repository->getTagObjects(
-                $groupArray['transactions'][$index]['transaction_journal_id']
+                (int) $groupArray['transactions'][$index]['transaction_journal_id']
            );
        }

--- a/app/Support/JsonApi/Enrichments/AccountEnrichment.php
+++ b/app/Support/JsonApi/Enrichments/AccountEnrichment.php
@@ -234,7 +234,7 @@ class AccountEnrichment implements EnrichmentInterface

    private function collectMetaData(): void
    {
-        $set        = AccountMeta::whereIn('name', ['is_multi_currency', 'include_net_worth', 'currency_id', 'account_role', 'account_number', 'liability_direction', 'interest', 'interest_period', 'current_debt'])
+        $set                 = AccountMeta::whereIn('name', ['is_multi_currency', 'include_net_worth', 'currency_id', 'account_role', 'account_number', 'liability_direction', 'interest', 'interest_period', 'current_debt'])
            ->whereIn('account_id', $this->accountIds)
            ->get(['account_meta.id', 'account_meta.account_id', 'account_meta.name', 'account_meta.data'])->toArray()
        ;
@@ -246,12 +246,13 @@ class AccountEnrichment implements EnrichmentInterface
                $this->currencies[(int) $entry['data']] = true;
            }
        }
-        $currencies = TransactionCurrency::whereIn('id', array_keys($this->currencies))->get();
+        $currencies          = TransactionCurrency::whereIn('id', array_keys($this->currencies))->get();
        foreach ($currencies as $currency) {
            $this->currencies[(int) $currency->id] = $currency;
        }
+        $this->currencies[0] = $this->native;
        foreach ($this->currencies as $id => $currency) {
-            if (true === $currency && 0 !== (int) $id) {
+            if (true === $currency) {
                throw new FireflyException(sprintf('Currency #%d not found.', $id));
            }
        }
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.2.8 - 2025-02-22
+
+### Fixed
+
+- [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

 ### Changed
--- 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",
--- 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,
Author	SHA1	Message	Date
github-actions	56470bfbba	Auto commit for release 'develop' on 2025-02-21	2025-02-21 08:32:55 +01:00
James Cole	0f732ca874	Merge pull request #9880 from josegonzalez/patch-1 fix: ignore the Procfile when building the docker image	2025-02-21 08:06:04 +01:00
James Cole	e452ba938d	Update changelog.	2025-02-21 06:20:17 +01:00
James Cole	9921c5a925	Fix #9882	2025-02-21 06:18:11 +01:00
Jose Diaz-Gonzalez	58fab75681	fix: ignore the Procfile when building the docker image The Procfile is heroku-specific, causing issues on platforms which respect it when specifying processes to run for docker image or dockerfile based deploys. Closes #9833 Signed-off-by: Jose Diaz-Gonzalez <email@josediazgonzalez.com>	2025-02-20 14:51:04 -05:00
Sander Dorigo	54990308f6	fix type error	2025-02-20 12:58:38 +01:00
github-actions	f95758ff47	Auto commit for release 'develop' on 2025-02-20	2025-02-20 08:11:36 +01:00
James Cole	8d830e178f	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2025-02-20 08:08:18 +01:00
James Cole	334a521ca1	Better fix for nullpointer.	2025-02-20 08:08:07 +01:00