Auto commit for release 'develop' on 2024-12-23

Auto commit for release 'develop' on 2024-12-18
Auto commit for release 'v6.1.25' on 2024-12-18
2025-10-30 06:50:49 +00:00 · 2024-12-23 04:12:14 +01:00 · 2024-12-18 16:52:40 +01:00 · 2024-12-18 16:36:08 +01:00 · 2024-12-18 16:31:37 +01:00 · 2024-12-18 16:29:19 +01:00
13 changed files with 1343 additions and 1055 deletions
--- a/.ci/php-cs-fixer/composer.lock
+++ b/.ci/php-cs-fixer/composer.lock
@@ -97,13 +97,13 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.x-dev"
-                },
                "phpstan": {
                    "includes": [
                        "extension.neon"
                    ]
+                },
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
                }
            },
            "autoload": {
@@ -1259,16 +1259,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v7.1.8",
+            "version": "v7.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "ff04e5b5ba043d2badfb308197b9e6b42883fcd5"
+                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/ff04e5b5ba043d2badfb308197b9e6b42883fcd5",
-                "reference": "ff04e5b5ba043d2badfb308197b9e6b42883fcd5",
+                "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
                "shasum": ""
            },
            "require": {
@@ -1332,7 +1332,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.8"
+                "source": "https://github.com/symfony/console/tree/v7.2.1"
            },
            "funding": [
                {
@@ -1348,7 +1348,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-11-06T14:23:19+00:00"
+            "time": "2024-12-11T03:49:26+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@@ -1419,16 +1419,16 @@
        },
        {
            "name": "symfony/event-dispatcher",
-            "version": "v7.1.6",
+            "version": "v7.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "87254c78dd50721cfd015b62277a8281c5589702"
+                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87254c78dd50721cfd015b62277a8281c5589702",
-                "reference": "87254c78dd50721cfd015b62277a8281c5589702",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/910c5db85a5356d0fea57680defec4e99eb9c8c1",
+                "reference": "910c5db85a5356d0fea57680defec4e99eb9c8c1",
                "shasum": ""
            },
            "require": {
@@ -1479,7 +1479,7 @@
            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v7.1.6"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.2.0"
            },
            "funding": [
                {
@@ -1495,7 +1495,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
        },
        {
            "name": "symfony/event-dispatcher-contracts",
@@ -1575,16 +1575,16 @@
        },
        {
            "name": "symfony/filesystem",
-            "version": "v7.1.6",
+            "version": "v7.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4"
+                "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c835867b3c62bb05c7fe3d637c871c7ae52024d4",
-                "reference": "c835867b3c62bb05c7fe3d637c871c7ae52024d4",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/b8dce482de9d7c9fe2891155035a7248ab5c7fdb",
+                "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb",
                "shasum": ""
            },
            "require": {
@@ -1621,7 +1621,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v7.1.6"
+                "source": "https://github.com/symfony/filesystem/tree/v7.2.0"
            },
            "funding": [
                {
@@ -1637,20 +1637,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-10-25T15:11:02+00:00"
+            "time": "2024-10-25T15:15:23+00:00"
        },
        {
            "name": "symfony/finder",
-            "version": "v7.1.6",
+            "version": "v7.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8"
+                "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/2cb89664897be33f78c65d3d2845954c8d7a43b8",
-                "reference": "2cb89664897be33f78c65d3d2845954c8d7a43b8",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49",
+                "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49",
                "shasum": ""
            },
            "require": {
@@ -1685,7 +1685,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.1.6"
+                "source": "https://github.com/symfony/finder/tree/v7.2.0"
            },
            "funding": [
                {
@@ -1701,20 +1701,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-10-01T08:31:23+00:00"
+            "time": "2024-10-23T06:56:12+00:00"
        },
        {
            "name": "symfony/options-resolver",
-            "version": "v7.1.9",
+            "version": "v7.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "0f4099f5306a92487d13b2a4589068c36a93c447"
+                "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0f4099f5306a92487d13b2a4589068c36a93c447",
-                "reference": "0f4099f5306a92487d13b2a4589068c36a93c447",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/7da8fbac9dcfef75ffc212235d76b2754ce0cf50",
+                "reference": "7da8fbac9dcfef75ffc212235d76b2754ce0cf50",
                "shasum": ""
            },
            "require": {
@@ -1752,7 +1752,7 @@
                "options"
            ],
            "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v7.1.9"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.2.0"
            },
            "funding": [
                {
@@ -1768,7 +1768,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-11-20T11:08:58+00:00"
+            "time": "2024-11-20T11:17:29+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
@@ -1796,8 +1796,8 @@
            "type": "library",
            "extra": {
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                }
            },
            "autoload": {
@@ -1872,8 +1872,8 @@
            "type": "library",
            "extra": {
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                }
            },
            "autoload": {
@@ -1950,8 +1950,8 @@
            "type": "library",
            "extra": {
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                }
            },
            "autoload": {
@@ -2034,8 +2034,8 @@
            "type": "library",
            "extra": {
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                }
            },
            "autoload": {
@@ -2108,8 +2108,8 @@
            "type": "library",
            "extra": {
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                }
            },
            "autoload": {
@@ -2188,8 +2188,8 @@
            "type": "library",
            "extra": {
                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                }
            },
            "autoload": {
@@ -2246,16 +2246,16 @@
        },
        {
            "name": "symfony/process",
-            "version": "v7.1.8",
+            "version": "v7.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/process.git",
-                "reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892"
+                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/42783370fda6e538771f7c7a36e9fa2ee3a84892",
-                "reference": "42783370fda6e538771f7c7a36e9fa2ee3a84892",
+                "url": "https://api.github.com/repos/symfony/process/zipball/d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
+                "reference": "d34b22ba9390ec19d2dd966c40aa9e8462f27a7e",
                "shasum": ""
            },
            "require": {
@@ -2287,7 +2287,7 @@
            "description": "Executes commands in sub-processes",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/process/tree/v7.1.8"
+                "source": "https://github.com/symfony/process/tree/v7.2.0"
            },
            "funding": [
                {
@@ -2303,7 +2303,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-11-06T14:23:19+00:00"
+            "time": "2024-11-06T14:24:19+00:00"
        },
        {
            "name": "symfony/service-contracts",
@@ -2390,16 +2390,16 @@
        },
        {
            "name": "symfony/stopwatch",
-            "version": "v7.1.6",
+            "version": "v7.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "8b4a434e6e7faf6adedffb48783a5c75409a1a05"
+                "reference": "696f418b0d722a4225e1c3d95489d262971ca924"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/8b4a434e6e7faf6adedffb48783a5c75409a1a05",
-                "reference": "8b4a434e6e7faf6adedffb48783a5c75409a1a05",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/696f418b0d722a4225e1c3d95489d262971ca924",
+                "reference": "696f418b0d722a4225e1c3d95489d262971ca924",
                "shasum": ""
            },
            "require": {
@@ -2432,7 +2432,7 @@
            "description": "Provides a way to profile code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v7.1.6"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.2.0"
            },
            "funding": [
                {
@@ -2448,20 +2448,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-09-25T14:20:29+00:00"
+            "time": "2024-09-25T14:21:43+00:00"
        },
        {
            "name": "symfony/string",
-            "version": "v7.1.8",
+            "version": "v7.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "591ebd41565f356fcd8b090fe64dbb5878f50281"
+                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/591ebd41565f356fcd8b090fe64dbb5878f50281",
-                "reference": "591ebd41565f356fcd8b090fe64dbb5878f50281",
+                "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82",
+                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82",
                "shasum": ""
            },
            "require": {
@@ -2519,7 +2519,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.8"
+                "source": "https://github.com/symfony/string/tree/v7.2.0"
            },
            "funding": [
                {
@@ -2535,7 +2535,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-11-13T13:31:21+00:00"
+            "time": "2024-11-13T13:31:26+00:00"
        }
    ],
    "packages-dev": [],
--- a/.github/workflows/close-duplicates.yml
+++ b/.github/workflows/close-duplicates.yml
@@ -13,7 +13,7 @@ jobs:
  close_duplicates:
    runs-on: ubuntu-latest
    steps:
-      - uses: github/command@v1.2.2
+      - uses: github/command@v1.3.0
        id: command
        with:
          allowed_contexts: "issue"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,9 +4,13 @@ on:
  workflow_dispatch:
    inputs:
      version:
-        description: 'Release "v1.2.3" or "develop"'
+        description: 'Release "v1.2.3" or "develop" or "branch-abc"'
        required: true
        default: 'develop'
+      phpversion:
+        description: 'PHP version'
+        required: true
+        default: '8.3'
  schedule:
    - cron: '0 3 * * MON'

@@ -23,6 +27,11 @@ jobs:
          if [[ "develop" == "$version" ]]; then
            git checkout --track origin/develop
            git pull
+          elif [[ "$version" == branch* ]]; then
+            PULLBRANCH=${version:7}
+            echo "The branch is '$PULLBRANCH' ($version)"
+            git checkout --track origin/$PULLBRANCH
+            git pull
          else
            git config user.name github-actions
            git config user.email 41898282+github-actions[bot]@users.noreply.github.com
@@ -36,7 +45,7 @@ jobs:
      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
-          php-version: '8.3'
+          php-version: ${{ github.event.inputs.phpversion }}
          extensions: mbstring, intl, zip, bcmath
      - name: crowdin action
        uses: crowdin/github-action@v2
@@ -133,7 +142,7 @@ jobs:
          rm -rf vendor composer.lock
          composer update --no-dev --no-scripts --no-plugins -q
          sudo chown -R runner:docker resources/lang
-          .ci/phpcs.sh
+          .ci/phpcs.sh || true
      - name: Import GPG key
        uses: crazy-max/ghaction-import-gpg@v6
        with:
@@ -166,6 +175,16 @@ jobs:
            tarName=FireflyIII-develop.tar.gz
          fi

+          # if this is a branch build, also slightly different variable names.
+          if [[ "$version" == branch* ]]; then
+            [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
+            # branch builds overrule develop
+            releaseName=$version-$(date +'%Y%m%d')
+            originalName=$releaseName
+            zipName=FireflyIII-$version.zip
+            tarName=FireflyIII-$version.tar.gz
+          fi
+
          # in both cases, if the release or tag already exists, add ".1" until it no longer exists.
          tagFound=true
          tagCount=1
@@ -207,12 +226,13 @@ jobs:
          gpg --armor --detach-sign $zipName
          gpg --armor --detach-sign $tarName

-          # create a development (nightly) release:
+          # describe the development release.
          if [[ "develop" == "$version" ]]; then
            echo 'Develop release.'
-            # add text to output.txt (instructions)
            rm output.txt
-            echo "Bi-weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
            echo "" >> output.txt
            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
            echo "" >> output.txt
@@ -220,15 +240,62 @@ jobs:
            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
            echo "" >> output.txt
            echo ":warning: Please be careful with this pre-release, as it may not work as expected." >> output.txt
+          fi
+          # describe a branch release
+          if [[ "$version" == branch* ]]; then
+            echo 'Branch release.'
+            rm output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Irregular BRANCH release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
+            echo "" >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo "" >> output.txt
+            echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "" >> output.txt
+            echo ":warning: Please be careful with this branch pre-release, as it may not work as expected." >> output.txt
+          fi
+          # describe the main release
+          if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]]; then
+            sudo chown -R runner:docker output.txt
+            echo 'Main release.'
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt

+          fi
+
+          # create a development release:
+          if [[ "develop" == "$version" ]]; then
            # create the release:
-            echo "Create nightly release."
-            git tag -a $releaseName -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
+            echo "Create develop release."
+            git tag -a $releaseName -m "Development release '$version' on $(date +'%Y-%m-%d')"
+
            git push origin $releaseName
            gh release create $releaseName -p --verify-tag \
              -t "Development release for $(date +'%Y-%m-%d')" \
              -F output.txt
+          fi

+          # create a branch release:
+          if [[ "$version" == branch* ]]; then
+
+            # create the release:
+            echo "Create branch release."
+            git tag -a $releaseName -m "Branch release '$version' on $(date +'%Y-%m-%d')"
+
+            git push origin $releaseName
+            gh release create $releaseName -p --verify-tag \
+              -t "Branch release for $(date +'%Y-%m-%d')" \
+              -F output.txt
+          fi
+
+          # create a development (nightly) release:
+          if [[ "develop" == "$version" ]] || [[ "$version" == branch* ]]; then
            # add zip file to release.
            gh release upload $releaseName $zipName
            gh release upload $releaseName $tarName
@@ -247,16 +314,6 @@ jobs:
            gh release upload $releaseName HEAD.txt
          else
            echo 'MAIN (real) release'
-            sudo chown -R runner:docker output.txt
-            # add text to output.txt (more instructions)
-            echo '' >> output.txt
-            echo '### Instructions' >> output.txt
-            echo '' >> output.txt
-            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
-            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
-            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
-
-            echo "Create default release."
            git tag -a $releaseName -m "Here be changelog"
            git push origin $releaseName
            gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag
--- a/app/Handlers/Observer/TransactionObserver.php
+++ b/app/Handlers/Observer/TransactionObserver.php
@@ -41,18 +41,22 @@ class TransactionObserver
    public function updated(Transaction $transaction): void
    {
        Log::debug('Observe "updated" of a transaction.');
-        if (1 === bccomp($transaction->amount, '0')) {
-            Log::debug('Trigger recalculateForJournal');
-            AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+        if (config('firefly.feature_flags.running_balance_column')) {
+            if (1 === bccomp($transaction->amount, '0')) {
+                Log::debug('Trigger recalculateForJournal');
+                AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+            }
        }
    }

    public function created(Transaction $transaction): void
    {
        Log::debug('Observe "created" of a transaction.');
-        if (1 === bccomp($transaction->amount, '0')) {
-            Log::debug('Trigger recalculateForJournal');
-            AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+        if (config('firefly.feature_flags.running_balance_column')) {
+            if (1 === bccomp($transaction->amount, '0')) {
+                Log::debug('Trigger recalculateForJournal');
+                AccountBalanceCalculator::recalculateForJournal($transaction->transactionJournal);
+            }
        }
    }
 }
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 6.1.25 - 2024-12-19
+
+### Fixed
+
+- [Issue 9492](https://github.com/firefly-iii/firefly-iii/issues/9492) (API: `PUT /api/v1/transactions/ID` does not work with only `source_name`) reported by @dreautall
+- [Issue 9497](https://github.com/firefly-iii/firefly-iii/issues/9497) ('Attempt to read property "user" on null' error when running `php artisan firefly-iii:upgrade-database` on updating to v6.1.24) reported by @ChrisCarini
+- [Discussion 9546](https://github.com/orgs/firefly-iii/discussions/9546) (Using the Data Importer to import data is very slowly？) started by @shangyuok
+
 ## 6.1.24 - 2024-11-24

 ### Fixed
--- a/composer.json
+++ b/composer.json
@@ -88,7 +88,7 @@
        "guzzlehttp/guzzle": "^7.8",
        "jc5/google2fa-laravel": "^2.0",
        "jc5/recovery": "^2",
-        "laravel-json-api/laravel": "^4.0",
+        "laravel-json-api/laravel": "^5.0",
        "laravel-json-api/non-eloquent": "^4.0",
        "laravel/framework": "^11",
        "laravel/passport": "^12",
--- a/composer.lock
+++ b/composer.lock
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -110,7 +110,7 @@ return [
        'running_balance_column' => env('USE_RUNNING_BALANCE', false),
        // see cer.php for exchange rates feature flag.
    ],
-    'version'                      => 'develop/2024-11-29',
+'version' => 'develop/2024-12-23',
    'api_version'                  => '2.1.0', // field is no longer used.
    'db_version'                   => 25,

--- a/package-lock.json
+++ b/package-lock.json
--- a/resources/assets/v1/src/locales/es.json
+++ b/resources/assets/v1/src/locales/es.json
@@ -5,8 +5,8 @@
        "flash_warning": "\u00a1Advertencia!",
        "flash_success": "\u00a1Operaci\u00f3n correcta!",
        "close": "Cerrar",
-        "select_dest_account": "Please select or type a valid destination account name",
-        "select_source_account": "Please select or type a valid source account name",
+        "select_dest_account": "Por favor, seleccione o escriba un nombre de cuenta de destino v\u00e1lido",
+        "select_source_account": "Por favor, seleccione o escriba un nombre de cuenta de origen v\u00e1lido",
        "split_transaction_title": "Descripci\u00f3n de la transacci\u00f3n dividida",
        "errors_submission": "Hubo un problema con su env\u00edo. Por favor, compruebe los siguientes errores.",
        "split": "Separar",
--- a/resources/assets/v1/src/locales/pl.json
+++ b/resources/assets/v1/src/locales/pl.json
@@ -6,7 +6,7 @@
        "flash_success": "Sukces!",
        "close": "Zamknij",
        "select_dest_account": "Please select or type a valid destination account name",
-        "select_source_account": "Please select or type a valid source account name",
+        "select_source_account": "Wybierz lub wpisz prawid\u0142ow\u0105 nazw\u0119 konta \u017ar\u00f3d\u0142owego",
        "split_transaction_title": "Opis podzielonej transakcji",
        "errors_submission": "Co\u015b posz\u0142o nie tak w czasie zapisu. Prosz\u0119, sprawd\u017a b\u0142\u0119dy poni\u017cej.",
        "split": "Podziel",
--- a/resources/assets/v1/src/locales/ru.json
+++ b/resources/assets/v1/src/locales/ru.json
@@ -129,7 +129,7 @@
        "logs": "\u041b\u043e\u0433\u0438",
        "response": "\u041e\u0442\u0432\u0435\u0442",
        "visit_webhook_url": "\u041f\u043e\u0441\u0435\u0442\u0438\u0442\u044c URL \u0432\u0435\u0431\u0445\u0443\u043a\u0430",
-        "reset_webhook_secret": "\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u0441\u0435\u043a\u0440\u0435\u0442 webhook"
+        "reset_webhook_secret": ""
    },
    "form": {
        "url": "\u0421\u0441\u044b\u043b\u043a\u0430",
--- a/resources/assets/v2/package.json
+++ b/resources/assets/v2/package.json
@@ -12,14 +12,14 @@
        "laravel-vite-plugin": "^1.0.5",
        "patch-package": "^8.0.0",
        "sass": "^1.78.0",
-        "vite": "^5",
+        "vite": "^6",
        "vite-plugin-manifest-sri": "^0.2.0"
    },
    "dependencies": {
        "@ag-grid-community/client-side-row-model": "^32.0.2",
        "@ag-grid-community/core": "^32.0.2",
        "@ag-grid-community/infinite-row-model": "^32.0.2",
-        "@ag-grid-community/styles": "^32.0.0",
+        "@ag-grid-community/styles": "^33.0.2",
        "@fortawesome/fontawesome-free": "^6.4.0",
        "@popperjs/core": "^2.11.8",
        "admin-lte": "^4.0.0-alpha3",
@@ -29,7 +29,7 @@
        "bootstrap5-tags": "^1.7",
        "chart.js": "^4.4.0",
        "chartjs-adapter-date-fns": "^3.0.0",
-        "chartjs-chart-sankey": "^0.13.0",
+        "chartjs-chart-sankey": "^0.14.0",
        "date-fns": "^4.0.0",
        "i18next": "^24.0.0",
        "i18next-chained-backend": "^4.6.2",
Author	SHA1	Message	Date
github-actions	d93732e451	Auto commit for release 'develop' on 2024-12-23	2024-12-23 04:12:14 +01:00
github-actions	e2f1fc307f	Auto commit for release 'develop' on 2024-12-18	2024-12-18 16:52:40 +01:00
github-actions	fe6021a3d6	Auto commit for release 'v6.1.25' on 2024-12-18	2024-12-18 16:36:08 +01:00
James Cole	563c54702b	Update changelog.	2024-12-18 16:31:37 +01:00
James Cole	4d67d27ba0	Fix #9546	2024-12-18 16:29:19 +01:00
James Cole	edf3876a57	Merge branch 'main' into develop	2024-12-18 16:26:35 +01:00
James Cole	f197e6623b	Merge pull request #9551 from firefly-iii/dependabot/github_actions/github/command-1.3.0	2024-12-16 06:59:19 +01:00
James Cole	42a9809450	Merge pull request #9550 from firefly-iii/dependabot/npm_and_yarn/develop/chartjs-chart-sankey-0.14.0	2024-12-16 06:59:10 +01:00
James Cole	444f80a933	Merge pull request #9549 from firefly-iii/dependabot/npm_and_yarn/develop/ag-grid-community/styles-33.0.2	2024-12-16 06:59:01 +01:00
dependabot[bot]	4b985c818a	Bump github/command from 1.2.2 to 1.3.0 Bumps [github/command](https://github.com/github/command) from 1.2.2 to 1.3.0. - [Release notes](https://github.com/github/command/releases) - [Commits](https://github.com/github/command/compare/v1.2.2...v1.3.0) --- updated-dependencies: - dependency-name: github/command dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 03:49:31 +00:00
github-actions	2e62fe7b72	Auto commit for release 'develop' on 2024-12-16	2024-12-16 04:22:19 +01:00
dependabot[bot]	ccd182aed9	Bump chartjs-chart-sankey from 0.13.0 to 0.14.0 Bumps [chartjs-chart-sankey](https://github.com/kurkle/chartjs-chart-sankey) from 0.13.0 to 0.14.0. - [Release notes](https://github.com/kurkle/chartjs-chart-sankey/releases) - [Commits](https://github.com/kurkle/chartjs-chart-sankey/compare/v0.13.0...v0.14.0) --- updated-dependencies: - dependency-name: chartjs-chart-sankey dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 03:06:22 +00:00
dependabot[bot]	615eef3fdd	Bump @ag-grid-community/styles from 32.3.3 to 33.0.2 Bumps [@ag-grid-community/styles](https://github.com/ag-grid/ag-grid) from 32.3.3 to 33.0.2. - [Release notes](https://github.com/ag-grid/ag-grid/releases) - [Commits](https://github.com/ag-grid/ag-grid/compare/v32.3.3...v33.0.2) --- updated-dependencies: - dependency-name: "@ag-grid-community/styles" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-16 03:06:13 +00:00
James Cole	3117c8846e	Rename branch release.	2024-12-15 12:31:36 +01:00
James Cole	f1c859aaa3	Update build job	2024-12-15 08:57:55 +01:00
github-actions	f782979d6c	Auto commit for release 'develop' on 2024-12-15	2024-12-15 04:09:28 +01:00
github-actions	53252b84fd	Auto commit for release 'develop' on 2024-12-14	2024-12-14 22:13:19 +01:00
James Cole	f0e2913802	Ignore phpcs errors.	2024-12-14 21:50:46 +01:00
James Cole	1fa928b98f	Should work from here	2024-12-14 21:45:20 +01:00
James Cole	1c691cca33	Duh, that wasn't smart.	2024-12-14 21:39:30 +01:00
James Cole	69e1eb3eff	echo debug and upgrade to 8.4	2024-12-14 21:37:45 +01:00
James Cole	90794cb515	Experimental branch build.	2024-12-14 21:35:14 +01:00
James Cole	277f5e538f	Merge pull request #9534 from firefly-iii/dependabot/composer/composer-736964bd2b	2024-12-10 04:33:36 +01:00
dependabot[bot]	89f197b9d4	Bump league/commonmark in the composer group across 1 directory Bumps the composer group with 1 update in the / directory: [league/commonmark](https://github.com/thephpleague/commonmark). Updates `league/commonmark` from 2.5.3 to 2.6.0 - [Release notes](https://github.com/thephpleague/commonmark/releases) - [Changelog](https://github.com/thephpleague/commonmark/blob/2.6/CHANGELOG.md) - [Commits](https://github.com/thephpleague/commonmark/compare/2.5.3...2.6.0) --- updated-dependencies: - dependency-name: league/commonmark dependency-type: direct:production dependency-group: composer ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-10 01:17:43 +00:00
github-actions	69b2c1f4d2	Auto commit for release 'develop' on 2024-12-09	2024-12-09 04:21:46 +01:00
James Cole	1ccda0b598	Merge pull request #9516 from firefly-iii/dependabot/npm_and_yarn/develop/vite-6.0.1 Bump vite from 5.4.11 to 6.0.1	2024-12-04 06:54:15 +01:00
James Cole	eb3b67ffd6	Merge pull request #9515 from firefly-iii/dependabot/composer/develop/laravel-json-api/laravel-5.0.0 Bump laravel-json-api/laravel from 4.1.1 to 5.0.0	2024-12-04 06:39:04 +01:00
dependabot[bot]	591b795aa3	Bump vite from 5.4.11 to 6.0.1 Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.11 to 6.0.1. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/create-vite@6.0.1/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-02 03:59:55 +00:00
dependabot[bot]	ac21ed7d18	Bump laravel-json-api/laravel from 4.1.1 to 5.0.0 Bumps [laravel-json-api/laravel](https://github.com/laravel-json-api/laravel) from 4.1.1 to 5.0.0. - [Release notes](https://github.com/laravel-json-api/laravel/releases) - [Changelog](https://github.com/laravel-json-api/laravel/blob/develop/CHANGELOG.md) - [Commits](https://github.com/laravel-json-api/laravel/compare/v4.1.1...v5.0.0) --- updated-dependencies: - dependency-name: laravel-json-api/laravel dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2024-12-02 03:55:52 +00:00
github-actions	d9c66a2db0	Auto commit for release 'develop' on 2024-12-02	2024-12-02 04:21:56 +01:00