Auto commit for release 'develop' on 2025-01-20

Auto commit for release 'develop' on 2025-01-19
Auto commit for release 'v6.2.0-alpha.2' on 2025-01-19
2026-06-22 08:13:20 -07:00 · 2025-01-20 04:08:13 +01:00 · 2025-01-19 19:26:58 +01:00 · 2025-01-19 19:12:01 +01:00 · 2025-01-19 19:07:19 +01:00 · 2025-01-19 18:55:03 +01:00
636 changed files with 10063 additions and 8325 deletions
@@ -29,7 +29,7 @@ $paths = [
    $current . '/../../database',
    $current . '/../../routes',
    $current . '/../../tests',
-    $current . '/../../resources/lang',
+    $current . '/../../resources/lang/en_US',
 ];

 $finder = PhpCsFixer\Finder::create()
@@ -61,6 +61,7 @@ return $config->setRules(
        'comment_to_phpdoc'             => false, // breaks phpstan lines in combination with PHPStorm.
        'type_declaration_spaces'       => false,
        'cast_spaces'                   => false,
+        'phpdoc_to_comment' => false, // do not overrule single line comment style, breaks phpstan.

        // complex rules
        'array_syntax'                  => ['syntax' => 'short'],
@@ -406,16 +406,16 @@
        },
        {
            "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.65.0",
+            "version": "v3.68.1",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f"
+                "reference": "b9db2b2ea3cdba7201067acee46f984ef2397cff"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/79d4f3e77b250a7d8043d76c6af8f0695e8a469f",
-                "reference": "79d4f3e77b250a7d8043d76c6af8f0695e8a469f",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/b9db2b2ea3cdba7201067acee46f984ef2397cff",
+                "reference": "b9db2b2ea3cdba7201067acee46f984ef2397cff",
                "shasum": ""
            },
            "require": {
@@ -432,17 +432,17 @@
                "react/promise": "^2.0 || ^3.0",
                "react/socket": "^1.0",
                "react/stream": "^1.0",
-                "sebastian/diff": "^4.0 || ^5.0 || ^6.0",
-                "symfony/console": "^5.4 || ^6.0 || ^7.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0",
-                "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
-                "symfony/finder": "^5.4 || ^6.0 || ^7.0",
-                "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0",
-                "symfony/polyfill-mbstring": "^1.28",
-                "symfony/polyfill-php80": "^1.28",
-                "symfony/polyfill-php81": "^1.28",
-                "symfony/process": "^5.4 || ^6.0 || ^7.0",
-                "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
+                "sebastian/diff": "^4.0 || ^5.1 || ^6.0",
+                "symfony/console": "^5.4 || ^6.4 || ^7.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
+                "symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
+                "symfony/finder": "^5.4 || ^6.4 || ^7.0",
+                "symfony/options-resolver": "^5.4 || ^6.4 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.31",
+                "symfony/polyfill-php80": "^1.31",
+                "symfony/polyfill-php81": "^1.31",
+                "symfony/process": "^5.4 || ^6.4 || ^7.2",
+                "symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
            },
            "require-dev": {
                "facile-it/paraunit": "^1.3.1 || ^2.4",
@@ -454,9 +454,9 @@
                "php-cs-fixer/accessible-object": "^1.1",
                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5",
                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5",
-                "phpunit/phpunit": "^9.6.21 || ^10.5.38 || ^11.4.3",
-                "symfony/var-dumper": "^5.4.47 || ^6.4.15 || ^7.1.8",
-                "symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.1.6"
+                "phpunit/phpunit": "^9.6.22 || ^10.5.40 || ^11.5.2",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.15 || ^7.2.0",
+                "symfony/yaml": "^5.4.45 || ^6.4.13 || ^7.2.0"
            },
            "suggest": {
                "ext-dom": "For handling output formats in XML",
@@ -497,7 +497,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.65.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.68.1"
            },
            "funding": [
                {
@@ -505,7 +505,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-11-25T00:39:24+00:00"
+            "time": "2025-01-17T09:20:36+00:00"
        },
        {
            "name": "psr/container",
@@ -734,33 +734,33 @@
        },
        {
            "name": "react/child-process",
-            "version": "v0.6.5",
+            "version": "v0.6.6",
            "source": {
                "type": "git",
                "url": "https://github.com/reactphp/child-process.git",
-                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43"
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
-                "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159",
                "shasum": ""
            },
            "require": {
                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
                "php": ">=5.3.0",
                "react/event-loop": "^1.2",
-                "react/stream": "^1.2"
+                "react/stream": "^1.4"
            },
            "require-dev": {
-                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
-                "react/socket": "^1.8",
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/socket": "^1.16",
                "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0"
            },
            "type": "library",
            "autoload": {
                "psr-4": {
-                    "React\\ChildProcess\\": "src"
+                    "React\\ChildProcess\\": "src/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@@ -797,19 +797,15 @@
            ],
            "support": {
                "issues": "https://github.com/reactphp/child-process/issues",
-                "source": "https://github.com/reactphp/child-process/tree/v0.6.5"
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.6"
            },
            "funding": [
                {
-                    "url": "https://github.com/WyriHaximus",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/clue",
-                    "type": "github"
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
                }
            ],
-            "time": "2022-09-16T13:41:56+00:00"
+            "time": "2025-01-01T16:37:48+00:00"
        },
        {
            "name": "react/dns",
@@ -1641,16 +1637,16 @@
        },
        {
            "name": "symfony/finder",
-            "version": "v7.2.0",
+            "version": "v7.2.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/finder.git",
-                "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49"
+                "reference": "87a71856f2f56e4100373e92529eed3171695cfb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49",
-                "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb",
+                "reference": "87a71856f2f56e4100373e92529eed3171695cfb",
                "shasum": ""
            },
            "require": {
@@ -1685,7 +1681,7 @@
            "description": "Finds files and directories via an intuitive fluent interface",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.2.0"
+                "source": "https://github.com/symfony/finder/tree/v7.2.2"
            },
            "funding": [
                {
@@ -1701,7 +1697,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-10-23T06:56:12+00:00"
+            "time": "2024-12-30T19:00:17+00:00"
        },
        {
            "name": "symfony/options-resolver",
@@ -2390,16 +2386,16 @@
        },
        {
            "name": "symfony/stopwatch",
-            "version": "v7.2.0",
+            "version": "v7.2.2",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "696f418b0d722a4225e1c3d95489d262971ca924"
+                "reference": "e46690d5b9d7164a6d061cab1e8d46141b9f49df"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/696f418b0d722a4225e1c3d95489d262971ca924",
-                "reference": "696f418b0d722a4225e1c3d95489d262971ca924",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/e46690d5b9d7164a6d061cab1e8d46141b9f49df",
+                "reference": "e46690d5b9d7164a6d061cab1e8d46141b9f49df",
                "shasum": ""
            },
            "require": {
@@ -2432,7 +2428,7 @@
            "description": "Provides a way to profile code",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v7.2.0"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.2.2"
            },
            "funding": [
                {
@@ -2448,7 +2444,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2024-12-18T14:28:33+00:00"
        },
        {
            "name": "symfony/string",
@@ -28,7 +28,7 @@ composer update --quiet
 rm -f .php-cs-fixer.cache
 PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix \
    --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
-    --format=txt \
+    --format=txt -v \
    --allow-risky=yes

 EXIT_CODE=$?
@@ -1,61 +1,36 @@
 parameters:
  scanFiles:
-    - ../_ide_helper_models.php
-  universalObjectCratesClasses:
-    - Illuminate\Database\Eloquent\Model
-  # TODO: slowly remove these parameters and fix the issues found.
-  reportUnmatchedIgnoredErrors: false
-  ignoreErrors:
-  # TODO: slowly remove these exceptions and fix the issues found.
-    - '#Dynamic call to static method#' # all the Laravel ORM things depend on this.
-    - '#Control structures using switch should not be used.#' # switch is fine in some cases.
-    - '#with no value type specified in iterable type array#' # remove this rule when all other issues are solved.
-    - '#has no value type specified in iterable type array#' # remove this rule when all other issues are solved.
-    - '#is not allowed to extend#'
-    - '#does not specify its types#'
-    - '#switch is forbidden to use#'
-    - '#is neither abstract nor final#'
-    - '#on left side of \?\?\= always exists and is not nullable#'
-    - '#has a nullable return type declaration#' # perhaps throw errors instead?
-    - '#with a nullable type declaration#' # decide what action should be if param is null.
-    - '#with null as default value#'
-    -
-        message: '#Constructor in [a-zA-Z0-9\\_]+ has parameter \$[a-zA-Z0-9\\_]+ with default value#'
-        paths:
-            - ../app/Exceptions/IntervalException.php
-            - ../app/Support/Navigation.php
-    -
-        message: '#but containers should not be injected#'
-        paths:
-            - ../app/Support/Authentication/RemoteUserGuard.php
-    -
-        message: '#Function compact\(\) should not be used#' # too useful in template rendering.
-        paths:
-            - ../app/Generator/Report/Account/MonthReportGenerator.php
-            - ../app/Generator/Report/Audit/MonthReportGenerator.php
-            - ../app/Generator/Report/Budget/MonthReportGenerator.php
-            - ../app/Generator/Report/Category/MonthReportGenerator.php
-            - ../app/Generator/Report/Standard/MonthReportGenerator.php
-            - ../app/Generator/Report/Standard/MultiYearReportGenerator.php
-            - ../app/Generator/Report/Standard/YearReportGenerator.php
-            - ../app/Generator/Report/Tag/MonthReportGenerator.php
-            - ../app/Http/Controllers/Account/*.php
-            - ../app/Http/Controllers/Admin/*.php
-            - ../app/Http/Controllers/*.php
-            - ../app/Support/ExpandedForm.php
-            - ../app/Support/Form/AccountForm.php
-            - ../app/Support/Form/CurrencyForm.php
-            - ../app/Support/Form/FormSupport.php
-    -
-        message: '#Either catch a more specific exception#'
-        paths:
-            - ../app/Support/Form/FormSupport.php
+    - ../_ide_helper
  paths:
    - ../app
    - ../database
    - ../routes
    - ../config
    - ../bootstrap/app.php
+  universalObjectCratesClasses:
+    - Illuminate\Database\Eloquent\Model
+  # TODO: slowly remove these parameters and fix the issues found.
+  reportUnmatchedIgnoredErrors: true
+  ignoreErrors:
+  # TODO: slowly remove these exceptions and fix the issues found.
+    - '#Dynamic call to static method#' # all the Laravel ORM things depend on this.
+    - identifier: varTag.nativeType
+    - identifier: varTag.type
+    -
+        identifier: larastan.noEnvCallsOutsideOfConfig
+        path: ../app/Console/Commands/System/CreatesDatabase.php
+    - identifier: missingType.iterableValue # not interesting enough to fix.
+    - identifier: missingType.generics # not interesting enough to fix.
+    - "#Parameter \\#[1-2] \\$num[1-2] of function bc[a-z]+ expects numeric-string, [a-z\\-|&]+ given#"
+    - '#expects view-string, string given#'
+    - '#expects view-string\|null, string given#'
+
+    # phpstan can't handle this so we ignore them.
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::before#'
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::after#'
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::withTrashed#'
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\HasMany::accountTypeIn#'
+    - '#Call to an undefined method Illuminate\\Database\\Eloquent\\Relations\\BelongsTo::withTrashed#'

  # The level 8 is the highest level. original was 5
  # 7 is more than enough, higher just leaves NULL things.
@@ -325,6 +325,12 @@ USE_RUNNING_BALANCE=false
 #
 FIREFLY_III_LAYOUT=v1

+#
+# Which Query Parser implementation to use for the search rngine and rules
+# 'new' is experimental, 'legacy' is the classic one
+#
+QUERY_PARSER_IMPLEMENTATION=legacy
+
 #
 # Please make sure this URL matches the external URL of your Firefly III installation.
 # It is used to validate specific requests and to generate URLs in emails.
@@ -8,56 +8,3 @@ pull_request_rules:
      close:
        message: Please do not open PR's on the `main` branch, but on the `develop`
          branch only. Thank you!
-  - name: No translations
-    conditions:
-      - -author~=^dependabot(|-preview)\[bot\]$
-      - base=develop
-      - or:
-          - files~=^resources/lang/bg_BG
-          - files~=^resources/lang/ca_ES
-          - files~=^resources/lang/cs_CZ
-          - files~=^resources/lang/da_DK
-          - files~=^resources/lang/de_DE
-          - files~=^resources/lang/el_GR
-          - files~=^resources/lang/en_GB
-          - files~=^resources/lang/es_ES
-          - files~=^resources/lang/et_EE
-          - files~=^resources/lang/fa_IR
-          - files~=^resources/lang/fi_FI
-          - files~=^resources/lang/fr_FR
-          - files~=^resources/lang/he_IL
-          - files~=^resources/lang/hu_HU
-          - files~=^resources/lang/id_ID
-          - files~=^resources/lang/is_IS
-          - files~=^resources/lang/it_IT
-          - files~=^resources/lang/ja_JP
-          - files~=^resources/lang/ko_KR
-          - files~=^resources/lang/lt_LT
-          - files~=^resources/lang/nb_NO
-          - files~=^resources/lang/nl_NL
-          - files~=^resources/lang/pl_PL
-          - files~=^resources/lang/pt_BR
-          - files~=^resources/lang/pt_PT
-          - files~=^resources/lang/ro_RO
-          - files~=^resources/lang/ru_RU
-          - files~=^resources/lang/si_LK
-          - files~=^resources/lang/sk_SK
-          - files~=^resources/lang/sl_SI
-          - files~=^resources/lang/sr_CS
-          - files~=^resources/lang/sv_SE
-          - files~=^resources/lang/th_TH
-          - files~=^resources/lang/tlh_AA
-          - files~=^resources/lang/tr_TR
-          - files~=^resources/lang/uk_UA
-          - files~=^resources/lang/vi_VN
-          - files~=^resources/lang/zh_CN
-          - files~=^resources/lang/zh_TW
-    actions:
-      comment:
-        message: >
-          Please do not submit translated strings in your PR. If you need new
-          sentences to be translated, add them to the `en_US` language strings.
-          New or changed translations for other languages can be submitted at
-          https://crowdin.com/project/firefly-iii
-
-          Thank you!
@@ -58,15 +58,6 @@ jobs:
          GITHUB_TOKEN: ${{ github.token }}
          CROWDIN_PROJECT_NR: ${{ secrets.CROWDIN_PROJECT_NR }}
          CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
-      - name: Cleanup translations
-        id: cleanup-transactions
-        uses: JC5/firefly-iii-dev@main
-        with:
-          action: 'ff3:crowdin-warning'
-          output: ''
-        env:
-          FIREFLY_III_ROOT: /github/workspace
-          GH_TOKEN: ''
      - name: Cleanup changelog
        id: cleanup-changelog
        uses: JC5/firefly-iii-dev@main
@@ -168,7 +159,7 @@ jobs:

          # if this is a develop build, slightly different variable names.
          if [[ "develop" == "$version" ]]; then
-            [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
+            #[[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
            releaseName=$version-$(date +'%Y%m%d')
            originalName=$releaseName
            zipName=FireflyIII-develop.zip
@@ -177,7 +168,7 @@ jobs:

          # 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;
+            #[[ -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
@@ -229,7 +220,7 @@ jobs:
          # describe the development release.
          if [[ "develop" == "$version" ]]; then
            echo 'Develop release.'
-            rm output.txt
+            rm -f 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
@@ -244,7 +235,7 @@ jobs:
          # describe a branch release
          if [[ "$version" == branch* ]]; then
            echo 'Branch release.'
-            rm output.txt
+            rm -f 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
@@ -257,9 +248,45 @@ jobs:
            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
+          if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]] && [[ "$version" != *alpha* ]] && [[ "$version" != *beta* ]]; then
            echo 'Main release.'
+            sudo chown -R runner:docker output.txt
+            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
+
+          # describe alpha release
+          if [[ "$version" == *alpha* ]]; then
+            echo 'ALPHA release.'
+            rm -f output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Very early ALPHA 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 '### 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
+
+          # describe beta release
+          if [[ "$version" == *beta* ]]; then
+            echo 'BETA release.'
+            rm -f output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Very early BETA 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 '### Instructions' >> output.txt
            echo '' >> output.txt
@@ -278,6 +305,7 @@ jobs:
            git push origin $releaseName
            gh release create $releaseName -p --verify-tag \
              -t "Development release for $(date +'%Y-%m-%d')" \
+              --latest=false \
              -F output.txt
          fi

@@ -291,6 +319,7 @@ jobs:
            git push origin $releaseName
            gh release create $releaseName -p --verify-tag \
              -t "Branch release for $(date +'%Y-%m-%d')" \
+              --latest=false \
              -F output.txt
          fi

@@ -316,7 +345,18 @@ jobs:
            echo 'MAIN (real) release'
            git tag -a $releaseName -m "Here be changelog"
            git push origin $releaseName
-            gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag
+
+            # do not tag as latest when alpha or beta.
+            if [[ "$version" == *alpha* ]] || [[ "$version" == *beta* ]]; then
+              echo 'Mark alpha or beta as NOT the latest.'
+              gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag --latest=false
+            fi
+
+            # tag as latest when NOT alpha or beta.
+            if [[ "$version" != *alpha* ]] && [[ "$version" != *beta* ]]; then
+              echo 'Mark prod as the latest.'
+              gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag
+            fi

            # add archive files to release
            gh release upload $releaseName $zipName
@@ -336,12 +376,12 @@ jobs:
            gh release upload $releaseName HEAD.txt

            # remove all temporary files
-            rm output.txt
-            rm HEAD.txt
-            rm $zipName
-            rm $zipName.sha256
-            rm $tarName
-            rm $tarName.sha256
+            rm -f output.txt
+            rm -f HEAD.txt
+            rm -f $zipName
+            rm -f $zipName.sha256
+            rm -f $tarName
+            rm -f $tarName.sha256

            # merge main back into develop
            git checkout develop
@@ -8,7 +8,7 @@ on:
      - develop
 env:
  DB_CONNECTION: sqlite
-  APP_KEY: UfpBqqeXx7zpNodsC6yjYQcRfDdm4Bxh
+  APP_KEY: TestTestTestTestTestTestTestTest
 jobs:
  sonarcloud:
    name: SonarCloud
@@ -46,7 +46,9 @@ jobs:
        run: composer install --prefer-dist --no-interaction --no-progress --no-scripts

      - name: "Create database file"
-        run: touch storage/database/database.sqlite
+        run: |
+          touch storage/database/database.sqlite
+          wget -q https://github.com/firefly-iii/test-fixtures/raw/refs/heads/main/test-database.sqlite -O storage/database/database.sqlite

      - name: "Upgrades the database to the latest version"
        run: php artisan firefly-iii:upgrade-database
@@ -4,6 +4,8 @@ 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.

 ## 2024
+- Sobuno
+- TasneemTantawy
 - Antônio Franco
 - yparitcher
 - Jhon Pedroza
@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Autocomplete;

 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\AccountFilter;
@@ -62,7 +62,7 @@ class AccountController extends Controller
                return $next($request);
            }
        );
-        $this->balanceTypes = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE];
+        $this->balanceTypes = [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];
    }

    /**
@@ -74,27 +74,27 @@ class AccountController extends Controller
     */
    public function accounts(AutocompleteRequest $request): JsonResponse
    {
-        $data            = $request->getData();
-        $types           = $data['types'];
-        $query           = $data['query'];
-        $date            = $data['date'] ?? today(config('app.timezone'));
-        $return          = [];
-        $result          = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit'));
-
-        // TODO this code is duplicated in the V2 Autocomplete controller, which means this code is due to be deprecated.
-        $defaultCurrency = app('amount')->getDefaultCurrency();
+        $data   = $request->getData();
+        $types  = $data['types'];
+        $query  = $data['query'];
+        $date   = $data['date'] ?? today(config('app.timezone'));
+        $return = [];
+        $result = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit'));

        /** @var Account $account */
        foreach ($result as $account) {
            $nameWithBalance = $account->name;
-            $currency        = $this->repository->getAccountCurrency($account) ?? $defaultCurrency;
-
+            $currency        = $this->repository->getAccountCurrency($account) ?? $this->defaultCurrency;
+            $useCurrency     = $currency;
            if (in_array($account->accountType->type, $this->balanceTypes, true)) {
                $balance         = Steam::finalAccountBalance($account, $date);
+                $key             = $this->convertToNative && $currency->id !== $this->defaultCurrency->id ? 'native_balance' : 'balance';
+                $useCurrency     = $this->convertToNative && $currency->id !== $this->defaultCurrency->id ? $this->defaultCurrency : $currency;
+                $amount          = $balance[$key] ?? '0';
                $nameWithBalance = sprintf(
                    '%s (%s)',
                    $account->name,
-                    app('amount')->formatAnything($currency, $balance['balance'], false)
+                    app('amount')->formatAnything($useCurrency, $amount, false)
                );
            }

@@ -103,11 +103,11 @@ class AccountController extends Controller
                'name'                    => $account->name,
                'name_with_balance'       => $nameWithBalance,
                'type'                    => $account->accountType->type,
-                'currency_id'             => (string) $currency->id,
-                'currency_name'           => $currency->name,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
+                'currency_id'             => (string) $useCurrency->id,
+                'currency_name'           => $useCurrency->name,
+                'currency_code'           => $useCurrency->code,
+                'currency_symbol'         => $useCurrency->symbol,
+                'currency_decimal_places' => $useCurrency->decimal_places,
            ];
        }

@@ -115,7 +115,7 @@ class AccountController extends Controller
        usort(
            $return,
            static function (array $left, array $right) {
-                $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
+                $order = [AccountTypeEnum::ASSET->value, AccountTypeEnum::REVENUE->value, AccountTypeEnum::EXPENSE->value];
                $posA  = (int) array_search($left['type'], $order, true);
                $posB  = (int) array_search($right['type'], $order, true);

@@ -27,9 +27,9 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\DateRequest;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\ApiSupport;
@@ -81,11 +81,10 @@ class AccountController extends Controller
        $end        = $dates['end'];

        // user's preferences
-        $defaultSet = $this->repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray();
+        $defaultSet = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value])->pluck('id')->toArray();

        /** @var Preference $frontpage */
        $frontpage  = app('preferences')->get('frontpageAccounts', $defaultSet);
-        $default    = app('amount')->getDefaultCurrency();

        if (!(is_array($frontpage->data) && count($frontpage->data) > 0)) {
            $frontpage->data = $defaultSet;
@@ -98,10 +97,8 @@ class AccountController extends Controller

        /** @var Account $account */
        foreach ($accounts as $account) {
-            $currency     = $this->repository->getAccountCurrency($account);
-            if (null === $currency) {
-                $currency = $default;
-            }
+            $currency     = $this->repository->getAccountCurrency($account) ?? $this->defaultCurrency;
+            $field        = $this->convertToNative && $currency->id !== $this->defaultCurrency->id ? 'native_balance' : 'balance';
            $currentSet   = [
                'label'                   => $account->name,
                'currency_id'             => (string) $currency->id,
@@ -117,12 +114,11 @@ class AccountController extends Controller
            // TODO this code is also present in the V2 chart account controller so this method is due to be deprecated.
            $currentStart = clone $start;
            $range        = app('steam')->finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
-            // 2022-10-11 this method no longer converts to float.
-            $previous     = array_values($range)[0];
+            $previous     = array_values($range)[0][$field];
            while ($currentStart <= $end) {
                $format                        = $currentStart->format('Y-m-d');
                $label                         = $currentStart->toAtomString();
-                $balance                       = array_key_exists($format, $range) ? $range[$format]['balance'] : $previous;
+                $balance                       = array_key_exists($format, $range) ? $range[$format][$field] : $previous;
                $previous                      = $balance;
                $currentStart->addDay();
                $currentSet['entries'][$label] = $balance;
@@ -25,17 +25,24 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Controllers;

 use Carbon\Carbon;
-use Carbon\Exceptions\InvalidDateException;
 use Carbon\Exceptions\InvalidFormatException;
 use FireflyIII\Models\Preference;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Support\Facades\Amount;
 use FireflyIII\Support\Facades\Steam;
+use FireflyIII\Transformers\V2\AbstractTransformer;
 use FireflyIII\User;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Collection;
 use League\Fractal\Manager;
+use League\Fractal\Pagination\IlluminatePaginatorAdapter;
+use League\Fractal\Resource\Collection as FractalCollection;
+use League\Fractal\Resource\Item;
 use League\Fractal\Serializer\JsonApiSerializer;
 use Symfony\Component\HttpFoundation\Exception\BadRequestException;
 use Symfony\Component\HttpFoundation\ParameterBag;
@@ -43,8 +50,8 @@ use Symfony\Component\HttpFoundation\ParameterBag;
 /**
 * Class Controller.
 *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
+ * @SuppressWarnings("PHPMD.NumberOfChildren")
 */
 abstract class Controller extends BaseController
 {
@@ -58,6 +65,7 @@ abstract class Controller extends BaseController
    protected array        $allowedSort;
    protected ParameterBag $parameters;
    protected bool        $convertToNative = false;
+    protected TransactionCurrency $defaultCurrency;

    /**
     * Controller constructor.
@@ -72,6 +80,7 @@ abstract class Controller extends BaseController
                if (auth()->check()) {
                    $language              = Steam::getLanguage();
                    $this->convertToNative = Amount::convertToNative();
+                    $this->defaultCurrency = Amount::getNativeCurrency();
                    app()->setLocale($language);

                }
@@ -113,7 +122,7 @@ abstract class Controller extends BaseController
            if (null !== $date) {
                try {
                    $obj = Carbon::parse((string) $date);
-                } catch (InvalidDateException|InvalidFormatException $e) {
+                } catch (InvalidFormatException $e) {
                    // don't care
                    app('log')->warning(
                        sprintf(
@@ -221,4 +230,45 @@ abstract class Controller extends BaseController

        return $manager;
    }
+
+    final protected function jsonApiList(string $key, LengthAwarePaginator $paginator, AbstractTransformer $transformer): array
+    {
+        $manager  = new Manager();
+        $baseUrl  = sprintf('%s/api/v1/', request()->getSchemeAndHttpHost());
+
+        // TODO add stuff to path?
+
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $objects  = $paginator->getCollection();
+
+        // the transformer, at this point, needs to collect information that ALL items in the collection
+        // require, like meta-data and stuff like that, and save it for later.
+        $objects  = $transformer->collectMetaData($objects);
+        $paginator->setCollection($objects);
+
+        $resource = new FractalCollection($objects, $transformer, $key);
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return $manager->createData($resource)->toArray();
+    }
+
+    /**
+     * Returns a JSON API object and returns it.
+     *
+     * @param array<int, mixed>|Model $object
+     */
+    final protected function jsonApiObject(string $key, array|Model $object, AbstractTransformer $transformer): array
+    {
+        // create some objects:
+        $manager  = new Manager();
+        $baseUrl  = sprintf('%s/api/v1', request()->getSchemeAndHttpHost());
+        $manager->setSerializer(new JsonApiSerializer($baseUrl));
+
+        $transformer->collectMetaData(new Collection([$object]));
+
+        $resource = new Item($object, $transformer, $key);
+
+        return $manager->createData($resource)->toArray();
+    }
 }
@@ -26,10 +26,10 @@ namespace FireflyIII\Api\V1\Controllers\Data;

 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\DestroyRequest;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
@@ -66,9 +66,9 @@ class DestroyController extends Controller
        $objects         = $request->getObjects();
        $this->unused    = $request->boolean('unused', false);

-        $allExceptAssets = [AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::RECONCILIATION, AccountType::REVENUE];
-        $all             = [AccountType::ASSET, AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEBT, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::RECONCILIATION];
-        $liabilities     = [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD];
+        $allExceptAssets = [AccountTypeEnum::BENEFICIARY->value, AccountTypeEnum::CASH->value, AccountTypeEnum::CREDITCARD->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::RECONCILIATION->value, AccountTypeEnum::REVENUE->value];
+        $all             = [AccountTypeEnum::ASSET->value, AccountTypeEnum::BENEFICIARY->value, AccountTypeEnum::CASH->value, AccountTypeEnum::CREDITCARD->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::EXPENSE->value, AccountTypeEnum::IMPORT->value, AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::LIABILITY_CREDIT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::RECONCILIATION->value];
+        $liabilities     = [AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::CREDITCARD->value];
        $transactions    = [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value, TransactionTypeEnum::RECONCILIATION->value];

        match ($objects) {
@@ -82,9 +82,9 @@ class DestroyController extends Controller
            'object_groups'          => $this->destroyObjectGroups(),
            'not_assets_liabilities' => $this->destroyAccounts($allExceptAssets),
            'accounts'               => $this->destroyAccounts($all),
-            'asset_accounts'         => $this->destroyAccounts([AccountType::ASSET, AccountType::DEFAULT]),
-            'expense_accounts'       => $this->destroyAccounts([AccountType::BENEFICIARY, AccountType::EXPENSE]),
-            'revenue_accounts'       => $this->destroyAccounts([AccountType::REVENUE]),
+            'asset_accounts'         => $this->destroyAccounts([AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value]),
+            'expense_accounts'       => $this->destroyAccounts([AccountTypeEnum::BENEFICIARY->value, AccountTypeEnum::EXPENSE->value]),
+            'revenue_accounts'       => $this->destroyAccounts([AccountTypeEnum::REVENUE->value]),
            'liabilities'            => $this->destroyAccounts($liabilities),
            'transactions'           => $this->destroyTransactions($transactions),
            'withdrawals'            => $this->destroyTransactions([TransactionTypeEnum::WITHDRAWAL->value]),
@@ -59,7 +59,7 @@ class ExportController extends Controller
     *
     * @throws FireflyException
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function accounts(ExportRequest $request): LaravelResponse
    {
@@ -100,7 +100,7 @@ class ExportController extends Controller
     *
     * @throws FireflyException
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function bills(ExportRequest $request): LaravelResponse
    {
@@ -115,7 +115,7 @@ class ExportController extends Controller
     *
     * @throws FireflyException
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function budgets(ExportRequest $request): LaravelResponse
    {
@@ -130,7 +130,7 @@ class ExportController extends Controller
     *
     * @throws FireflyException
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function categories(ExportRequest $request): LaravelResponse
    {
@@ -145,7 +145,7 @@ class ExportController extends Controller
     *
     * @throws FireflyException
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function piggyBanks(ExportRequest $request): LaravelResponse
    {
@@ -160,7 +160,7 @@ class ExportController extends Controller
     *
     * @throws FireflyException
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function recurring(ExportRequest $request): LaravelResponse
    {
@@ -175,7 +175,7 @@ class ExportController extends Controller
     *
     * @throws FireflyException
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function rules(ExportRequest $request): LaravelResponse
    {
@@ -190,7 +190,7 @@ class ExportController extends Controller
     *
     * @throws FireflyException
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function tags(ExportRequest $request): LaravelResponse
    {
@@ -29,7 +29,9 @@ use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;

 /**
 * Class BillController
@@ -63,11 +65,13 @@ class BillController extends Controller
     */
    public function bill(GenericRequest $request): JsonResponse
    {
-        $accounts   = $request->getAssetAccounts();
-        $bills      = $request->getBills();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $bills           = $request->getBills();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();
+        $response        = [];

        // get all bills:
        if (0 === $bills->count()) {
@@ -75,17 +79,30 @@ class BillController extends Controller
        }

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector  = app(GroupCollectorInterface::class);
+        $collector       = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
        $collector->setBills($bills);

-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();
        foreach ($genericSet as $journal) {
-            $billId            = (int) $journal['bill_id'];
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
-            $key               = sprintf('%d-%d', $billId, $currencyId);
-            $foreignKey        = sprintf('%d-%d', $billId, $foreignCurrencyId);
+            $billId       = (int) $journal['bill_id'];
+            $currencyId   = (int) $journal['currency_id'];
+            $currencyCode = $journal['currency_code'];
+            $field        = 'amount';
+
+            // use the native amount if the user wants to convert to native currency
+            if ($convertToNative && $currencyId !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
+                $field        = 'native_amount';
+            }
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
+            }
+            Log::debug(sprintf('Journal #%d in bill #%d will use %s (%s %s)', $journal['transaction_group_id'], $billId, $field, $currencyCode, $journal[$field] ?? '0'));
+
+            $key          = sprintf('%d-%d', $billId, $currencyId);

            if (0 !== $currencyId) {
                $response[$key] ??= [
@@ -94,21 +111,11 @@ class BillController extends Controller
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string) $currencyId,
-                    'currency_code'    => $journal['currency_code'],
+                    'currency_code'    => $currencyCode,
                ];
-                $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
+                $response[$key]['difference']       = bcadd($response[$key]['difference'], (string) ($journal[$field] ?? '0'));
                $response[$key]['difference_float'] = (float) $response[$key]['difference']; // intentional float
            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignKey] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
-                $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
-            }
        }

        return response()->json(array_values($response));
@@ -122,42 +129,47 @@ class BillController extends Controller
     */
    public function noBill(GenericRequest $request): JsonResponse
    {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();
+        $response        = [];

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector  = app(GroupCollectorInterface::class);
+        $collector       = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
        $collector->withoutBill();

-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();

        foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $currencyId   = (int) $journal['currency_id'];
+            $currencyCode = $journal['currency_code'];
+            $field        = 'amount';
+
+            // use the native amount if the user wants to convert to native currency
+            if ($convertToNative && $currencyId !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
+                $field        = 'native_amount';
+            }
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
+            }
+            Log::debug(sprintf('Journal #%d will use %s (%s %s)', $journal['transaction_group_id'], $field, $currencyCode, $journal[$field] ?? '0'));

            if (0 !== $currencyId) {
                $response[$currencyId] ??= [
                    'difference'       => '0',
                    'difference_float' => 0,
                    'currency_id'      => (string) $currencyId,
-                    'currency_code'    => $journal['currency_code'],
+                    'currency_code'    => $currencyCode,
                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
+                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) ($journal[$field] ?? '0'));
                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // intentional float
            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // intentional float
-            }
        }

        return response()->json(array_values($response));
@@ -28,7 +28,9 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;

 /**
 * Class PeriodController
@@ -41,39 +43,49 @@ class PeriodController extends Controller
     */
    public function total(GenericRequest $request): JsonResponse
    {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();

        // collect all expenses in this period (regardless of type)
-        $collector  = app(GroupCollectorInterface::class);
+        $collector       = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();
        foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            // same code as many other sumExpense methods. I think this needs some kind of generic method.
+            $amount                                    = '0';
+            $currencyId                                = (int) $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            if ($convertToNative) {
+                $amount = Amount::getAmountFromJournal($journal);
+                if ($default->id !== (int) $journal['currency_id'] && $default->id !== (int) $journal['foreign_currency_id']) {
+                    $currencyId   = $default->id;
+                    $currencyCode = $default->code;
+                }
+                if ($default->id !== (int) $journal['currency_id'] && $default->id === (int) $journal['foreign_currency_id']) {
+                    $currencyId   = $journal['foreign_currency_id'];
+                    $currencyCode = $journal['foreign_currency_code'];
+                }
+                Log::debug(sprintf('[a] Add amount %s %s', $currencyCode, $amount));
+            }
+            if (!$convertToNative) {
+                // ignore the amount in foreign currency.
+                Log::debug(sprintf('[b] Add amount %s %s', $currencyCode, $journal['amount']));
+                $amount = $journal['amount'];
+            }

-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // intentional float
-            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // intentional float
-            }
+
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $amount);
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // intentional float
        }

        return response()->json(array_values($response));
@@ -29,7 +29,9 @@ use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;

 /**
 * Class TagController
@@ -62,42 +64,51 @@ class TagController extends Controller
     */
    public function noTag(GenericRequest $request): JsonResponse
    {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector  = app(GroupCollectorInterface::class);
+        $collector       = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
        $collector->withoutTags();

-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();

        foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            // same code as many other sumExpense methods. I think this needs some kind of generic method.
+            $amount                                    = '0';
+            $currencyId                                = (int) $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            if ($convertToNative) {
+                $amount = Amount::getAmountFromJournal($journal);
+                if ($default->id !== (int) $journal['currency_id'] && $default->id !== (int) $journal['foreign_currency_id']) {
+                    $currencyId   = $default->id;
+                    $currencyCode = $default->code;
+                }
+                if ($default->id !== (int) $journal['currency_id'] && $default->id === (int) $journal['foreign_currency_id']) {
+                    $currencyId   = $journal['foreign_currency_id'];
+                    $currencyCode = $journal['foreign_currency_code'];
+                }
+                Log::debug(sprintf('[a] Add amount %s %s', $currencyCode, $amount));
+            }
+            if (!$convertToNative) {
+                // ignore the amount in foreign currency.
+                Log::debug(sprintf('[b] Add amount %s %s', $currencyCode, $journal['amount']));
+                $amount = $journal['amount'];
+            }

-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
-            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose.
-            }
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $amount);
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
        }

        return response()->json(array_values($response));
@@ -73,6 +73,7 @@ class AccountController extends Controller
        $start         = $request->getStart();
        $end           = $request->getEnd();
        $assetAccounts = $request->getAssetAccounts();
+
        $income        = $this->opsRepository->sumIncomeByDestination($start, $end, $assetAccounts);
        $result        = [];

@@ -28,6 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;

 /**
@@ -41,42 +42,41 @@ class PeriodController extends Controller
     */
    public function total(GenericRequest $request): JsonResponse
    {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();

        // collect all expenses in this period (regardless of type)
-        $collector  = app(GroupCollectorInterface::class);
+        $collector       = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts);
-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();
        foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            // currency
+            $currencyId                                = $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            $field                                     = $convertToNative && $currencyId !== $default->id ? 'native_amount' : 'amount';

-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
+            // perhaps use default currency instead?
+            if ($convertToNative && $journal['currency_id'] !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'],
-                    app('steam')->positive($journal['foreign_amount'])
-                );
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose.
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
            }
+
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
        }

        return response()->json(array_values($response));
@@ -29,6 +29,7 @@ use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;

 /**
@@ -63,45 +64,45 @@ class TagController extends Controller
     */
    public function noTag(GenericRequest $request): JsonResponse
    {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector  = app(GroupCollectorInterface::class);
+        $collector       = app(GroupCollectorInterface::class);
        $collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts);
        $collector->withoutTags();

-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();

        foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            // currency
+            $currencyId                                = $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            $field                                     = $convertToNative && $currencyId !== $default->id ? 'native_amount' : 'amount';

-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+            // perhaps use default currency instead?
+            if ($convertToNative && $journal['currency_id'] !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'],
-                    app('steam')->positive($journal['foreign_amount'])
-                );
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
            }
+
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+
        }

        return response()->json(array_values($response));
@@ -26,8 +26,9 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;

 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;

 /**
@@ -41,42 +42,42 @@ class PeriodController extends Controller
     */
    public function total(GenericRequest $request): JsonResponse
    {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();

        // collect all expenses in this period (regardless of type)
-        $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
-        $genericSet = $collector->getExtractedJournals();
+        $collector       = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionTypeEnum::TRANSFER->value])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $genericSet      = $collector->getExtractedJournals();
        foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            // currency
+            $currencyId                                = $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            $field                                     = $convertToNative && $currencyId !== $default->id ? 'native_amount' : 'amount';

-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+            // perhaps use default currency instead?
+            if ($convertToNative && $journal['currency_id'] !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'],
-                    app('steam')->positive($journal['foreign_amount'])
-                );
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
            }
+
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+
        }

        return response()->json(array_values($response));
@@ -26,9 +26,10 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;

 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
+use FireflyIII\Support\Facades\Amount;
 use Illuminate\Http\JsonResponse;

 /**
@@ -61,45 +62,46 @@ class TagController extends Controller
     */
    public function noTag(GenericRequest $request): JsonResponse
    {
-        $accounts   = $request->getAssetAccounts();
-        $start      = $request->getStart();
-        $end        = $request->getEnd();
-        $response   = [];
+        $accounts        = $request->getAssetAccounts();
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $response        = [];
+        $convertToNative = Amount::convertToNative();
+        $default         = Amount::getNativeCurrency();
+

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector       = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionTypeEnum::TRANSFER->value])->setRange($start, $end)->setDestinationAccounts($accounts);
        $collector->withoutTags();

-        $genericSet = $collector->getExtractedJournals();
+        $genericSet      = $collector->getExtractedJournals();

        foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            // currency
+            $currencyId                                = $journal['currency_id'];
+            $currencyCode                              = $journal['currency_code'];
+            $field                                     = $convertToNative && $currencyId !== $default->id ? 'native_amount' : 'amount';

-            if (0 !== $currencyId) {
-                $response[$currencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $currencyId,
-                    'currency_code'    => $journal['currency_code'],
-                ];
-                $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+            // perhaps use default currency instead?
+            if ($convertToNative && $journal['currency_id'] !== $default->id) {
+                $currencyId   = $default->id;
+                $currencyCode = $default->code;
            }
-            if (0 !== $foreignCurrencyId) {
-                $response[$foreignCurrencyId] ??= [
-                    'difference'       => '0',
-                    'difference_float' => 0,
-                    'currency_id'      => (string) $foreignCurrencyId,
-                    'currency_code'    => $journal['foreign_currency_code'],
-                ];
-                $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'],
-                    app('steam')->positive($journal['foreign_amount'])
-                );
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
+            // use foreign amount when the foreign currency IS the default currency.
+            if ($convertToNative && $journal['currency_id'] !== $default->id && $default->id === $journal['foreign_currency_id']) {
+                $field = 'foreign_amount';
            }
+
+            $response[$currencyId] ??= [
+                'difference'       => '0',
+                'difference_float' => 0,
+                'currency_id'      => (string) $currencyId,
+                'currency_code'    => $currencyCode,
+            ];
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+
        }

        return response()->json(array_values($response));
@@ -126,7 +128,7 @@ class TagController extends Controller

        // collect all expenses in this period (regardless of type) by the given bills and accounts.
        $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::TRANSFER->value])->setRange($start, $end)->setDestinationAccounts($accounts);
        $collector->setTags($tags);
        $genericSet = $collector->getExtractedJournals();

@@ -100,7 +100,7 @@ class ShowController extends Controller
     *
     * Display a listing of the budget limits for this budget.
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function indexAll(SameDateRequest $request): JsonResponse
    {
@@ -37,7 +37,7 @@ class ExpressionController extends Controller
     * This endpoint is documented at:
     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/rules/validateExpression
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function validateExpression(ValidateExpressionRequest $request): JsonResponse
    {
@@ -88,21 +88,21 @@ class StoreController extends Controller

        try {
            $transactionGroup = $this->groupRepository->store($data);
-        } catch (DuplicateTransactionException $e) { // @phpstan-ignore-line
+        } catch (DuplicateTransactionException $e) {
            app('log')->warning('Caught a duplicate transaction. Return error message.');
            $validator = \Validator::make(
                ['transactions' => [['description' => $e->getMessage()]]],
                ['transactions.0.description' => new IsDuplicateTransaction()]
            );

-            throw new ValidationException($validator); // @phpstan-ignore-line
-        } catch (FireflyException $e) { // @phpstan-ignore-line
+            throw new ValidationException($validator);
+        } catch (FireflyException $e) {
            app('log')->warning('Caught an exception. Return error message.');
            app('log')->error($e->getMessage());
            $message   = sprintf('Internal exception: %s', $e->getMessage());
            $validator = \Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction()]);

-            throw new ValidationException($validator); // @phpstan-ignore-line
+            throw new ValidationException($validator);
        }
        app('preferences')->mark();
        $applyRules    = $data['apply_rules'] ?? true;
@@ -239,7 +239,7 @@ class ListController extends Controller
        $unfiltered     = $recurringRepos->getAll();

        // filter selection
-        $collection     = $unfiltered->filter( // @phpstan-ignore-line
+        $collection     = $unfiltered->filter(
            static function (Recurrence $recurrence) use ($currency) {  // @phpstan-ignore-line
                /** @var RecurrenceTransaction $transaction */
                foreach ($recurrence->recurrenceTransactions as $transaction) {
@@ -286,7 +286,7 @@ class ListController extends Controller
        $ruleRepos   = app(RuleRepositoryInterface::class);
        $unfiltered  = $ruleRepos->getAll();

-        $collection  = $unfiltered->filter( // @phpstan-ignore-line
+        $collection  = $unfiltered->filter(
            static function (Rule $rule) use ($currency) { // @phpstan-ignore-line
                /** @var RuleTrigger $trigger */
                foreach ($rule->ruleTriggers as $trigger) {
@@ -105,19 +105,18 @@ class ShowController extends Controller
    public function show(TransactionCurrency $currency): JsonResponse
    {
        /** @var User $user */
-        $user            = auth()->user();
-        $manager         = $this->getManager();
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
-        $this->parameters->set('defaultCurrency', $defaultCurrency);
+        $user        = auth()->user();
+        $manager     = $this->getManager();
+        $this->parameters->set('defaultCurrency', $this->defaultCurrency);

        // update fields with user info.
        $currency->refreshForUser($user);

        /** @var CurrencyTransformer $transformer */
-        $transformer     = app(CurrencyTransformer::class);
+        $transformer = app(CurrencyTransformer::class);
        $transformer->setParameters($this->parameters);

-        $resource        = new Item($currency, $transformer, 'currencies');
+        $resource    = new Item($currency, $transformer, 'currencies');

        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
    }
@@ -135,7 +134,7 @@ class ShowController extends Controller
        /** @var User $user */
        $user        = auth()->user();
        $manager     = $this->getManager();
-        $currency    = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
+        $currency    = $this->defaultCurrency;

        // update fields with user info.
        $currency->refreshForUser($user);
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * IndexController.php
+ * Copyright (c) 2024 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\UserGroup;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Data\DateRequest;
+use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
+use FireflyIII\Transformers\UserGroupTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Pagination\LengthAwarePaginator;
+
+class IndexController extends Controller
+{
+    public const string RESOURCE_KEY = 'user_groups';
+
+    private UserGroupRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(UserGroupRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    public function index(DateRequest $request): JsonResponse
+    {
+        $administrations = $this->repository->get();
+        $pageSize        = $this->parameters->get('limit');
+        $count           = $administrations->count();
+        $administrations = $administrations->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+        $paginator       = new LengthAwarePaginator($administrations, $count, $pageSize, $this->parameters->get('page'));
+        $transformer     = new UserGroupTransformer();
+
+        $transformer->setParameters($this->parameters); // give params to transformer
+
+        return response()
+            ->json($this->jsonApiList(self::RESOURCE_KEY, $paginator, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+}
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * ShowController.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\UserGroup;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Repositories\Webhook\WebhookRepositoryInterface;
+use FireflyIII\Transformers\UserGroupTransformer;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class ShowController
+ */
+class ShowController extends Controller
+{
+    public const string RESOURCE_KEY = 'user_groups';
+    private WebhookRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(WebhookRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    public function show(UserGroup $userGroup): JsonResponse
+    {
+        $transformer = new UserGroupTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject(self::RESOURCE_KEY, $userGroup, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+}
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * UpdateController.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Models\UserGroup;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Models\UserGroup\UpdateRequest;
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
+use FireflyIII\Transformers\UserGroupTransformer;
+use Illuminate\Http\JsonResponse;
+
+class UpdateController extends Controller
+{
+    public const string RESOURCE_KEY = 'user_groups';
+
+    private UserGroupRepositoryInterface $repository;
+
+    /**
+     * AccountController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(UserGroupRepositoryInterface::class);
+
+                return $next($request);
+            }
+        );
+    }
+
+    public function update(UpdateRequest $request, UserGroup $userGroup): JsonResponse
+    {
+        app('log')->debug(sprintf('Now in %s', __METHOD__));
+        $data        = $request->getData();
+        $userGroup   = $this->repository->update($userGroup, $data);
+        $userGroup->refresh();
+        app('preferences')->mark();
+
+        $transformer = new UserGroupTransformer();
+        $transformer->setParameters($this->parameters);
+
+        return response()
+            ->api($this->jsonApiObject(self::RESOURCE_KEY, $userGroup, $transformer))
+            ->header('Content-Type', self::CONTENT_TYPE)
+        ;
+    }
+}
@@ -103,10 +103,10 @@ class BasicController extends Controller
        $billData     = $this->getBillInformation($start, $end);
        $spentData    = $this->getLeftToSpendInfo($start, $end);
        $netWorthData = $this->getNetWorthInfo($start, $end);
-        //        $balanceData  = [];
-        //        $billData     = [];
-        //        $spentData    = [];
-        //        $netWorthData = [];
+        //                $balanceData  = [];
+        //                $billData     = [];
+        //                $spentData    = [];
+        //                $netWorthData = [];
        $total        = array_merge($balanceData, $billData, $spentData, $netWorthData);

        // give new keys
@@ -124,7 +124,7 @@ class BasicController extends Controller
    {
        // some config settings
        $convertToNative = Amount::convertToNative();
-        $default         = Amount::getDefaultCurrency();
+        $default         = Amount::getNativeCurrency();
        // prep some arrays:
        $incomes         = [];
        $expenses        = [];
@@ -276,13 +276,13 @@ class BasicController extends Controller
     */
    private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
    {
+        Log::debug(sprintf('Now in getLeftToSpendInfo("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));
        $return    = [];
        $today     = today(config('app.timezone'));
        $available = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
        $budgets   = $this->budgetRepository->getActiveBudgets();
        $spent     = $this->opsRepository->sumExpenses($start, $end, null, $budgets);
        $days      = (int) $today->diffInDays($end, true) + 1;
-        Log::debug(sprintf('Now in getLeftToSpendInfo("%s", "%s")', $start->format('Y-m-d H:i:s'), $end->format('Y-m-d H:i:s')));

        foreach ($spent as $row) {
            // either an amount was budgeted or 0 is available.
@@ -24,7 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Autocomplete;

-use FireflyIII\Models\AccountType;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
@@ -46,7 +46,7 @@ class AutocompleteRequest extends FormRequest
        }

        // remove 'initial balance' from allowed types. its internal
-        $array = array_diff($array, [AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION]);
+        $array = array_diff($array, [AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::RECONCILIATION->value]);

        return [
            'types' => $array,
@@ -55,6 +55,7 @@ class DateRequest extends FormRequest
        return [
            'start' => $start,
            'end'   => $end,
+            'date'  => $this->getCarbonDate('date'),
        ];
    }

@@ -64,8 +65,9 @@ class DateRequest extends FormRequest
    public function rules(): array
    {
        return [
-            'start' => 'required|date',
-            'end'   => 'required|date|after:start',
+            'date'  => 'date|after:1900-01-01|before:2099-12-31',
+            'start' => 'date|after:1900-01-01|before:2099-12-31|before:end|required_with:end',
+            'end'   => 'date|after:1900-01-01|before:2099-12-31|after:start|required_with:start',
        ];
    }
 }
@@ -24,7 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V1\Requests\Data\Export;

-use FireflyIII\Models\AccountType;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -55,7 +55,7 @@ class ExportRequest extends FormRequest
            $accountId = (int) $part;
            if (0 !== $accountId) {
                $account = $repository->find($accountId);
-                if (null !== $account && AccountType::ASSET === $account->accountType->type) {
+                if (null !== $account && AccountTypeEnum::ASSET->value === $account->accountType->type) {
                    $accounts->push($account);
                }
            }
@@ -25,8 +25,8 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V1\Requests\Insight;

 use Carbon\Carbon;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@@ -70,7 +70,7 @@ class GenericRequest extends FormRequest
        /** @var Account $account */
        foreach ($this->accounts as $account) {
            $type = $account->accountType->type;
-            if (in_array($type, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], true)) {
+            if (in_array($type, [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value], true)) {
                $return->push($account);
            }
        }
@@ -191,7 +191,7 @@ class GenericRequest extends FormRequest
        /** @var Account $account */
        foreach ($this->accounts as $account) {
            $type = $account->accountType->type;
-            if (AccountType::EXPENSE === $type) {
+            if (AccountTypeEnum::EXPENSE->value === $type) {
                $return->push($account);
            }
        }
@@ -207,7 +207,7 @@ class GenericRequest extends FormRequest
        /** @var Account $account */
        foreach ($this->accounts as $account) {
            $type = $account->accountType->type;
-            if (AccountType::REVENUE === $type) {
+            if (AccountTypeEnum::REVENUE->value === $type) {
                $return->push($account);
            }
        }
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * UpdateRequest.php
+ * Copyright (c) 2021 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Requests\Models\UserGroup;
+
+use FireflyIII\Models\UserGroup;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Class UpdateRequest
+ */
+class UpdateRequest extends FormRequest
+{
+    use ChecksLogin;
+    use ConvertsDataTypes;
+
+    public function getData(): array
+    {
+        $fields = [
+            'title'                => ['title', 'convertString'],
+            'native_currency_id'   => ['native_currency_id', 'convertInteger'],
+            'native_currency_code' => ['native_currency_code', 'convertString'],
+        ];
+
+        return $this->getAllData($fields);
+    }
+
+    /**
+     * Rules for this request.
+     */
+    public function rules(): array
+    {
+        /** @var UserGroup $userGroup */
+        $userGroup = $this->route()->parameter('userGroup');
+
+        return [
+            'title'                => ['required', 'min:1', 'max:255'],
+            'native_currency_id'   => 'exists:transaction_currencies,id',
+            'native_currency_code' => 'exists:transaction_currencies,code',
+        ];
+    }
+}
@@ -55,7 +55,7 @@ class AccountController extends Controller
                $userGroup        = $this->validateUserGroup($request);
                $this->repository = app(AccountRepositoryInterface::class);
                $this->repository->setUserGroup($userGroup);
-                $this->default    = app('amount')->getDefaultCurrency();
+                $this->default    = app('amount')->getNativeCurrency();
                $this->converter  = app(ExchangeRateConverter::class);

                return $next($request);
@@ -57,7 +57,7 @@ class AccountController extends Controller
                $this->repository = app(AccountRepositoryInterface::class);
                $this->repository->setUserGroup($this->validateUserGroup($request));
                $this->chartData  = new ChartData();
-                $this->default    = app('amount')->getDefaultCurrency();
+                $this->default    = app('amount')->getNativeCurrency();

                return $next($request);
            }
@@ -62,7 +62,7 @@ class BalanceController extends Controller
                $this->repository->setUserGroup($userGroup);
                $this->collector->setUserGroup($userGroup);
                $this->chartData  = new ChartData();
-                // $this->default    = app('amount')->getDefaultCurrency();
+                // $this->default    = app('amount')->getNativeCurrency();

                return $next($request);
            }
@@ -87,7 +87,7 @@ class BalanceController extends Controller

        // prepare for currency conversion and data collection:
        /** @var TransactionCurrency $default */
-        $default         = app('amount')->getDefaultCurrency();
+        $default         = app('amount')->getNativeCurrency();

        // get journals for entire period:

@@ -63,7 +63,7 @@ class BudgetController extends Controller
                $this->repository    = app(BudgetRepositoryInterface::class);
                $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
                $this->opsRepository = app(OperationsRepositoryInterface::class);
-                $this->currency      = app('amount')->getDefaultCurrency();
+                $this->currency      = app('amount')->getNativeCurrency();
                $userGroup           = $this->validateUserGroup($request);
                $this->repository->setUserGroup($userGroup);
                $this->opsRepository->setUserGroup($userGroup);
@@ -27,10 +27,10 @@ namespace FireflyIII\Api\V2\Controllers\Chart;
 use Carbon\Carbon;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\CleansChartData;
@@ -70,7 +70,7 @@ class CategoryController extends Controller
     *
     * @throws FireflyException
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function dashboard(DateRequest $request): JsonResponse
    {
@@ -81,8 +81,8 @@ class CategoryController extends Controller

        /** @var Carbon $end */
        $end        = $this->parameters->get('end');
-        $accounts   = $this->accountRepos->getAccountsByType([AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::ASSET, AccountType::DEFAULT]);
-        $default    = app('amount')->getDefaultCurrency();
+        $accounts   = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value]);
+        $default    = app('amount')->getNativeCurrency();
        $converter  = new ExchangeRateConverter();
        $currencies = [];
        $return     = [];
@@ -47,8 +47,8 @@ use Symfony\Component\HttpFoundation\ParameterBag;
 /**
 * Class Controller
 *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.NumberOfChildren)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
+ * @SuppressWarnings("PHPMD.NumberOfChildren")
 */
 class Controller extends BaseController
 {
@@ -74,7 +74,7 @@ class Controller extends BaseController
     * TODO duplicate from V1 controller
     * Method to grab all parameters from the URL.
     *
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings("PHPMD.NPathComplexity")
     */
    private function getParameters(): ParameterBag
    {
@@ -58,7 +58,7 @@ class SumController extends Controller
     *
     * TODO see autocomplete/accountcontroller for list.
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function paid(DateRequest $request): JsonResponse
    {
@@ -74,7 +74,7 @@ class SumController extends Controller
     *
     * TODO see autocomplete/accountcontroller for list.
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function unpaid(DateRequest $request): JsonResponse
    {
@@ -27,6 +27,7 @@ namespace FireflyIII\Api\V2\Controllers\Model\ExchangeRate;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Repositories\UserGroups\ExchangeRate\ExchangeRateRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Transformers\V2\ExchangeRateTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Pagination\LengthAwarePaginator;

@@ -80,21 +80,21 @@ class StoreController extends Controller

        try {
            $transactionGroup = $this->groupRepository->store($data);
-        } catch (DuplicateTransactionException $e) { // @phpstan-ignore-line
+        } catch (DuplicateTransactionException $e) {
            app('log')->warning('Caught a duplicate transaction. Return error message.');
            $validator = Validator::make(
                ['transactions' => [['description' => $e->getMessage()]]],
                ['transactions.0.description' => new IsDuplicateTransaction()]
            );

-            throw new ValidationException($validator); // @phpstan-ignore-line
-        } catch (FireflyException $e) { // @phpstan-ignore-line
+            throw new ValidationException($validator);
+        } catch (FireflyException $e) {
            app('log')->warning('Caught an exception. Return error message.');
            app('log')->error($e->getMessage());
            $message   = sprintf('Internal exception: %s', $e->getMessage());
            $validator = Validator::make(['transactions' => [['description' => $message]]], ['transactions.0.description' => new IsDuplicateTransaction()]);

-            throw new ValidationException($validator); // @phpstan-ignore-line
+            throw new ValidationException($validator);
        }
        app('preferences')->mark();
        $applyRules         = $data['apply_rules'] ?? true;
@@ -66,7 +66,7 @@ class ShowController extends Controller
            $default = 1 === $group->pivot->group_default;
        }
        $currency->userGroupEnabled = $enabled;
-        $currency->userGroupDefault = $default;
+        $currency->userGroupNative  = $default;


        $transformer                = new CurrencyTransformer();
@@ -27,12 +27,12 @@ namespace FireflyIII\Api\V2\Controllers\Summary;
 use Carbon\Carbon;
 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\DateRequest;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Helpers\Report\NetWorthInterface;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\UserGroup;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\UserGroups\Bill\BillRepositoryInterface;
@@ -94,7 +94,7 @@ class BasicController extends Controller
     *
     * @throws \Exception
     *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function basic(DateRequest $request): JsonResponse
    {
@@ -118,7 +118,7 @@ class BasicController extends Controller
    private function getBalanceInformation(Carbon $start, Carbon $end): array
    {
        $object    = new SummaryBalanceGrouped();
-        $default   = app('amount')->getDefaultCurrency();
+        $default   = app('amount')->getNativeCurrency();

        $object->setDefault($default);

@@ -222,7 +222,7 @@ class BasicController extends Controller
    }

    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings("PHPMD.ExcessiveMethodLength")
     */
    private function getLeftToSpendInfo(Carbon $start, Carbon $end): array
    {
@@ -233,7 +233,7 @@ class BasicController extends Controller
        $available    = $this->abRepository->getAvailableBudgetWithCurrency($start, $end);
        $budgets      = $this->budgetRepository->getActiveBudgets();
        $spent        = $this->opsRepository->listExpenses($start, $end, null, $budgets);
-        $default      = app('amount')->getDefaultCurrency();
+        $default      = app('amount')->getNativeCurrency();
        $currencies   = [];
        $converter    = new ExchangeRateConverter();

@@ -353,7 +353,7 @@ class BasicController extends Controller
        $netWorthHelper = app(NetWorthInterface::class);
        $netWorthHelper->setUserGroup($userGroup);
        $allAccounts    = $this->accountRepository->getActiveAccountsByType(
-            [AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::DEBT]
+            [AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::DEBT->value]
        );

        // filter list on preference of being included.
@@ -26,9 +26,9 @@ namespace FireflyIII\Api\V2\Controllers\Summary;

 use FireflyIII\Api\V2\Controllers\Controller;
 use FireflyIII\Api\V2\Request\Generic\SingleDateRequest;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Helpers\Report\NetWorthInterface;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\UserGroups\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use Illuminate\Http\JsonResponse;
@@ -67,7 +67,7 @@ class NetWorthController extends Controller
    public function get(SingleDateRequest $request): JsonResponse
    {
        $date     = $request->getDate();
-        $accounts = $this->repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]);
+        $accounts = $this->repository->getAccountsByType([AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value]);

        // filter list on preference of being included.
        $filtered = $accounts->filter(
@@ -24,9 +24,8 @@ declare(strict_types=1);

 namespace FireflyIII\Api\V2\Request\Autocomplete;

-use FireflyIII\Models\AccountType;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Support\Http\Api\AccountFilter;
-use FireflyIII\Support\Http\Api\ParsesQueryFilters;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
 use Illuminate\Foundation\Http\FormRequest;
@@ -39,7 +38,6 @@ class AutocompleteRequest extends FormRequest
    use AccountFilter;
    use ChecksLogin;
    use ConvertsDataTypes;
-    use ParsesQueryFilters;

    /**
     * Loops over all possible query parameters (these are shared over ALL auto complete requests)
@@ -67,7 +65,7 @@ class AutocompleteRequest extends FormRequest
        }

        // remove 'initial balance' from allowed types. its internal
-        $array['account_types'] = array_diff($array['account_types'], [AccountType::INITIAL_BALANCE, AccountType::RECONCILIATION, AccountType::CREDITCARD]);
+        $array['account_types'] = array_diff($array['account_types'], [AccountTypeEnum::INITIAL_BALANCE->value, AccountTypeEnum::RECONCILIATION->value, AccountTypeEnum::CREDITCARD->value]);
        $array['account_types'] = $this->getAccountTypeParameter($array['account_types']);

        return $array;
@@ -25,7 +25,6 @@ declare(strict_types=1);
 namespace FireflyIII\Api\V2\Request\Chart;

 use FireflyIII\Enums\UserRoleEnum;
-use FireflyIII\Support\Http\Api\ParsesQueryFilters;
 use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
 use FireflyIII\Support\Request\ChecksLogin;
 use FireflyIII\Support\Request\ConvertsDataTypes;
@@ -40,7 +39,6 @@ class ChartRequest extends FormRequest
 {
    use ChecksLogin;
    use ConvertsDataTypes;
-    use ParsesQueryFilters;
    use ValidatesUserGroupTrait;

    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
@@ -1,5 +1,26 @@
 <?php

+
+/*
+ * SeparateTimezoneCaster.php
+ * Copyright (c) 2025 james@firefly-iii.org.
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
 declare(strict_types=1);

 namespace FireflyIII\Casts;
@@ -55,34 +55,24 @@ class ConvertsDatesToUTC extends Command
 {
    use ShowsFriendlyMessages;

-    /**
-     * The console command description.
-     *
-     * @var string
-     */
    protected $description = 'Convert stored dates to UTC.';
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
    protected $signature   = 'correction:convert-to-utc';

-    /**
-     * Execute the console command.
-     */
    public function handle(): int
    {
-        $this->friendlyWarning('Please do not use this command.');
+        $this->friendlyWarning('Please do not use this command right now.');

-        return 0;
+        // this variable is ALWAYS en_US.
+        // stops phpstan complaining about dead code.
+        if ('en_US' === config('app.fallback_locale')) {
+            return Command::SUCCESS;
+        }

        /**
         * @var string $model
         * @var array  $fields
         */
-        foreach (AddTimezonesToDates::$models as $model => $fields) {
+        foreach (CorrectsTimezoneInformation::$models as $model => $fields) {
            $this->ConvertModeltoUTC($model, $fields);
        }
        // tell the system we are now in UTC mode.
@@ -122,10 +112,10 @@ class ConvertsDatesToUTC extends Command
        $items->each(
            function ($item) use ($field, $timezoneField): void {
                /** @var Carbon $date */
-                $date                   = Carbon::parse($item->{$field}, $item->{$timezoneField});
+                $date                   = Carbon::parse($item->{$field}, $item->{$timezoneField}); // @phpstan-ignore-line
                $date->setTimezone('UTC');
-                $item->{$field}         = $date->format('Y-m-d H:i:s');
-                $item->{$timezoneField} = 'UTC';
+                $item->{$field}         = $date->format('Y-m-d H:i:s'); // @phpstan-ignore-line
+                $item->{$timezoneField} = 'UTC';                        // @phpstan-ignore-line
                $item->save();
            }
        );
@@ -26,9 +26,9 @@ namespace FireflyIII\Console\Commands\Correction;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Enums\AccountTypeEnum;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Factory\AccountFactory;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
@@ -111,6 +111,8 @@ class CorrectsAccountTypes extends Command
            $this->friendlyLine(sprintf('Found %d journals that need to be fixed.', $resultSet->count()));
            foreach ($resultSet as $entry) {
                app('log')->debug(sprintf('Now fixing journal #%d', $entry->id));
+
+                /** @var null|TransactionJournal $journal */
                $journal = TransactionJournal::find($entry->id);
                if (null !== $journal) {
                    $this->inspectJournal($journal);
@@ -245,18 +247,18 @@ class CorrectsAccountTypes extends Command

    private function shouldBeTransfer(string $transactionType, string $sourceType, string $destinationType): bool
    {
-        return TransactionType::TRANSFER === $transactionType && AccountType::ASSET === $sourceType && $this->isLiability($destinationType);
+        return TransactionTypeEnum::TRANSFER->value === $transactionType && AccountTypeEnum::ASSET->value === $sourceType && $this->isLiability($destinationType);
    }

    private function isLiability(string $destinationType): bool
    {
-        return AccountType::LOAN === $destinationType || AccountType::DEBT === $destinationType || AccountType::MORTGAGE === $destinationType;
+        return AccountTypeEnum::LOAN->value === $destinationType || AccountTypeEnum::DEBT->value === $destinationType || AccountTypeEnum::MORTGAGE->value === $destinationType;
    }

    private function makeTransfer(TransactionJournal $journal): void
    {
        // from an asset to a liability should be a withdrawal:
-        $withdrawal = TransactionType::whereType(TransactionType::WITHDRAWAL)->first();
+        $withdrawal = TransactionType::whereType(TransactionTypeEnum::WITHDRAWAL->value)->first();
        $journal->transactionType()->associate($withdrawal);
        $journal->save();
        $message    = sprintf('Converted transaction #%d from a transfer to a withdrawal.', $journal->id);
@@ -268,13 +270,13 @@ class CorrectsAccountTypes extends Command

    private function shouldBeDeposit(string $transactionType, string $sourceType, string $destinationType): bool
    {
-        return TransactionType::TRANSFER === $transactionType && $this->isLiability($sourceType) && AccountType::ASSET === $destinationType;
+        return TransactionTypeEnum::TRANSFER->value === $transactionType && $this->isLiability($sourceType) && AccountTypeEnum::ASSET->value === $destinationType;
    }

    private function makeDeposit(TransactionJournal $journal): void
    {
        // from a liability to an asset should be a deposit.
-        $deposit = TransactionType::whereType(TransactionType::DEPOSIT)->first();
+        $deposit = TransactionType::whereType(TransactionTypeEnum::DEPOSIT->value)->first();
        $journal->transactionType()->associate($deposit);
        $journal->save();
        $message = sprintf('Converted transaction #%d from a transfer to a deposit.', $journal->id);
@@ -286,7 +288,7 @@ class CorrectsAccountTypes extends Command

    private function shouldGoToExpenseAccount(string $transactionType, string $sourceType, string $destinationType): bool
    {
-        return TransactionType::WITHDRAWAL === $transactionType && AccountType::ASSET === $sourceType && AccountType::REVENUE === $destinationType;
+        return TransactionTypeEnum::WITHDRAWAL->value === $transactionType && AccountTypeEnum::ASSET->value === $sourceType && AccountTypeEnum::REVENUE->value === $destinationType;
    }

    private function makeExpenseDestination(TransactionJournal $journal, Transaction $destination): void
@@ -294,7 +296,7 @@ class CorrectsAccountTypes extends Command
        // withdrawals with a revenue account as destination instead of an expense account.
        $this->factory->setUser($journal->user);
        $oldDest = $destination->account;
-        $result  = $this->factory->findOrCreate($destination->account->name, AccountType::EXPENSE);
+        $result  = $this->factory->findOrCreate($destination->account->name, AccountTypeEnum::EXPENSE->value);
        $destination->account()->associate($result);
        $destination->save();
        $message = sprintf(
@@ -312,7 +314,7 @@ class CorrectsAccountTypes extends Command

    private function shouldComeFromRevenueAccount(string $transactionType, string $sourceType, string $destinationType): bool
    {
-        return TransactionType::DEPOSIT === $transactionType && AccountType::EXPENSE === $sourceType && AccountType::ASSET === $destinationType;
+        return TransactionTypeEnum::DEPOSIT->value === $transactionType && AccountTypeEnum::EXPENSE->value === $sourceType && AccountTypeEnum::ASSET->value === $destinationType;
    }

    private function makeRevenueSource(TransactionJournal $journal, Transaction $source): void
@@ -320,7 +322,7 @@ class CorrectsAccountTypes extends Command
        // deposits with an expense account as source instead of a revenue account.
        // find revenue account.
        $this->factory->setUser($journal->user);
-        $result    = $this->factory->findOrCreate($source->account->name, AccountType::REVENUE);
+        $result    = $this->factory->findOrCreate($source->account->name, AccountTypeEnum::REVENUE->value);
        $oldSource = $source->account;
        $source->account()->associate($result);
        $source->save();
@@ -63,7 +63,7 @@ class CorrectsCurrencies extends Command
        $repos           = app(CurrencyRepositoryInterface::class);

        // first check if the user has any default currency (not necessarily the case, so can be forced).
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($userGroup);
+        $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($userGroup);

        Log::debug(sprintf('Now correcting currencies for user group #%d', $userGroup->id));
        $found           = [$defaultCurrency->id];
@@ -74,7 +74,7 @@ class CorrectsDatabase extends Command
            'correction:recalculates-liabilities',
            'correction:preferences',
            // 'correction:transaction-types', // resource heavy, disabled.
-            // 'correction:recalculate-native-amounts', // not necessary, disabled.
+            'correction:recalculate-native-amounts', // not necessary, disabled.
            'firefly-iii:report-integrity',
        ];
        foreach ($commands as $command) {
@@ -25,7 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
-use FireflyIII\Models\AccountType;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\User;
@@ -73,7 +73,7 @@ class CorrectsFrontpageAccounts extends Command
                $accountIdInt = (int) $accountId;
                $account      = $repository->find($accountIdInt);
                if (null !== $account
-                    && in_array($account->accountType->type, [AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE], true)
+                    && in_array($account->accountType->type, [AccountTypeEnum::ASSET->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value], true)
                    && true === $account->active) {
                    $fixed[] = $account->id;
                }
@@ -25,8 +25,8 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;

@@ -78,14 +78,14 @@ class CorrectsIbans extends Command
                continue;
            }
            $type   = $account->accountType->type;
-            if (in_array($type, [AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE], true)) {
+            if (in_array($type, [AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value], true)) {
                $type = 'liabilities';
            }
            if (array_key_exists($iban, $set[$userId])) {
                // iban already in use! two exceptions exist:
                if (
-                    !(AccountType::EXPENSE === $set[$userId][$iban] && AccountType::REVENUE === $type) // allowed combination
-                    && !(AccountType::REVENUE === $set[$userId][$iban] && AccountType::EXPENSE === $type) // also allowed combination.
+                    !(AccountTypeEnum::EXPENSE->value === $set[$userId][$iban] && AccountTypeEnum::REVENUE->value === $type) // allowed combination
+                    && !(AccountTypeEnum::REVENUE->value === $set[$userId][$iban] && AccountTypeEnum::EXPENSE->value === $type) // also allowed combination.
                ) {
                    $this->friendlyWarning(
                        sprintf(
@@ -1,9 +1,9 @@
 <?php

-declare(strict_types=1);
+
 /*
- * RecalculateNativeAmounts.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * CorrectsNativeAmounts.php
+ * Copyright (c) 2025 james@firefly-iii.org.
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
@@ -21,6 +21,8 @@ declare(strict_types=1);
 * along with this program.  If not, see https://www.gnu.org/licenses/.
 */

+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
@@ -59,7 +61,7 @@ class CorrectsNativeAmounts extends Command
     */
    public function handle(): int
    {
-        if (!config('cer.enabled')) {
+        if (false === config('cer.enabled')) {
            $this->friendlyInfo('This command will not run because currency exchange rates are disabled.');

            return 0;
@@ -86,7 +88,7 @@ class CorrectsNativeAmounts extends Command

        // do a check with the group's currency so we can skip some stuff.
        Preferences::mark();
-        $currency = app('amount')->getDefaultCurrencyByUserGroup($userGroup);
+        $currency = app('amount')->getNativeCurrencyByUserGroup($userGroup);

        $this->recalculatePiggyBanks($userGroup, $currency);
        $this->recalculateBudgets($userGroup, $currency);
@@ -144,7 +146,7 @@ class CorrectsNativeAmounts extends Command
    {
        $set = $piggyBank->piggyBankEvents()->get();
        $set->each(
-            static function (PiggyBankEvent $event): void {
+            static function (PiggyBankEvent $event): void { // @phpstan-ignore-line
                $event->touch();
            }
        );
@@ -234,8 +236,9 @@ class CorrectsNativeAmounts extends Command
        TransactionObserver::$recalculate = false;
        foreach ($set as $item) {
            // here we are.
+            /** @var null|Transaction $transaction */
            $transaction = Transaction::find($item->id);
-            $transaction->touch();
+            $transaction?->touch();
        }
        TransactionObserver::$recalculate = true;
        Log::debug(sprintf('Recalculated %d transactions.', $set->count()));
@@ -25,12 +25,12 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\AccountTypeEnum;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Illuminate\Console\Command;
 use Illuminate\Support\Collection;
@@ -65,10 +65,10 @@ class CorrectsOpeningBalanceCurrencies extends Command

    private function getJournals(): Collection
    {
-        // @var Collection
+        /** @var Collection */
        return TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
            ->whereNull('transaction_journals.deleted_at')
-            ->where('transaction_types.type', TransactionType::OPENING_BALANCE)->get(['transaction_journals.*'])
+            ->where('transaction_types.type', TransactionTypeEnum::OPENING_BALANCE->value)->get(['transaction_journals.*'])
        ;
    }

@@ -96,7 +96,7 @@ class CorrectsOpeningBalanceCurrencies extends Command
        foreach ($transactions as $transaction) {
            /** @var null|Account $account */
            $account = $transaction->account()->first();
-            if (null !== $account && AccountType::INITIAL_BALANCE !== $account->accountType()->first()->type) {
+            if (null !== $account && AccountTypeEnum::INITIAL_BALANCE->value !== $account->accountType()->first()->type) {
                return $account;
            }
        }
@@ -132,6 +132,6 @@ class CorrectsOpeningBalanceCurrencies extends Command
        $repos = app(AccountRepositoryInterface::class);
        $repos->setUser($account->user);

-        return $repos->getAccountCurrency($account) ?? app('amount')->getDefaultCurrencyByUserGroup($account->userGroup);
+        return $repos->getAccountCurrency($account) ?? app('amount')->getNativeCurrencyByUserGroup($account->userGroup);
    }
 }
@@ -1,9 +1,9 @@
 <?php

-declare(strict_types=1);
+
 /*
- * MigratePreferences.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * CorrectsPreferences.php
+ * Copyright (c) 2025 james@firefly-iii.org.
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
@@ -21,6 +21,8 @@ declare(strict_types=1);
 * along with this program.  If not, see https://www.gnu.org/licenses/.
 */

+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Correction;

 use FireflyIII\Models\Preference;
@@ -81,18 +81,7 @@ class CorrectsTimezoneInformation extends Command
            TransactionJournal::class   => ['date'],
        ];

-    /**
-     * The console command description.
-     *
-     * @var string
-     */
    protected $description = 'Make sure all dates have a timezone.';
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
    protected $signature   = 'correction:timezones';

    /**
@@ -25,8 +25,8 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;

 class CorrectsTransferBudgets extends Command
@@ -44,7 +44,7 @@ class CorrectsTransferBudgets extends Command
        $set   = TransactionJournal::distinct()
            ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
            ->leftJoin('budget_transaction_journal', 'transaction_journals.id', '=', 'budget_transaction_journal.transaction_journal_id')
-            ->whereNotIn('transaction_types.type', [TransactionType::WITHDRAWAL])
+            ->whereNotIn('transaction_types.type', [TransactionTypeEnum::WITHDRAWAL->value])
            ->whereNotNull('budget_transaction_journal.budget_id')->get(['transaction_journals.*'])
        ;
        $count = 0;
@@ -28,7 +28,6 @@ use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Log;
@@ -50,7 +49,7 @@ class CorrectsUnevenAmount extends Command
        $this->convertOldStyleTransfers();
        $this->fixUnevenAmounts();
        $this->matchCurrencies();
-        if (config('firefly.feature_flags.running_balance_column')) {
+        if (true === config('firefly.feature_flags.running_balance_column')) {
            $this->friendlyInfo('Will recalculate transaction running balance columns. This may take a LONG time. Please be patient.');
            AccountBalanceCalculator::recalculateAll(false);
            $this->friendlyInfo('Done recalculating transaction running balance columns.');
@@ -84,7 +83,7 @@ class CorrectsUnevenAmount extends Command
                continue;
            }
            // needs to be a transfer.
-            if (TransactionType::TRANSFER !== $journal->transactionType->type) {
+            if (TransactionTypeEnum::TRANSFER->value !== $journal->transactionType->type) {
                Log::debug('Must be a transfer, continue.');

                continue;
@@ -122,7 +121,7 @@ class CorrectsUnevenAmount extends Command
        $journals = \DB::table('transactions')
            ->groupBy('transaction_journal_id')
            ->whereNull('deleted_at')
-            ->get(['transaction_journal_id', \DB::raw('SUM(amount) AS the_sum')])
+            ->get(['transaction_journal_id', \DB::raw('SUM(amount) AS the_sum')])  // @phpstan-ignore-line
        ;

        /** @var \stdClass $entry */
@@ -228,7 +227,7 @@ class CorrectsUnevenAmount extends Command

    private function isForeignCurrencyTransfer(TransactionJournal $journal): bool
    {
-        if (TransactionType::TRANSFER !== $journal->transactionType->type) {
+        if (TransactionTypeEnum::TRANSFER->value !== $journal->transactionType->type) {
            return false;
        }

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Correction;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
 use Illuminate\Console\Command;
@@ -42,7 +43,7 @@ class RemovesBills extends Command
    public function handle(): int
    {
        /** @var null|TransactionType $withdrawal */
-        $withdrawal = TransactionType::where('type', TransactionType::WITHDRAWAL)->first();
+        $withdrawal = TransactionType::where('type', TransactionTypeEnum::WITHDRAWAL->value)->first();
        if (null === $withdrawal) {
            return 0;
        }
@@ -24,7 +24,6 @@ declare(strict_types=1);

 namespace FireflyIII\Console\Commands\Correction;

-use Exception;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Models\TransactionGroup;
 use Illuminate\Console\Command;
@@ -39,7 +38,7 @@ class RemovesEmptyGroups extends Command
    /**
     * Execute the console command.
     *
-     * @throws Exception;
+     * @throws \Exception
     */
    public function handle(): int
    {
@@ -66,7 +66,9 @@ class RemovesEmptyJournals extends Command
            if (1 === $count % 2) {
                // uneven number, delete journal and transactions:
                try {
-                    TransactionJournal::find($row->transaction_journal_id)->delete();
+                    /** @var null|TransactionJournal $journal */
+                    $journal = TransactionJournal::find($row->transaction_journal_id);
+                    $journal?->delete();
                } catch (QueryException $e) {
                    app('log')->info(sprintf('Could not delete journal: %s', $e->getMessage()));
                    app('log')->error($e->getTraceAsString());
@@ -92,7 +94,9 @@ class RemovesEmptyJournals extends Command

        foreach ($set as $entry) {
            try {
-                TransactionJournal::find($entry->id)->delete();
+                /** @var null|TransactionJournal $journal */
+                $journal = TransactionJournal::find($entry->id);
+                $journal?->delete();
            } catch (QueryException $e) {
                app('log')->info(sprintf('Could not delete entry: %s', $e->getMessage()));
                app('log')->error($e->getTraceAsString());
@@ -69,6 +69,7 @@ class RemovesOrphanedTransactions extends Command
        }
        $this->friendlyInfo(sprintf('Found %d orphaned journal(s).', $count));
        foreach ($set as $entry) {
+            /** @var null|TransactionJournal $journal */
            $journal = TransactionJournal::withTrashed()->find($entry->id);
            if (null !== $journal) {
                $journal->delete();
@@ -130,6 +131,7 @@ class RemovesOrphanedTransactions extends Command
        /** @var Transaction $transaction */
        foreach ($set as $transaction) {
            // delete journals
+            /** @var null|TransactionJournal $journal */
            $journal = TransactionJournal::find($transaction->transaction_journal_id);
            if (null !== $journal) {
                $journal->delete();
@@ -27,9 +27,9 @@ namespace FireflyIII\Console\Commands\Export;
 use Carbon\Carbon;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Console\Commands\VerifiesAccessToken;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Export\ExportDataGenerator;
@@ -229,7 +229,7 @@ class ExportsData extends Command
        $final       = new Collection();
        $accounts    = new Collection();
        $accountList = (string) $this->option('accounts');
-        $types       = [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE];
+        $types       = [AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];
        if ('' !== $accountList) {
            $accountIds = explode(',', $accountList);
            $accounts   = $this->accountRepository->getAccountsById($accountIds);
@@ -45,7 +45,6 @@ class ReportsIntegrity extends Command
            return 1;
        }
        $commands = [
-            // 'firefly-iii:add-timezones-to-dates',
            'integrity:empty-objects',
            'integrity:total-sums',
        ];
@@ -61,12 +61,7 @@ class ReportsSums extends Command
            $sum     = '' === $sum ? '0' : $sum;
            $foreign = '' === $foreign ? '0' : $foreign;
            $total   = bcadd($sum, $foreign);
-            if (!is_numeric($total)) {
-                $message = sprintf('Error: Transactions for user #%d (%s) have an invalid sum ("%s").', $user->id, $user->email, $total);
-                $this->friendlyError($message);

-                continue;
-            }
            if (0 !== bccomp($total, '0')) {
                $message = sprintf('Error: Transactions for user #%d (%s) are off by %s!', $user->id, $user->email, $total);
                $this->friendlyError($message);
@@ -1,9 +1,9 @@
 <?php

-declare(strict_types=1);
+
 /*
- * LaravelPassportKeys.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * CallsLaravelPassportKeys.php
+ * Copyright (c) 2025 james@firefly-iii.org.
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
@@ -21,6 +21,8 @@ declare(strict_types=1);
 * along with this program.  If not, see https://www.gnu.org/licenses/.
 */

+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\System;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
@@ -36,24 +36,19 @@ class CreatesDatabase extends Command

    protected $signature   = 'firefly-iii:create-database';

-    /**
-     * Execute the console command.
-     *
-     * @suppressWarnings(PHPMD.MissingImport)
-     */
    public function handle(): int
    {
-        if ('mysql' !== env('DB_CONNECTION', 'mysql')) {
+        if ('mysql' !== env('DB_CONNECTION')) { // @phpstan-ignore larastan.noEnvCallsOutsideOfConfig */
            $this->friendlyInfo(sprintf('CreateDB does not apply to "%s", skipped.', env('DB_CONNECTION')));

            return 0;
        }
        // try to set up a raw connection:
        $exists  = false;
-        $dsn     = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST', 'localhost'), env('DB_PORT', '3306'));
+        $dsn     = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST'), env('DB_PORT'));

-        if ('' !== env('DB_SOCKET', '')) {
-            $dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', env('DB_SOCKET', ''));
+        if ('' !== (string) env('DB_SOCKET')) {
+            $dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', env('DB_SOCKET'));
        }
        $this->friendlyLine(sprintf('DSN is %s', $dsn));

@@ -65,7 +60,7 @@ class CreatesDatabase extends Command

        // when it fails, display error
        try {
-            $pdo = new \PDO($dsn, env('DB_USERNAME'), env('DB_PASSWORD'), $options);
+            $pdo = new \PDO($dsn, (string) env('DB_USERNAME'), (string) env('DB_PASSWORD'), $options);
        } catch (\PDOException $e) {
            $this->friendlyError(sprintf('Error when connecting to DB: %s', $e->getMessage()));

@@ -43,7 +43,7 @@ class CreatesFirstUser extends Command
     */
    public function handle(): int
    {
-        if ('testing' !== env('APP_ENV', 'local')) {
+        if ('testing' !== config('app.env')) {
            $this->friendlyError('This command only works in the testing environment.');

            return 1;
@@ -173,7 +173,7 @@ class ForcesDecimalSize extends Command
         * @var array  $fields
         */
        foreach ($this->tables as $name => $fields) {
-            switch ($name) { // @phpstan-ignore-line
+            switch ($name) {
                default:
                    $message = sprintf('Cannot handle table "%s"', $name);
                    $this->friendlyError($message);
@@ -239,7 +239,7 @@ class ForcesDecimalSize extends Command
        $query->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {
            foreach ($fields as $field) {
                $q->orWhere(
-                    DB::raw(sprintf('CAST(accounts.%s AS %s)', $field, $cast)), // @phpstan-ignore-line
+                    DB::raw(sprintf('CAST(accounts.%s AS %s)', $field, $cast)),
                    $operator,
                    DB::raw(sprintf($regularExpression, $currency->decimal_places))
                );
@@ -256,15 +256,18 @@ class ForcesDecimalSize extends Command
        foreach ($result as $account) {
            /** @var string $field */
            foreach ($fields as $field) {
-                $value   = $account->{$field};
+                $value         = $account->{$field};
                if (null === $value) {
                    continue;
                }
                // fix $field by rounding it down correctly.
-                $pow     = 10 ** $currency->decimal_places;
-                $correct = bcdiv((string) round($value * $pow), (string) $pow, 12);
+                $pow           = 10 ** $currency->decimal_places;
+                $correct       = bcdiv((string) round($value * $pow), (string) $pow, 12);
                $this->friendlyInfo(sprintf('Account #%d has %s with value "%s", this has been corrected to "%s".', $account->id, $field, $value, $correct));
-                Account::find($account->id)->update([$field => $correct]);
+
+                /** @var null|Account $updateAccount */
+                $updateAccount = Account::find($account->id);
+                $updateAccount?->update([$field => $correct]);
            }
        }
    }
@@ -286,7 +289,7 @@ class ForcesDecimalSize extends Command
                /** @var string $field */
                foreach ($fields as $field) {
                    $q->orWhere(
-                        DB::raw(sprintf('CAST(%s AS %s)', $field, $cast)), // @phpstan-ignore-line
+                        DB::raw(sprintf('CAST(%s AS %s)', $field, $cast)),
                        $operator,
                        DB::raw(sprintf($regularExpression, $currency->decimal_places))
                    );
@@ -313,7 +316,10 @@ class ForcesDecimalSize extends Command
                $pow     = 10 ** $currency->decimal_places;
                $correct = bcdiv((string) round($value * $pow), (string) $pow, 12);
                $this->friendlyWarning(sprintf('%s #%d has %s with value "%s", this has been corrected to "%s".', $table, $item->id, $field, $value, $correct));
-                $class::find($item->id)->update([$field => $correct]);
+
+                /** @var null|Model $model */
+                $model   = $class::find($item->id);
+                $model?->update([$field => $correct]);
            }
        }
    }
@@ -336,7 +342,7 @@ class ForcesDecimalSize extends Command
            ->where(static function (Builder $q) use ($fields, $currency, $cast, $operator, $regularExpression): void {
                foreach ($fields as $field) {
                    $q->orWhere(
-                        DB::raw(sprintf('CAST(piggy_bank_events.%s AS %s)', $field, $cast)), // @phpstan-ignore-line
+                        DB::raw(sprintf('CAST(piggy_bank_events.%s AS %s)', $field, $cast)),
                        $operator,
                        DB::raw(sprintf($regularExpression, $currency->decimal_places))
                    );
@@ -365,7 +371,10 @@ class ForcesDecimalSize extends Command
                $this->friendlyWarning(
                    sprintf('Piggy bank event #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct)
                );
-                PiggyBankEvent::find($item->id)->update([$field => $correct]);
+
+                /** @var null|PiggyBankEvent $event */
+                $event   = PiggyBankEvent::find($item->id);
+                $event?->update([$field => $correct]);
            }
        }
    }
@@ -389,7 +398,7 @@ class ForcesDecimalSize extends Command
            ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {
                foreach ($fields as $field) {
                    $q->orWhere(
-                        DB::raw(sprintf('CAST(piggy_bank_repetitions.%s AS %s)', $field, $cast)), // @phpstan-ignore-line
+                        DB::raw(sprintf('CAST(piggy_bank_repetitions.%s AS %s)', $field, $cast)),
                        $operator,
                        DB::raw(sprintf($regularExpression, $currency->decimal_places))
                    );
@@ -408,17 +417,20 @@ class ForcesDecimalSize extends Command
        foreach ($result as $item) {
            /** @var string $field */
            foreach ($fields as $field) {
-                $value   = $item->{$field};
+                $value      = $item->{$field};
                if (null === $value) {
                    continue;
                }
                // fix $field by rounding it down correctly.
-                $pow     = 10 ** $currency->decimal_places;
-                $correct = bcdiv((string) round($value * $pow), (string) $pow, 12);
+                $pow        = 10 ** $currency->decimal_places;
+                $correct    = bcdiv((string) round($value * $pow), (string) $pow, 12);
                $this->friendlyWarning(
                    sprintf('Piggy bank repetition #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct)
                );
-                PiggyBankRepetition::find($item->id)->update([$field => $correct]);
+
+                /** @var null|PiggyBankRepetition $repetition */
+                $repetition = PiggyBankRepetition::find($item->id);
+                $repetition->update([$field => $correct]);
            }
        }
    }
@@ -440,7 +452,7 @@ class ForcesDecimalSize extends Command
            ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {
                foreach ($fields as $field) {
                    $q->orWhere(
-                        DB::raw(sprintf('CAST(piggy_banks.%s AS %s)', $field, $cast)), // @phpstan-ignore-line
+                        DB::raw(sprintf('CAST(piggy_banks.%s AS %s)', $field, $cast)),
                        $operator,
                        DB::raw(sprintf($regularExpression, $currency->decimal_places))
                    );
@@ -459,15 +471,18 @@ class ForcesDecimalSize extends Command
        foreach ($result as $item) {
            /** @var string $field */
            foreach ($fields as $field) {
-                $value   = $item->{$field};
+                $value     = $item->{$field};
                if (null === $value) {
                    continue;
                }
                // fix $field by rounding it down correctly.
-                $pow     = 10 ** $currency->decimal_places;
-                $correct = bcdiv((string) round($value * $pow), (string) $pow, 12);
+                $pow       = 10 ** $currency->decimal_places;
+                $correct   = bcdiv((string) round($value * $pow), (string) $pow, 12);
                $this->friendlyWarning(sprintf('Piggy bank #%d has %s with value "%s", this has been corrected to "%s".', $item->id, $field, $value, $correct));
-                PiggyBank::find($item->id)->update([$field => $correct]);
+
+                /** @var null|PiggyBank $piggyBank */
+                $piggyBank = PiggyBank::find($item->id);
+                $piggyBank?->update([$field => $correct]);
            }
        }
    }
@@ -480,7 +495,7 @@ class ForcesDecimalSize extends Command
        // select all transactions with this currency and issue.
        /** @var Builder $query */
        $query  = Transaction::where('transaction_currency_id', $currency->id)->where(
-            DB::raw(sprintf('CAST(amount as %s)', $this->cast)), // @phpstan-ignore-line
+            DB::raw(sprintf('CAST(amount as %s)', $this->cast)),
            $this->operator,
            DB::raw(sprintf($this->regularExpression, $currency->decimal_places))
        );
@@ -492,21 +507,24 @@ class ForcesDecimalSize extends Command

        /** @var Transaction $item */
        foreach ($result as $item) {
-            $value   = $item->amount;
+            $value       = $item->amount;
            if ('' === $value) {
                continue;
            }
            // fix $field by rounding it down correctly.
-            $pow     = (float) 10 ** $currency->decimal_places;
-            $correct = bcdiv((string) round((float) $value * $pow), (string) $pow, 12);
+            $pow         = (float) 10 ** $currency->decimal_places;
+            $correct     = bcdiv((string) round((float) $value * $pow), (string) $pow, 12);
            $this->friendlyWarning(sprintf('Transaction #%d has amount with value "%s", this has been corrected to "%s".', $item->id, $value, $correct));
-            Transaction::find($item->id)->update(['amount' => $correct]);
+
+            /** @var null|Transaction $transaction */
+            $transaction = Transaction::find($item->id);
+            $transaction?->update(['amount' => $correct]);
        }

        // select all transactions with this FOREIGN currency and issue.
        /** @var Builder $query */
        $query  = Transaction::where('foreign_currency_id', $currency->id)->where(
-            DB::raw(sprintf('CAST(foreign_amount as %s)', $this->cast)), // @phpstan-ignore-line
+            DB::raw(sprintf('CAST(foreign_amount as %s)', $this->cast)),
            $this->operator,
            DB::raw(sprintf($this->regularExpression, $currency->decimal_places))
        );
@@ -520,17 +538,20 @@ class ForcesDecimalSize extends Command

        /** @var Transaction $item */
        foreach ($result as $item) {
-            $value   = $item->foreign_amount;
+            $value       = $item->foreign_amount;
            if (null === $value) {
                continue;
            }
            // fix $field by rounding it down correctly.
-            $pow     = (float) 10 ** $currency->decimal_places;
-            $correct = bcdiv((string) round((float) $value * $pow), (string) $pow, 12);
+            $pow         = (float) 10 ** $currency->decimal_places;
+            $correct     = bcdiv((string) round((float) $value * $pow), (string) $pow, 12);
            $this->friendlyWarning(
                sprintf('Transaction #%d has foreign amount with value "%s", this has been corrected to "%s".', $item->id, $value, $correct)
            );
-            Transaction::find($item->id)->update(['foreign_amount' => $correct]);
+
+            /** @var null|Transaction $transaction */
+            $transaction = Transaction::find($item->id);
+            $transaction?->update(['foreign_amount' => $correct]);
        }
    }

@@ -27,8 +27,8 @@ namespace FireflyIII\Console\Commands\Tools;
 use Carbon\Carbon;
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use FireflyIII\Console\Commands\VerifiesAccessToken;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -125,7 +125,7 @@ class ApplyRules extends Command
        $ruleEngine->addOperator(['type' => 'account_id', 'value' => $list]);

        // add the date as a filter:
-        $ruleEngine->addOperator(['type' => 'date_after', 'value' => $this->start_date->format('Y-m-d')]);
+        $ruleEngine->addOperator(['type' => 'date_after', 'value' => $this->startDate->format('Y-m-d')]);
        $ruleEngine->addOperator(['type' => 'date_before', 'value' => $this->endDate->format('Y-m-d')]);

        // start running rules.
@@ -154,7 +154,7 @@ class ApplyRules extends Command
        $this->ruleGroupSelection  = [];
        $this->ruleRepository      = app(RuleRepositoryInterface::class);
        $this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
-        $this->acceptedAccounts    = [AccountType::DEFAULT, AccountType::DEBT, AccountType::ASSET, AccountType::LOAN, AccountType::MORTGAGE];
+        $this->acceptedAccounts    = [AccountTypeEnum::DEFAULT->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value];
        $this->groups              = new Collection();
    }

@@ -226,7 +226,7 @@ class ApplyRules extends Command

        foreach ($ruleGroupList as $ruleGroupId) {
            $ruleGroup = $this->ruleGroupRepository->find((int) $ruleGroupId);
-            if ($ruleGroup->active) {
+            if (true === $ruleGroup->active) {
                $this->ruleGroupSelection[] = $ruleGroup->id;
            }
            if (false === $ruleGroup->active) {
@@ -248,7 +248,7 @@ class ApplyRules extends Command

        foreach ($ruleList as $ruleId) {
            $rule = $this->ruleRepository->find((int) $ruleId);
-            if (null !== $rule && $rule->active) {
+            if (null !== $rule && true === $rule->active) {
                $this->ruleSelection[] = $rule->id;
            }
        }
@@ -262,8 +262,8 @@ class ApplyRules extends Command
    private function verifyInputDates(): void
    {
        // parse start date.
-        $inputStart       = today(config('app.timezone'))->startOfMonth();
-        $startString      = $this->option('start_date');
+        $inputStart      = today(config('app.timezone'))->startOfMonth();
+        $startString     = $this->option('start_date');
        if (null === $startString) {
            /** @var JournalRepositoryInterface $repository */
            $repository = app(JournalRepositoryInterface::class);
@@ -278,8 +278,8 @@ class ApplyRules extends Command
        }

        // parse end date
-        $inputEnd         = today(config('app.timezone'));
-        $endString        = $this->option('end_date');
+        $inputEnd        = today(config('app.timezone'));
+        $endString       = $this->option('end_date');
        if (null !== $endString && '' !== $endString) {
            $inputEnd = Carbon::createFromFormat('Y-m-d', $endString);
        }
@@ -293,8 +293,8 @@ class ApplyRules extends Command
            [$inputEnd, $inputStart] = [$inputStart, $inputEnd];
        }

-        $this->start_date = $inputStart;
-        $this->endDate    = $inputEnd;
+        $this->startDate = $inputStart;
+        $this->endDate   = $inputEnd;
    }

    private function grabAllRules(): void
@@ -43,7 +43,7 @@ class RepairsAccountBalances extends Command

            return 0;
        }
-        if (config('firefly.feature_flags.running_balance_column')) {
+        if (true === config('firefly.feature_flags.running_balance_column')) {
            $this->friendlyInfo('Will recalculate account balances. This may take a LONG time. Please be patient.');
            $this->markAsExecuted();
            $this->correctBalanceAmounts();
@@ -70,7 +70,6 @@ class RepairsAccountBalances extends Command

    private function correctBalanceAmounts(): void
    {
-        return;
-        AccountBalanceCalculator::recalculateAll(true);
+        AccountBalanceCalculator::recalculateAll(false);
    }
 }
@@ -25,10 +25,10 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Upgrade;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountMeta;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -104,10 +104,10 @@ class UpgradesAccountCurrencies extends Command
    private function updateCurrenciesForUser(User $user): void
    {
        $this->accountRepos->setUser($user);
-        $accounts        = $this->accountRepos->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
+        $accounts        = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEFAULT->value, AccountTypeEnum::ASSET->value]);

        // get user's currency preference:
-        $defaultCurrency = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
+        $defaultCurrency = app('amount')->getNativeCurrencyByUserGroup($user->userGroup);

        /** @var Account $account */
        foreach ($accounts as $account) {
@@ -66,7 +66,7 @@ class UpgradesBudgetLimits extends Command
                    /** @var null|User $user */
                    $user = $budget->user;
                    if (null !== $user) {
-                        $currency                             = app('amount')->getDefaultCurrencyByUserGroup($user->userGroup);
+                        $currency                             = app('amount')->getNativeCurrencyByUserGroup($user->userGroup);
                        $budgetLimit->transaction_currency_id = $currency->id;
                        $budgetLimit->save();
                        $this->friendlyInfo(
@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Upgrade;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
@@ -52,8 +53,8 @@ class UpgradesCreditCardLiabilities extends Command
            return 0;
        }

-        $ccType   = AccountType::where('type', AccountType::CREDITCARD)->first();
-        $debtType = AccountType::where('type', AccountType::DEBT)->first();
+        $ccType   = AccountType::where('type', AccountTypeEnum::CREDITCARD->value)->first();
+        $debtType = AccountType::where('type', AccountTypeEnum::DEBT->value)->first();
        if (null === $ccType || null === $debtType) {
            $this->markAsExecuted();

@@ -95,7 +95,7 @@ class UpgradesCurrencyPreferences extends Command

        /** @var TransactionCurrency $currency */
        foreach ($currencies as $currency) {
-            if ($currency->enabled) {
+            if (true === $currency->enabled) {
                $enabled->push($currency);
            }
        }
@@ -109,7 +109,7 @@ class UpgradesCurrencyPreferences extends Command

        /** @var TransactionCurrency $currency */
        foreach ($currencies as $currency) {
-            if ($currency->enabled) {
+            if (true === $currency->enabled) {
                $enabled->push($currency);
            }
        }
@@ -138,11 +138,13 @@ class UpgradesLiabilities extends Command

    private function getSourceTransaction(TransactionJournal $journal): ?Transaction
    {
+        /** @var null|Transaction */
        return $journal->transactions()->where('amount', '<', 0)->first();
    }

    private function getDestinationTransaction(TransactionJournal $journal): ?Transaction
    {
+        /** @var null|Transaction */
        return $journal->transactions()->where('amount', '>', 0)->first();
    }

@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Upgrade;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
@@ -118,8 +119,8 @@ class UpgradesLiabilitiesEight extends Command

    private function hasBadOpening(Account $account): bool
    {
-        $openingBalanceType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first();
-        $liabilityType      = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first();
+        $openingBalanceType = TransactionType::whereType(TransactionTypeEnum::OPENING_BALANCE->value)->first();
+        $liabilityType      = TransactionType::whereType(TransactionTypeEnum::LIABILITY_CREDIT->value)->first();
        $openingJournal     = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
            ->where('transactions.account_id', $account->id)
            ->where('transaction_journals.transaction_type_id', $openingBalanceType->id)
@@ -145,7 +146,7 @@ class UpgradesLiabilitiesEight extends Command

    private function deleteCreditTransaction(Account $account): void
    {
-        $liabilityType    = TransactionType::whereType(TransactionType::LIABILITY_CREDIT)->first();
+        $liabilityType    = TransactionType::whereType(TransactionTypeEnum::LIABILITY_CREDIT->value)->first();
        $liabilityJournal = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
            ->where('transactions.account_id', $account->id)
            ->where('transaction_journals.transaction_type_id', $liabilityType->id)
@@ -162,7 +163,7 @@ class UpgradesLiabilitiesEight extends Command

    private function reverseOpeningBalance(Account $account): void
    {
-        $openingBalanceType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first();
+        $openingBalanceType = TransactionType::whereType(TransactionTypeEnum::OPENING_BALANCE->value)->first();

        /** @var TransactionJournal $openingJournal */
        $openingJournal     = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
@@ -1,9 +1,9 @@
 <?php

-declare(strict_types=1);
+
 /*
- * UpgradeMultiPiggyBanks.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * UpgradesMultiPiggyBanks.php
+ * Copyright (c) 2025 james@firefly-iii.org.
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
@@ -21,6 +21,8 @@ declare(strict_types=1);
 * along with this program.  If not, see https://www.gnu.org/licenses/.
 */

+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Upgrade;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
@@ -88,7 +90,7 @@ class UpgradesMultiPiggyBanks extends Command
        $this->repository->setUser($piggyBank->account->user);
        $this->accountRepository->setUser($piggyBank->account->user);
        $repetition                         = $this->repository->getRepetition($piggyBank, true);
-        $currency                           = $this->accountRepository->getAccountCurrency($piggyBank->account) ?? app('amount')->getDefaultCurrencyByUserGroup($piggyBank->account->user->userGroup);
+        $currency                           = $this->accountRepository->getAccountCurrency($piggyBank->account) ?? app('amount')->getNativeCurrencyByUserGroup($piggyBank->account->user->userGroup);

        // update piggy bank to have a currency.
        $piggyBank->transaction_currency_id = $currency->id;
@@ -1,9 +1,9 @@
 <?php

-declare(strict_types=1);
+
 /*
 * UpgradesNativeAmounts.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * Copyright (c) 2025 james@firefly-iii.org.
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
@@ -21,6 +21,8 @@ declare(strict_types=1);
 * along with this program.  If not, see https://www.gnu.org/licenses/.
 */

+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Upgrade;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
@@ -1,9 +1,9 @@
 <?php

-declare(strict_types=1);
+
 /*
- * MigrateRuleActions.php
- * Copyright (c) 2024 james@firefly-iii.org.
+ * UpgradesRuleActions.php
+ * Copyright (c) 2025 james@firefly-iii.org.
 *
 * This file is part of Firefly III (https://github.com/firefly-iii).
 *
@@ -21,6 +21,8 @@ declare(strict_types=1);
 * along with this program.  If not, see https://www.gnu.org/licenses/.
 */

+declare(strict_types=1);
+
 namespace FireflyIII\Console\Commands\Upgrade;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
@@ -185,7 +185,7 @@ class UpgradesToGroups extends Command
    }

    /**
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings("PHPMD.ExcessiveMethodLength")
     */
    private function generateTransaction(TransactionJournal $journal, Transaction $transaction): array
    {
@@ -25,11 +25,11 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Upgrade;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use Illuminate\Console\Command;
@@ -122,7 +122,7 @@ class UpgradesTransferCurrencies extends Command
     */
    private function startUpdateRoutine(): void
    {
-        $set = $this->cliRepos->getAllJournals([TransactionType::TRANSFER]);
+        $set = $this->cliRepos->getAllJournals([TransactionTypeEnum::TRANSFER->value]);

        /** @var TransactionJournal $journal */
        foreach ($set as $journal) {
@@ -207,6 +207,7 @@ class UpgradesTransferCurrencies extends Command

    private function getSourceTransaction(TransactionJournal $transfer): ?Transaction
    {
+        /** @var null|Transaction */
        return $transfer->transactions()->where('amount', '<', 0)->first();
    }

@@ -242,6 +243,7 @@ class UpgradesTransferCurrencies extends Command

    private function getDestinationTransaction(TransactionJournal $transfer): ?Transaction
    {
+        /** @var null|Transaction */
        return $transfer->transactions()->where('amount', '>', 0)->first();
    }

@@ -25,12 +25,12 @@ declare(strict_types=1);
 namespace FireflyIII\Console\Commands\Upgrade;

 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Enums\AccountTypeEnum;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalCLIRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
@@ -103,7 +103,7 @@ class UpgradesVariousCurrencyInformation extends Command
    private function updateOtherJournalsCurrencies(): void
    {
        $set = $this->cliRepos->getAllJournals(
-            [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE, TransactionType::RECONCILIATION]
+            [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::OPENING_BALANCE->value, TransactionTypeEnum::RECONCILIATION->value]
        );

        /** @var TransactionJournal $journal */
@@ -173,46 +173,47 @@ class UpgradesVariousCurrencyInformation extends Command
     */
    private function getLeadTransaction(TransactionJournal $journal): ?Transaction
    {
-        /** @var Transaction $lead */
+        /** @var null|Transaction $lead */
        $lead = null;

        switch ($journal->transactionType->type) {
            default:
                break;

-            case TransactionType::WITHDRAWAL:
+            case TransactionTypeEnum::WITHDRAWAL->value:
                $lead = $journal->transactions()->where('amount', '<', 0)->first();

                break;

-            case TransactionType::DEPOSIT:
+            case TransactionTypeEnum::DEPOSIT->value:
                $lead = $journal->transactions()->where('amount', '>', 0)->first();

                break;

-            case TransactionType::OPENING_BALANCE:
+            case TransactionTypeEnum::OPENING_BALANCE->value:
                // whichever isn't an initial balance account:
                $lead = $journal->transactions()->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')->leftJoin(
                    'account_types',
                    'accounts.account_type_id',
                    '=',
                    'account_types.id'
-                )->where('account_types.type', '!=', AccountType::INITIAL_BALANCE)->first(['transactions.*']);
+                )->where('account_types.type', '!=', AccountTypeEnum::INITIAL_BALANCE->value)->first(['transactions.*']);

                break;

-            case TransactionType::RECONCILIATION:
+            case TransactionTypeEnum::RECONCILIATION->value:
                // whichever isn't the reconciliation account:
                $lead = $journal->transactions()->leftJoin('accounts', 'transactions.account_id', '=', 'accounts.id')->leftJoin(
                    'account_types',
                    'accounts.account_type_id',
                    '=',
                    'account_types.id'
-                )->where('account_types.type', '!=', AccountType::RECONCILIATION)->first(['transactions.*']);
+                )->where('account_types.type', '!=', AccountTypeEnum::RECONCILIATION->value)->first(['transactions.*']);

                break;
        }

+        /** @var null|Transaction */
        return $lead;
    }

@@ -238,8 +239,8 @@ class UpgradesVariousCurrencyInformation extends Command

    private function isMultiCurrency(Account $account): bool
    {
-        $value = $this->accountRepos->getMetaValue($account, 'is_multi_currency', false);
-        if (false === $value || null === $value) {
+        $value = $this->accountRepos->getMetaValue($account, 'is_multi_currency');
+        if (null === $value) {
            return false;
        }

@@ -36,7 +36,7 @@ class AccountBalance
    {
        $balance             = new self();
        $balance->id         = (string) random_int(1, 1000);
-        $balance->name       = (string) random_int(1, 1000);
+        // $balance->name       = (string) random_int(1, 1000);
        $balance->amount     = (string) random_int(1, 1000);
        $balance->currencyId = '1';

@@ -43,7 +43,7 @@ class TriggeredAuditLog extends Event
    /**
     * Create a new event instance.
     *
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings("PHPMD.ExcessiveParameterList")
     */
    public function __construct(Model $changer, Model $auditable, string $field, mixed $before, mixed $after)
    {
@@ -24,12 +24,12 @@ declare(strict_types=1);

 namespace FireflyIII\Exceptions;

+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Attachment;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\User;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Http\Request;
@@ -47,7 +47,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
     *
     * @throws \Throwable
     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity")
     */
    public function render($request, \Throwable $e): Response
    {
@@ -208,7 +208,7 @@ class GracefulNotFoundHandler extends ExceptionHandler
        $type    = $journal->transactionType->type;
        $request->session()->reflash();

-        if (TransactionType::RECONCILIATION === $type) {
+        if (TransactionTypeEnum::RECONCILIATION->value === $type) {
            return redirect(route('accounts.index', ['asset']));
        }

@@ -78,8 +78,8 @@ class Handler extends ExceptionHandler
     *
     * @throws \Throwable
     *
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings("PHPMD.NPathComplexity")
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity")
     */
    public function render($request, \Throwable $e): Response
    {
@@ -87,17 +87,6 @@ class Handler extends ExceptionHandler

        app('log')->debug('Now in Handler::render()');

-        if ($e instanceof JsonApiException) {
-            // ignore it: controller will handle it.
-
-            app('log')->debug(sprintf(
-                'Return to parent to handle JsonApiException(%d)',
-                $e->getCode()
-            ));
-
-            return parent::render($request, $e);
-        }
-
        if ($e instanceof LaravelValidationException && $expectsJson) {
            // ignore it: controller will handle it.

@@ -24,6 +24,7 @@ declare(strict_types=1);

 namespace FireflyIII\Factory;

+use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Events\StoredAccount;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
@@ -159,7 +160,7 @@ class AccountFactory
        app('log')->debug(sprintf('Now in AccountFactory::find("%s", "%s")', $accountName, $accountType));
        $type = AccountType::whereType($accountType)->first();

-        // @var Account|null
+        /** @var null|Account */
        return $this->user->accounts()->where('account_type_id', $type->id)->where('name', $accountName)->first();
    }

@@ -242,7 +243,7 @@ class AccountFactory
        $currency             = $this->getCurrency($currencyId, $currencyCode);

        // only asset account may have a role:
-        if (AccountType::ASSET !== $account->accountType->type) {
+        if (AccountTypeEnum::ASSET->value !== $account->accountType->type) {
            $accountRole = '';
        }
        // only liability may have direction:
@@ -258,10 +259,10 @@ class AccountFactory
    private function storeMetaData(Account $account, array $data): void
    {
        $fields  = $this->validFields;
-        if (AccountType::ASSET === $account->accountType->type) {
+        if (AccountTypeEnum::ASSET->value === $account->accountType->type) {
            $fields = $this->validAssetFields;
        }
-        if (AccountType::ASSET === $account->accountType->type && 'ccAsset' === $data['account_role']) {
+        if (AccountTypeEnum::ASSET->value === $account->accountType->type && 'ccAsset' === $data['account_role']) {
            $fields = $this->validCCFields;
        }

@@ -49,7 +49,7 @@ class BillFactory
        app('log')->debug(sprintf('Now in %s', __METHOD__), $data);
        $factory          = app(TransactionCurrencyFactory::class);
        $currency         = $factory->find((int) ($data['currency_id'] ?? null), (string) ($data['currency_code'] ?? null)) ??
-                    app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+                    app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);

        try {
            $skip   = array_key_exists('skip', $data) ? $data['skip'] : 0;
@@ -129,6 +129,7 @@ class BillFactory

    public function findByName(string $name): ?Bill
    {
+        /** @var null|Bill */
        return $this->user->bills()->whereLike('name', sprintf('%%%s%%', $name))->first();
    }

@@ -63,6 +63,7 @@ class BudgetFactory

    public function findByName(string $name): ?Budget
    {
+        /** @var null|Budget */
        return $this->user->budgets()->where('name', $name)->first();
    }

@@ -84,6 +84,7 @@ class CategoryFactory

    public function findByName(string $name): ?Category
    {
+        /** @var null|Category */
        return $this->user->categories()->where('name', $name)->first();
    }

@@ -41,14 +41,7 @@ class PiggyBankFactory
 {
    use CreatesObjectGroups;

-    public User                          $user {
-        set(User $value) {
-            $this->user = $value;
-            $this->currencyRepository->setUser($value);
-            $this->accountRepository->setUser($value);
-            $this->piggyBankRepository->setUser($value);
-        }
-    }
+    public User                          $user;
    private AccountRepositoryInterface   $accountRepository;
    private CurrencyRepositoryInterface  $currencyRepository;
    private PiggyBankRepositoryInterface $piggyBankRepository;
@@ -60,17 +53,21 @@ class PiggyBankFactory
        $this->piggyBankRepository = app(PiggyBankRepositoryInterface::class);
    }

+    public function setUser(User $user): void
+    {
+        $this->user = $user;
+        $this->currencyRepository->setUser($user);
+        $this->accountRepository->setUser($user);
+        $this->piggyBankRepository->setUser($user);
+    }
+
    /**
     * Store a piggy bank or come back with an exception.
-     *
-     * @param array $data
-     *
-     * @return PiggyBank
     */
    public function store(array $data): PiggyBank
    {

-        $piggyBankData = $data;
+        $piggyBankData                            = $data;

        // unset some fields
        unset($piggyBankData['object_group_title'], $piggyBankData['transaction_currency_code'], $piggyBankData['transaction_currency_id'], $piggyBankData['accounts'], $piggyBankData['object_group_id'], $piggyBankData['notes']);
@@ -94,11 +91,11 @@ class PiggyBankFactory

            throw new FireflyException('400005: Could not store new piggy bank.', 0, $e);
        }
-        $piggyBank = $this->setOrder($piggyBank, $data);
+        $piggyBank                                = $this->setOrder($piggyBank, $data);
        $this->linkToAccountIds($piggyBank, $data['accounts']);
        $this->piggyBankRepository->updateNote($piggyBank, $data['notes']);

-        $objectGroupTitle = $data['object_group_title'] ?? '';
+        $objectGroupTitle                         = $data['object_group_title'] ?? '';
        if ('' !== $objectGroupTitle) {
            $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);
            if (null !== $objectGroup) {
@@ -106,7 +103,7 @@ class PiggyBankFactory
            }
        }
        // try also with ID
-        $objectGroupId = (int) ($data['object_group_id'] ?? 0);
+        $objectGroupId                            = (int) ($data['object_group_id'] ?? 0);
        if (0 !== $objectGroupId) {
            $objectGroup = $this->findObjectGroupById($objectGroupId);
            if (null !== $objectGroup) {
@@ -114,16 +111,17 @@ class PiggyBankFactory
            }
        }
        Log::debug('Touch piggy bank');
-        $piggyBank->encrypted = false;
+        $piggyBank->encrypted                     = false;
        $piggyBank->save();
        $piggyBank->touch();
+
        return $piggyBank;
    }

    private function getCurrency(array $data): TransactionCurrency
    {
        // currency:
-        $defaultCurrency = app('amount')->getDefaultCurrency();
+        $defaultCurrency = app('amount')->getNativeCurrency();
        $currency        = null;
        if (array_key_exists('transaction_currency_code', $data)) {
            $currency = $this->currencyRepository->findByCode((string) ($data['transaction_currency_code'] ?? ''));
@@ -132,6 +130,7 @@ class PiggyBankFactory
            $currency = $this->currencyRepository->find((int) ($data['transaction_currency_id'] ?? 0));
        }
        $currency ??= $defaultCurrency;
+
        return $currency;
    }

@@ -144,12 +143,12 @@ class PiggyBankFactory
        }
        // first find by ID:
        if ($piggyBankId > 0) {
-            $piggyBank = PiggyBank
-                ::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+            $piggyBank = PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
                ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
                ->where('accounts.user_id', $this->user->id)
                ->where('piggy_banks.id', $piggyBankId)
-                ->first(['piggy_banks.*']);
+                ->first(['piggy_banks.*'])
+            ;
            if (null !== $piggyBank) {
                return $piggyBank;
            }
@@ -169,23 +168,24 @@ class PiggyBankFactory

    public function findByName(string $name): ?PiggyBank
    {
-        return PiggyBank
-            ::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+        return PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
            ->where('accounts.user_id', $this->user->id)
            ->where('piggy_banks.name', $name)
-            ->first(['piggy_banks.*']);
+            ->first(['piggy_banks.*'])
+        ;
    }

    private function setOrder(PiggyBank $piggyBank, array $data): PiggyBank
    {
        $this->resetOrder();
-        $order = $this->getMaxOrder() + 1;
+        $order            = $this->getMaxOrder() + 1;
        if (array_key_exists('order', $data)) {
            $order = $data['order'];
        }
        $piggyBank->order = $order;
        $piggyBank->saveQuietly();
+
        return $piggyBank;

    }
@@ -193,8 +193,7 @@ class PiggyBankFactory
    public function resetOrder(): void
    {
        // TODO duplicate code
-        $set     = PiggyBank
-            ::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
+        $set     = PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')
            ->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')
            ->where('accounts.user_id', $this->user->id)
            ->with(
@@ -202,7 +201,8 @@ class PiggyBankFactory
                    'objectGroups',
                ]
            )
-            ->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*']);
+            ->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*'])
+        ;
        $current = 1;
        foreach ($set as $piggyBank) {
            if ($piggyBank->order !== $current) {
@@ -214,7 +214,6 @@ class PiggyBankFactory
        }
    }

-
    private function getMaxOrder(): int
    {
        return (int) $this->piggyBankRepository->getPiggyBanks()->max('order');
@@ -231,8 +230,8 @@ class PiggyBankFactory
            foreach ($accounts as $info) {
                if ($account->id === $info['account_id']) {
                    if (array_key_exists($account->id, $accounts)) {
-                        $toBeLinked[$account->id] = ['current_amount' => $account->pivot?->current_amount ?? '0'];
-                        Log::debug(sprintf('Prefilled for account #%d with amount %s', $account->id, $account->pivot?->current_amount ?? '0'));
+                        $toBeLinked[$account->id] = ['current_amount' => $account->pivot->current_amount ?? '0'];
+                        Log::debug(sprintf('Prefilled for account #%d with amount %s', $account->id, $account->pivot->current_amount ?? '0'));
                    }
                }
            }
@@ -247,7 +246,7 @@ class PiggyBankFactory
            }
            if (array_key_exists('current_amount', $info)) {
                $toBeLinked[$account->id] = ['current_amount' => $info['current_amount']];
-                Log::debug(sprintf('Will link account #%d with amount %s', $account->id, $account->pivot?->current_amount ?? '0'));
+                Log::debug(sprintf('Will link account #%d with amount %s', $account->id, $account->pivot->current_amount ?? '0'));
            }
            if (!array_key_exists('current_amount', $info)) {
                $toBeLinked[$account->id] ??= [];
@@ -54,7 +54,7 @@ class RecurrenceFactory
    /**
     * @throws FireflyException
     *
-     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings("PHPMD.NPathComplexity")
     */
    public function create(array $data): Recurrence
    {
@@ -218,7 +218,7 @@ class TransactionFactory
    }

    /**
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
     */
    public function setUser(User $user): void
    {
@@ -34,7 +34,6 @@ use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionJournalMeta;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@@ -54,7 +53,7 @@ use Illuminate\Support\Facades\Log;
 /**
 * Class TransactionJournalFactory
 *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings("PHPMD.CouplingBetweenObjects")
 */
 class TransactionJournalFactory
 {
@@ -151,7 +150,7 @@ class TransactionJournalFactory
     * @throws DuplicateTransactionException
     * @throws FireflyException
     *
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings("PHPMD.ExcessiveMethodLength")
     */
    private function createJournal(NullArrayObject $row): ?TransactionJournal
    {
@@ -166,7 +165,7 @@ class TransactionJournalFactory
        $currency              = $this->currencyRepository->findCurrency((int) $row['currency_id'], $row['currency_code']);
        $foreignCurrency       = $this->currencyRepository->findCurrencyNull($row['foreign_currency_id'], $row['foreign_currency_code']);
        $bill                  = $this->billRepository->findBill((int) $row['bill_id'], $row['bill_name']);
-        $billId                = TransactionType::WITHDRAWAL === $type->type && null !== $bill ? $bill->id : null;
+        $billId                = TransactionTypeEnum::WITHDRAWAL->value === $type->type && null !== $bill ? $bill->id : null;
        $description           = (string) $row['description'];

        // Manipulate basic fields
@@ -174,7 +173,7 @@ class TransactionJournalFactory

        // 2024-11-19, overrule timezone with UTC and store it as UTC.

-        if (FireflyConfig::get('utc', false)->data) {
+        if (true === FireflyConfig::get('utc', false)->data) {
            $carbon->setTimezone('UTC');
        }
        // $carbon->setTimezone('UTC');
@@ -279,7 +278,7 @@ class TransactionJournalFactory
        $amount                = (string) $row['amount'];
        $foreignAmount         = (string) $row['foreign_amount'];
        if (null !== $foreignCurrency && $foreignCurrency->id !== $currency->id
-            && TransactionType::TRANSFER === $type->type
+            && TransactionTypeEnum::TRANSFER->value === $type->type
        ) {
            $transactionFactory->setCurrency($foreignCurrency);
            $transactionFactory->setForeignCurrency($currency);
@@ -423,7 +422,7 @@ class TransactionJournalFactory

            return [$sourceAccount, $destinationAccount];
        }
-        if (null === $destinationAccount) { // @phpstan-ignore-line
+        if (null === $destinationAccount) {
            app('log')->debug('Destination account is NULL, source account is not.');
            $account = $this->accountRepository->getReconciliation($sourceAccount);
            app('log')->debug(sprintf('Will return account #%d ("%s") of type "%s"', $account->id, $account->name, $account->accountType->type));
@@ -451,8 +450,8 @@ class TransactionJournalFactory
        app('log')->debug('Now in getCurrencyByAccount()');

        return match ($type) {
-            default                  => $this->getCurrency($currency, $source),
-            TransactionType::DEPOSIT => $this->getCurrency($currency, $destination),
+            default                             => $this->getCurrency($currency, $source),
+            TransactionTypeEnum::DEPOSIT->value => $this->getCurrency($currency, $destination),
        };
    }

@@ -467,7 +466,7 @@ class TransactionJournalFactory
        $preference = $this->accountRepository->getAccountCurrency($account);
        if (null === $preference && null === $currency) {
            // return user's default:
-            return app('amount')->getDefaultCurrencyByUserGroup($this->user->userGroup);
+            return app('amount')->getNativeCurrencyByUserGroup($this->user->userGroup);
        }
        $result     = $preference ?? $currency;
        app('log')->debug(sprintf('Currency is now #%d (%s) because of account #%d (%s)', $result->id, $result->code, $account->id, $account->name));
@@ -495,7 +494,7 @@ class TransactionJournalFactory
     */
    private function getForeignByAccount(string $type, ?TransactionCurrency $foreignCurrency, Account $destination): ?TransactionCurrency
    {
-        if (TransactionType::TRANSFER === $type) {
+        if (TransactionTypeEnum::TRANSFER->value === $type) {
            return $this->getCurrency($foreignCurrency, $destination);
        }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
github-actions	15ac69bfad	Auto commit for release 'develop' on 2025-01-20	2025-01-20 04:08:13 +01:00
github-actions	a5bd28f8d4	Auto commit for release 'develop' on 2025-01-19	2025-01-19 19:26:58 +01:00
github-actions	b2516ca1b4	Auto commit for release 'v6.2.0-alpha.2' on 2025-01-19	2025-01-19 19:12:01 +01:00
James Cole	053b46ae63	[chore] fix phpstan errors.	2025-01-19 19:07:19 +01:00
James Cole	6e836aceec	Expand changelog.	2025-01-19 18:55:03 +01:00
James Cole	0e8bcd2e79	[chore] cod cleanup	2025-01-19 18:53:32 +01:00
James Cole	bd1f8b2497	[chore] Move to native from default. [skip ci]	2025-01-19 11:54:40 +01:00
James Cole	19dfcf7139	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop # Conflicts: # app/Transformers/CurrencyTransformer.php # app/Transformers/V2/CurrencyTransformer.php	2025-01-19 11:48:18 +01:00
James Cole	ef7a3287bb	Add info to changelog	2025-01-19 11:47:49 +01:00
James Cole	2900049498	Add default	2025-01-19 11:47:41 +01:00
github-actions	04d1e8fd59	Auto commit for release 'develop' on 2025-01-19	2025-01-19 11:46:08 +01:00
James Cole	9d2f57e40a	Fix menu	2025-01-19 11:41:24 +01:00
James Cole	ae366341cc	Rename default to native.	2025-01-19 11:40:07 +01:00
James Cole	3766128cb8	Add code for administrations.	2025-01-19 11:34:23 +01:00
James Cole	950c60d55c	Fix https://github.com/firefly-iii/firefly-iii/issues/9667	2025-01-19 07:18:07 +01:00
James Cole	4b2807de48	rename admin to settings.	2025-01-18 17:26:31 +01:00
James Cole	649736cb31	Rename admin to settings.	2025-01-18 17:22:11 +01:00
James Cole	6a121a8a78	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop # Conflicts: # app/Transformers/AccountTransformer.php	2025-01-18 17:21:34 +01:00
James Cole	f69b9ac9da	Commit updated transformers.	2025-01-18 17:20:39 +01:00
James Cole	23d70a2fac	Rename to settings	2025-01-18 17:20:21 +01:00
James Cole	d178ff9de0	Rename admin routes to settings.	2025-01-18 17:20:06 +01:00
James Cole	3ecad3457f	Rename "administration" to "settings"	2025-01-18 17:10:47 +01:00
github-actions	fa6c621968	Auto commit for release 'develop' on 2025-01-15	2025-01-15 20:30:00 +01:00
James Cole	df863b6cff	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2025-01-15 18:54:56 +01:00
James Cole	9316ff3e51	Fix account api for new features.	2025-01-15 18:54:49 +01:00
James Cole	bfd91f8ee6	Update default.twig Signed-off-by: James Cole <james@firefly-iii.org>	2025-01-13 11:32:54 +01:00
github-actions	13e5d25cfe	Auto commit for release 'develop' on 2025-01-13	2025-01-13 04:14:18 +01:00
James Cole	b13030420b	Merge branch 'main' into develop	2025-01-11 10:07:21 +01:00
github-actions	44d1e8181c	Auto commit for release 'develop' on 2025-01-11	2025-01-11 10:06:32 +01:00
James Cole	63b34c1853	Remove unused step.	2025-01-11 10:05:51 +01:00
github-actions	facd0144cb	Auto commit for release 'develop' on 2025-01-10	2025-01-10 17:56:21 +01:00
James Cole	115e3435af	Fix https://github.com/orgs/firefly-iii/discussions/9576	2025-01-10 06:26:28 +01:00
github-actions	d44cd50768	Auto commit for release 'develop' on 2025-01-06	2025-01-06 07:37:27 +01:00
James Cole	1afcaea4c6	Trim quotes	2025-01-06 06:55:34 +01:00
James Cole	2bd1b37717	Move class to separate file.	2025-01-06 06:19:09 +01:00
github-actions	2d37177316	Auto commit for release 'develop' on 2025-01-06	2025-01-06 04:13:41 +01:00
James Cole	abb25e2015	Fix sql query error and upgrade error.	2025-01-05 14:33:33 +01:00
James Cole	d08d075e30	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2025-01-05 09:23:17 +01:00
github-actions	b4c67c02a7	Auto commit for release 'develop' on 2025-01-05	2025-01-05 09:23:02 +01:00
James Cole	04fb6a953e	This rule is no longer necessary.	2025-01-05 09:21:29 +01:00
James Cole	5dce0bec8e	This is no longer necessary since translations are no longer stored in the repository.	2025-01-05 09:20:55 +01:00
James Cole	481bb3fb0a	Fix a few test cases.	2025-01-05 09:18:03 +01:00
James Cole	b6960dc299	Fix search result page.	2025-01-05 08:03:15 +01:00
James Cole	73104aae1f	Fix data provider.	2025-01-05 07:52:23 +01:00
James Cole	10a284848b	Drop else-statements, remove debug statement.	2025-01-05 07:45:29 +01:00
James Cole	fd6560bdd0	Fix copyright for new files.	2025-01-05 07:40:30 +01:00
James Cole	0810f617c7	Merge pull request #9598 from Sobuno/NewQueryParserV3 New Query Parser for Search Engine and Rules	2025-01-05 07:32:55 +01:00
James Cole	c3ffd39450	run phpcs	2025-01-05 07:31:26 +01:00
James Cole	0f69e0d672	Level 7 yay!	2025-01-04 19:43:58 +01:00
James Cole	1aa8ebe57f	Fixed level 7!	2025-01-04 19:25:43 +01:00
James Cole	23178614d5	First fixes for level 7.	2025-01-04 19:12:04 +01:00
James Cole	d2b6829574	First fixes for level 7.	2025-01-04 19:05:24 +01:00
James Cole	5602715c96	Made it to level 6!	2025-01-04 15:16:11 +01:00
James Cole	54d0433dd4	Start with level 6. [skip ci]	2025-01-04 09:34:17 +01:00
James Cole	f4bc313d0b	Fix level 5! Mostly by ignoring the errors lol.	2025-01-04 09:15:39 +01:00
James Cole	5617de3a79	Level 4 fixed!	2025-01-04 09:01:44 +01:00
James Cole	2d62f0ff06	Rename class [skip ci]	2025-01-04 08:44:02 +01:00
James Cole	1c79f6b1b6	Rename again [skip ci]	2025-01-04 08:42:57 +01:00
James Cole	bf01153c6b	Rename file [skip ci]	2025-01-04 08:42:36 +01:00
James Cole	c43b37baef	Various phpstan fixes [skip ci]	2025-01-04 08:42:06 +01:00
James Cole	d4942efd8e	Fix various level 4 issues [skip ci]	2025-01-04 08:02:05 +01:00
James Cole	ea9f635b1a	Improved cs fixer config [skip ci]	2025-01-04 07:39:33 +01:00
James Cole	7eaa0e16b3	Run phpcs locally to make sure phpstan stays fixed. [skip ci]	2025-01-04 07:39:16 +01:00
James Cole	1b97d8fd48	Fix phpcs things [skip ci]	2025-01-04 07:31:25 +01:00
James Cole	89a29b9b10	Disable a rule.	2025-01-04 07:25:45 +01:00
James Cole	2baac1a6d7	Fix phpstan level 3!	2025-01-04 07:10:37 +01:00
James Cole	cd296aa9ac	Fix test run.	2025-01-04 06:35:26 +01:00
James Cole	959d168352	Fix various phpstan issues.	2025-01-03 19:16:38 +01:00
James Cole	6cd60951ba	Fix for level 2	2025-01-03 19:07:29 +01:00
James Cole	3898c0c0ef	Fix phpstan issues.	2025-01-03 18:16:27 +01:00
James Cole	fe4d139817	fix phpstan warnings	2025-01-03 15:53:10 +01:00
James Cole	d95f3ca59f	No errors on level 1.	2025-01-03 15:07:30 +01:00
James Cole	7f6c03ce17	Fix phpstan issues.	2025-01-03 15:04:15 +01:00
James Cole	394d0eabef	Fix various phpstan issues.	2025-01-03 14:56:06 +01:00
James Cole	a8ae496fda	Replace enum	2025-01-03 09:15:52 +01:00
James Cole	1787f4421b	Replace enum	2025-01-03 09:11:20 +01:00
James Cole	36351a5dd9	Replace enum	2025-01-03 09:09:15 +01:00
James Cole	d009ce31ca	Replace enum	2025-01-03 09:05:56 +01:00
James Cole	44eafeeae5	Replace enum	2025-01-03 09:05:19 +01:00
James Cole	21165eb3e0	Update packages.	2025-01-03 08:30:04 +01:00
James Cole	2ef3a33fbf	Merge branch 'main' into develop	2025-01-03 08:17:57 +01:00
James Cole	f74be0402f	Add copyright statements.	2025-01-03 08:15:09 +01:00
github-actions	a60cb366b2	Auto commit for release 'develop' on 2025-01-03	2025-01-03 07:12:13 +01:00
github-actions	58e2ef187d	Auto commit for release 'develop' on 2025-01-03	2025-01-03 07:01:02 +01:00
James Cole	ae80fd8578	Fix test cases.	2025-01-03 04:51:42 +01:00
James Cole	c17f2efca6	Fix missing variables.	2025-01-03 04:36:41 +01:00
James Cole	4a185639b9	Fix removal of all piggy banks.	2025-01-03 04:32:51 +01:00
Sobuno	dae7e7d507	Handle excludedWords on Rule management pages as well	2025-01-03 01:00:17 +01:00
Sobuno	e33e3cc40f	Tweak UI	2025-01-03 00:45:19 +01:00
Sobuno	36ec1daf3a	Update UI	2025-01-03 00:29:38 +01:00
Sobuno	50aff9cfb6	Make prohibited word search work	2025-01-03 00:13:51 +01:00
Sobuno	058a0f9fb2	Show excluded words in UI	2025-01-03 00:08:11 +01:00
Sobuno	0c955efa8b	Allow flipping of subqueries	2025-01-03 00:07:57 +01:00
Sobuno	a62916a63d	Simplify further	2025-01-02 23:36:00 +01:00
Sobuno	af7a4b5d3d	Renaming of classes, making true recursive structure	2025-01-02 23:19:21 +01:00
Sobuno	2ae3929dd6	Give a bit better error messages in tests	2025-01-02 22:40:50 +01:00
Sobuno	ebd30f4861	Move tests to match rearranged structure + standardize tests	2025-01-02 22:18:12 +01:00
Sobuno	afc9ea08f3	Rearrange structure	2025-01-02 22:17:56 +01:00
Sobuno	78f9f7e2dd	Add QUERY_PARSER_IMPLEMENTATION in .env.example	2025-01-02 20:06:11 +01:00
Sobuno	c44b827922	Fix environment-based selection of Query Parser	2025-01-02 20:03:39 +01:00
James Cole	fb30f7ec8f	Update build script.	2025-01-02 19:10:39 +01:00
James Cole	e878d5ce07	Fix linking piggy banks to transactions.	2025-01-02 04:54:29 +01:00
github-actions	f727a38b69	Auto commit for release 'develop' on 2025-01-01	2025-01-01 16:47:50 +01:00
James Cole	c11a5384da	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2025-01-01 16:43:44 +01:00
James Cole	ed92cbd4b8	Fix piggy bank rule action	2025-01-01 16:43:31 +01:00
github-actions	a9ea32772f	Auto commit for release 'develop' on 2025-01-01	2025-01-01 16:38:58 +01:00
Sobuno	92f5cca65b	Add QueryParser tests to correct group	2025-01-01 14:18:56 +01:00
Sobuno	57b064f590	Remove incorrect LICENSE message at top of file	2025-01-01 14:18:19 +01:00
Sobuno	9729434926	Allow choosing QueryParser implementation	2025-01-01 05:36:22 +01:00
Sobuno	9d9dffee74	Always assert prohibited field	2025-01-01 05:32:49 +01:00
Sobuno	b3f374f4ea	Introduce assertion helpers to make tests more readable	2025-01-01 05:32:49 +01:00
Sobuno	50e07d422f	Small QoL additions	2025-01-01 05:32:49 +01:00
Sobuno	631ed4956a	Handle right parenthesis behaviour correctly	2025-01-01 05:32:49 +01:00
Sobuno	0eca1c8d03	Fix test	2025-01-01 05:32:49 +01:00
Sobuno	e38e4574ad	Fix warnings in tests and add some more	2025-01-01 05:32:49 +01:00
Sobuno	be2d3f3637	Rename QueryParser2 to QueryParser	2025-01-01 05:32:49 +01:00
Sobuno	0e3d779e24	Remove V1	2025-01-01 05:32:49 +01:00
Sobuno	4d25336d87	More WIP	2025-01-01 05:32:49 +01:00
Sobuno	74f76a2835	Fix namespace	2025-01-01 05:32:49 +01:00
Sobuno	84560a6f44	WIP	2025-01-01 05:32:49 +01:00
James Cole	6fde693e7a	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop # Conflicts: # app/Support/Steam.php	2024-12-31 08:19:47 +01:00
James Cole	2e46d9ba33	Clean up some logs.	2024-12-31 08:18:40 +01:00
James Cole	e36f8deb08	Clean up some logs.	2024-12-31 08:18:21 +01:00
James Cole	1631b422f1	Clean up logs, add cache.	2024-12-31 08:17:35 +01:00
github-actions	b58d809063	Auto commit for release 'develop' on 2024-12-31	2024-12-31 08:09:51 +01:00
James Cole	9e34314dbc	Fix various issues with new features, nullpointers and missing checks.	2024-12-31 08:05:25 +01:00
github-actions	e4aa218b5f	Auto commit for release 'v6.2.0-alpha.1' on 2024-12-30	2024-12-30 17:09:40 +01:00
github-actions	31722477d4	Merge branch 'develop'	2024-12-30 16:07:29 +00:00
github-actions	ec82105433	Auto commit for release 'develop' on 2024-12-30	2024-12-30 15:35:26 +01:00
James Cole	146e164f04	Back to 8.	2024-12-30 15:31:27 +01:00
James Cole	7d37c93988	Expand workflow.	2024-12-30 15:25:39 +01:00
James Cole	73dffacd9a	Expand to support alpha and beta versions.	2024-12-30 12:23:50 +01:00
James Cole	d37304fa68	Fix available budgets.	2024-12-30 12:22:39 +01:00
James Cole	62f4da6063	Update available budgets code.	2024-12-30 10:51:34 +01:00
James Cole	760da08ab7	Update exchange rates.	2024-12-30 07:36:22 +01:00
James Cole	e68c4d4408	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2024-12-30 07:36:12 +01:00
James Cole	46a200aa1f	Fix broken variable.	2024-12-30 07:30:23 +01:00
James Cole	c422039335	Merge pull request #9589 from tasnim0tantawi/autocomplete-test Autocomplete test - CurrencyControllerTest & ObjectGroupControllerTest	2024-12-30 07:18:05 +01:00
github-actions	0579c8565d	Auto commit for release 'develop' on 2024-12-30	2024-12-30 04:12:18 +01:00
James Cole	9f25880a59	Clean up several endpoints with complex code.	2024-12-29 18:32:02 +01:00
James Cole	05f1819f7d	Fix API convert to native. Still needs refactoring.	2024-12-29 14:24:20 +01:00
James Cole	fa2149f957	Update API to convert to native.	2024-12-29 13:47:48 +01:00
James Cole	c21a79e029	Better, but not perfect, currency switch.	2024-12-29 08:16:27 +01:00
James Cole	03e31ebb5e	Clean up endpoint.	2024-12-29 06:36:49 +01:00
James Cole	3c20e5f3af	Make sure integers are converted to strings because sqlite sucks.	2024-12-29 06:32:50 +01:00
James Cole	9a9dd9e075	Double fix. Not sure yet what causes this.	2024-12-29 06:17:29 +01:00
James Cole	7189986c03	Remove some debug logging.	2024-12-29 06:15:42 +01:00
James Cole	b407d8d315	Add usergroup, clean up some code.	2024-12-29 06:14:40 +01:00
James Cole	41fa2a6208	Include user group in test set.	2024-12-29 06:10:54 +01:00
James Cole	fe00c4c373	Fix unauthenticated get default currency.	2024-12-29 06:08:35 +01:00
James Cole	7248a76c63	Fix chart, expand changelog.	2024-12-29 05:58:12 +01:00
James Cole	ee3c618797	Fix https://github.com/firefly-iii/firefly-iii/issues/9586	2024-12-29 05:55:49 +01:00
James Cole	a1241ebedb	Various multi-currency things in the autocomplete API.	2024-12-28 18:38:19 +01:00
James Cole	af78d998db	Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop	2024-12-28 14:09:42 +01:00
James Cole	d96c235ffe	Fix path	2024-12-28 14:09:22 +01:00
James Cole	79ca1b5f4e	Change some CS fixer settings.	2024-12-28 14:08:34 +01:00
github-actions	0f68735e1c	Auto commit for release 'develop' on 2024-12-28	2024-12-28 13:59:31 +01:00
James Cole	82abee37de	Fix a string of text.	2024-12-28 13:45:45 +01:00
James Cole	507040f1fd	Update various code for sqlite compatibility.	2024-12-28 13:36:25 +01:00
James Cole	42dc8486e9	Fix string.	2024-12-28 11:16:55 +01:00
TasneemTantawy	5971d155ef	fixed create authenticated user	2024-12-23 09:37:06 +03:00
TasneemTantawy	9e373a9b0d	object group controller test	2024-12-22 16:29:56 +03:00
TasneemTantawy	4fb61646b4	currency controller test	2024-12-22 15:54:18 +03:00