Merge pull request #10293 from firefly-iii/release-1747020359

🤖 Automatically merge the PR into the develop branch.

.ci/php-cs-fixer/.php-cs-fixer.php

@@ -61,7 +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.
+        'phpdoc_to_comment'             => false, // do not overrule single line comment style, breaks phpstan.
 
         // complex rules
         'array_syntax'                  => ['syntax' => 'short'],

.ci/php-cs-fixer/composer.lock

@@ -406,16 +406,16 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.73.1",
+            "version": "v3.75.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "ffcb8200a42045e65049af7910cfd022f631b064"
+                "reference": "399a128ff2fdaf4281e4e79b755693286cdf325c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/ffcb8200a42045e65049af7910cfd022f631b064",
-                "reference": "ffcb8200a42045e65049af7910cfd022f631b064",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/399a128ff2fdaf4281e4e79b755693286cdf325c",
+                "reference": "399a128ff2fdaf4281e4e79b755693286cdf325c",
                 "shasum": ""
             },
             "require": {
@@ -498,7 +498,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.73.1"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.75.0"
             },
             "funding": [
                 {
@@ -506,7 +506,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-03-19T23:42:16+00:00"
+            "time": "2025-03-31T18:40:42+00:00"
         },
         {
             "name": "psr/container",
@@ -1256,16 +1256,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.2.1",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
+                "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
-                "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0e2e3f38c192e93e622e41ec37f4ca70cfedf218",
+                "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218",
                 "shasum": ""
             },
             "require": {
@@ -1329,7 +1329,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.2.1"
+                "source": "https://github.com/symfony/console/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -1345,7 +1345,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-11T03:49:26+00:00"
+            "time": "2025-04-07T19:09:28+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1769,7 +1769,7 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -1828,7 +1828,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -1848,7 +1848,7 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
@@ -1906,7 +1906,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -1926,7 +1926,7 @@
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -1987,7 +1987,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2007,19 +2007,20 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
                 "shasum": ""
             },
             "require": {
+                "ext-iconv": "*",
                 "php": ">=7.2"
             },
             "provide": {
@@ -2067,7 +2068,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2083,20 +2084,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2024-12-23T08:48:59+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
-                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
                 "shasum": ""
             },
             "require": {
@@ -2147,7 +2148,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2163,11 +2164,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2025-01-02T08:10:11+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
@@ -2223,7 +2224,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -2243,16 +2244,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v7.2.4",
+            "version": "v7.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf"
+                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
-                "reference": "d8f411ff3c7ddc4ae9166fb388d1190a2df5b5cf",
+                "url": "https://api.github.com/repos/symfony/process/zipball/87b7c93e57df9d8e39a093d32587702380ff045d",
+                "reference": "87b7c93e57df9d8e39a093d32587702380ff045d",
                 "shasum": ""
             },
             "require": {
@@ -2284,7 +2285,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v7.2.4"
+                "source": "https://github.com/symfony/process/tree/v7.2.5"
             },
             "funding": [
                 {
@@ -2300,7 +2301,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-05T08:33:46+00:00"
+            "time": "2025-03-13T12:21:46+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -2449,16 +2450,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.2.0",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82"
+                "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82",
-                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82",
+                "url": "https://api.github.com/repos/symfony/string/zipball/a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
+                "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
                 "shasum": ""
             },
             "require": {
@@ -2516,7 +2517,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.2.0"
+                "source": "https://github.com/symfony/string/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -2532,7 +2533,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-13T13:31:26+00:00"
+            "time": "2025-04-20T20:18:16+00:00"
         }
     ],
     "packages-dev": [],

.ci/rector.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+                   ->withPaths([
+                                   __DIR__ . '/../app',
+                                   __DIR__ . '/../bootstrap',
+                                   __DIR__ . '/../config',
+                                   __DIR__ . '/../public',
+                                   __DIR__ . '/../resources',
+                                   __DIR__ . '/../routes',
+                                   __DIR__ . '/../tests',
+                               ])
+    // uncomment to reach your current PHP version
+                   ->withPhpSets()
+                   ->withTypeCoverageLevel(0)
+                   ->withDeadCodeLevel(0)
+                   ->withCodeQualityLevel(0);

.ci/rector.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+#
+# phpstan.sh
+# 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/>.
+#
+
+# Install composer packages
+#composer install --no-scripts --no-ansi
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+$SCRIPT_DIR/../vendor/bin/rector --config $SCRIPT_DIR/rector.php

.env.example

@@ -164,6 +164,13 @@ MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
 MAIL_SENDMAIL_COMMAND=
 
+#
+# If you use self-signed certificates for your STMP server, you can use the following settings.
+#
+MAIL_ALLOW_SELF_SIGNED=false
+MAIL_VERIFY_PEER=true
+MAIL_VERIFY_PEER_NAME=true
+
 # Other mail drivers:
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MAILGUN_DOMAIN=
@@ -289,13 +296,6 @@ STATIC_CRON_TOKEN=
 # However if you know what you're doing you can significantly speed up container start times.
 # Set each value to true to enable, or false to disable.
 
-# Set this to true to build all locales supported by Firefly III.
-# This may take quite some time (several minutes) and is generally not recommended.
-# If you wish to change or alter the list of locales, start your Docker container with
-# `docker run -v locale.gen:/etc/locale.gen -e DKR_BUILD_LOCALE=true`
-# and make sure your preferred locales are in your own locale.gen.
-DKR_BUILD_LOCALE=false
-
 # Check if the SQLite database exists. Can be skipped if you're not using SQLite.
 # Won't significantly speed up things.
 DKR_CHECK_SQLITE=true

.github/pull_request_template.md

@@ -21,5 +21,3 @@ Changes in this pull request:
 -
 -
 -
-
-@JC5

.github/workflows/release.yml

@@ -59,7 +59,28 @@ jobs:
           git config user.email release@firefly-iii.org
           git config advice.addIgnoredFile false
           git config push.autoSetupRemote true
-      - name: crowdin action
+      - name: Lint PHP
+        run: |
+          php_lint_file()
+          {
+              local php_file="$1"
+              php -l "$php_file" &> /dev/null
+              if [ "$?" -ne 0 ]
+              then
+                  echo -e "[FAIL] $php_file"
+                  return 1
+              fi
+          }
+
+          export -f php_lint_file
+
+          find . -path ./vendor -prune -o -name '*.php' | parallel -j 4 php_lint_file {}
+
+          if [ "$?" -ne 0 ]
+          then
+              exit 1
+          fi
+      - name: Crowdin action
         uses: crowdin/github-action@v2
         with:
           upload_sources: true
@@ -260,6 +281,8 @@ jobs:
             sudo chown -R runner:docker output.txt
             touch output.txt
             echo '' >> output.txt
+            echo "Welcome to release $version of Firefly III. It contains the the latest fixes, translations and features. Docker users can find this release under the \`latest\` tag." >> 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

THANKS.md

@@ -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.
 
 ## 2025
+- Denis Iskandarov
+- =
 - Lompi
 - Jose Diaz-Gonzalez
 - SoftBrix

app/Api/V1/Controllers/Autocomplete/AccountController.php

@@ -43,6 +43,7 @@ use Illuminate\Support\Facades\Log;
 class AccountController extends Controller
 {
     use AccountFilter;
+
     // this array only exists to test if the constructor will use it properly.
     protected array $accepts = ['application/json', 'application/vnd.api+json'];
 

app/Api/V1/Controllers/Autocomplete/BillController.php

@@ -65,13 +65,11 @@ class BillController extends Controller
         $data     = $request->getData();
         $result   = $this->repository->searchBill($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
-            static function (Bill $item) {
-                return [
-                    'id'     => (string) $item->id,
-                    'name'   => $item->name,
-                    'active' => $item->active,
-                ];
-            }
+            static fn (Bill $item) => [
+                'id'     => (string) $item->id,
+                'name'   => $item->name,
+                'active' => $item->active,
+            ]
         );
 
         return response()->api($filtered->toArray());

app/Api/V1/Controllers/Autocomplete/BudgetController.php

@@ -65,12 +65,10 @@ class BudgetController extends Controller
         $data     = $request->getData();
         $result   = $this->repository->searchBudget($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
-            static function (Budget $item) {
-                return [
-                    'id'   => (string) $item->id,
-                    'name' => $item->name,
-                ];
-            }
+            static fn (Budget $item) => [
+                'id'   => (string) $item->id,
+                'name' => $item->name,
+            ]
         );
 
         return response()->api($filtered->toArray());

app/Api/V1/Controllers/Autocomplete/CategoryController.php

@@ -65,12 +65,10 @@ class CategoryController extends Controller
         $data     = $request->getData();
         $result   = $this->repository->searchCategory($data['query'], $this->parameters->get('limit'));
         $filtered = $result->map(
-            static function (Category $item) {
-                return [
-                    'id'   => (string) $item->id,
-                    'name' => $item->name,
-                ];
-            }
+            static fn (Category $item) => [
+                'id'   => (string) $item->id,
+                'name' => $item->name,
+            ]
         );
 
         return response()->api($filtered->toArray());

app/Api/V1/Controllers/Autocomplete/TransactionController.php

@@ -39,11 +39,10 @@ use Illuminate\Support\Collection;
  */
 class TransactionController extends Controller
 {
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
     private TransactionGroupRepositoryInterface $groupRepository;
     private JournalRepositoryInterface          $repository;
 
-    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
-
     /**
      * TransactionController constructor.
      */

app/Api/V1/Controllers/Chart/AccountController.php

@@ -26,14 +26,17 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
 
 use Carbon\Carbon;
 use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Chart\ChartRequest;
 use FireflyIII\Api\V1\Requests\Data\DateRequest;
 use FireflyIII\Enums\AccountTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\Preference;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Chart\ChartData;
 use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\ApiSupport;
+use FireflyIII\Support\Http\Api\CollectsAccountsFromFilter;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
@@ -43,7 +46,9 @@ use Illuminate\Http\JsonResponse;
 class AccountController extends Controller
 {
     use ApiSupport;
+    use CollectsAccountsFromFilter;
 
+    private ChartData                  $chartData;
     private AccountRepositoryInterface $repository;
 
     /**
@@ -56,6 +61,7 @@ class AccountController extends Controller
             function ($request, $next) {
                 /** @var User $user */
                 $user             = auth()->user();
+                $this->chartData  = new ChartData();
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUser($user);
 
@@ -64,6 +70,70 @@ class AccountController extends Controller
         );
     }
 
+    /**
+     * TODO fix documentation
+     *
+     * @throws FireflyException
+     */
+    public function dashboard(ChartRequest $request): JsonResponse
+    {
+        $queryParameters = $request->getParameters();
+        $accounts        = $this->getAccountList($queryParameters);
+
+        // move date to end of day
+        $queryParameters['start']->startOfDay();
+        $queryParameters['end']->endOfDay();
+
+        // loop each account, and collect info:
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $this->renderAccountData($queryParameters, $account);
+        }
+
+        return response()->json($this->chartData->render());
+    }
+
+    /**
+     * @throws FireflyException
+     */
+    private function renderAccountData(array $params, Account $account): void
+    {
+        $currency     = $this->repository->getAccountCurrency($account);
+        if (null === $currency) {
+            $currency = $this->default;
+        }
+        $currentSet   = [
+            'label'                   => $account->name,
+
+            // the currency that belongs to the account.
+            'currency_id'             => (string) $currency->id,
+            'currency_code'           => $currency->code,
+            'currency_symbol'         => $currency->symbol,
+            'currency_decimal_places' => $currency->decimal_places,
+
+            // the default currency of the user (could be the same!)
+            'date'                    => $params['start']->toAtomString(),
+            'start'                   => $params['start']->toAtomString(),
+            'end'                     => $params['end']->toAtomString(),
+            'period'                  => '1D',
+            'entries'                 => [],
+        ];
+        $currentStart = clone $params['start'];
+        $range        = Steam::finalAccountBalanceInRange($account, $params['start'], clone $params['end'], $this->convertToNative);
+
+        $previous     = array_values($range)[0]['balance'];
+        while ($currentStart <= $params['end']) {
+            $format                        = $currentStart->format('Y-m-d');
+            $label                         = $currentStart->toAtomString();
+            $balance                       = array_key_exists($format, $range) ? $range[$format]['balance'] : $previous;
+            $previous                      = $balance;
+
+            $currentStart->addDay();
+            $currentSet['entries'][$label] = $balance;
+        }
+        $this->chartData->add($currentSet);
+    }
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/charts/getChartAccountOverview

app/Api/V1/Controllers/Chart/BudgetController.php

@@ -0,0 +1,260 @@
+<?php
+
+/*
+ * BudgetController.php
+ * Copyright (c) 2023 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\Chart;
+
+use Carbon\Carbon;
+use FireflyIII\Api\V1\Controllers\Controller;
+use FireflyIII\Api\V1\Requests\Generic\DateRequest;
+use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\BudgetLimit;
+use FireflyIII\Models\TransactionCurrency;
+use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
+use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
+use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
+use FireflyIII\Support\Http\Api\CleansChartData;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
+
+/**
+ * Class BudgetController
+ */
+class BudgetController extends Controller
+{
+    use CleansChartData;
+    use ValidatesUserGroupTrait;
+
+    protected array $acceptedRoles                      = [UserRoleEnum::READ_ONLY];
+
+    protected OperationsRepositoryInterface $opsRepository;
+    private BudgetLimitRepositoryInterface  $blRepository;
+    private array                           $currencies = [];
+    private TransactionCurrency             $currency;
+    private BudgetRepositoryInterface       $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository    = app(BudgetRepositoryInterface::class);
+                $this->blRepository  = app(BudgetLimitRepositoryInterface::class);
+                $this->opsRepository = app(OperationsRepositoryInterface::class);
+                $userGroup           = $this->validateUserGroup($request);
+                $this->repository->setUserGroup($userGroup);
+                $this->opsRepository->setUserGroup($userGroup);
+                $this->blRepository->setUserGroup($userGroup);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO see autocomplete/accountcontroller
+     */
+    public function dashboard(DateRequest $request): JsonResponse
+    {
+        $params  = $request->getAll();
+
+        /** @var Carbon $start */
+        $start   = $params['start'];
+
+        /** @var Carbon $end */
+        $end     = $params['end'];
+
+        // code from FrontpageChartGenerator, but not in separate class
+        $budgets = $this->repository->getActiveBudgets();
+        $data    = [];
+
+        /** @var Budget $budget */
+        foreach ($budgets as $budget) {
+            // could return multiple arrays, so merge.
+            $data = array_merge($data, $this->processBudget($budget, $start, $end));
+        }
+
+        return response()->json($this->clean($data));
+    }
+
+    /**
+     * @throws FireflyException
+     */
+    private function processBudget(Budget $budget, Carbon $start, Carbon $end): array
+    {
+        // get all limits:
+        $limits = $this->blRepository->getBudgetLimits($budget, $start, $end);
+        $rows   = [];
+
+        // if no limits
+        if (0 === $limits->count()) {
+            // return as a single item in an array
+            $rows = $this->noBudgetLimits($budget, $start, $end);
+        }
+        if ($limits->count() > 0) {
+            $rows = $this->budgetLimits($budget, $limits);
+        }
+        // is always an array
+        $return = [];
+        foreach ($rows as $row) {
+            $current  = [
+                'label'                   => $budget->name,
+                'currency_id'             => (string) $row['currency_id'],
+                'currency_code'           => $row['currency_code'],
+                'currency_name'           => $row['currency_name'],
+                'currency_decimal_places' => $row['currency_decimal_places'],
+                'period'                  => null,
+                'start'                   => $row['start'],
+                'end'                     => $row['end'],
+                'entries'                 => [
+                    'spent'     => $row['spent'],
+                    'left'      => $row['left'],
+                    'overspent' => $row['overspent'],
+                ],
+            ];
+            $return[] = $current;
+        }
+
+        return $return;
+    }
+
+    /**
+     * When no budget limits are present, the expenses of the whole period are collected and grouped.
+     * This is grouped per currency. Because there is no limit set, "left to spend" and "overspent" are empty.
+     *
+     * @throws FireflyException
+     */
+    private function noBudgetLimits(Budget $budget, Carbon $start, Carbon $end): array
+    {
+        $spent = $this->opsRepository->listExpenses($start, $end, null, new Collection([$budget]));
+
+        return $this->processExpenses($budget->id, $spent, $start, $end);
+    }
+
+    /**
+     * Shared between the "noBudgetLimits" function and "processLimit". Will take a single set of expenses and return
+     * its info.
+     *
+     * @param array<int, array<int, string>> $array
+     *
+     * @throws FireflyException
+     */
+    private function processExpenses(int $budgetId, array $array, Carbon $start, Carbon $end): array
+    {
+        $return = [];
+
+        /**
+         * This array contains the expenses in this budget. Grouped per currency.
+         * The grouping is on the main currency only.
+         *
+         * @var int   $currencyId
+         * @var array $block
+         */
+        foreach ($array as $currencyId => $block) {
+            $this->currencies[$currencyId] ??= TransactionCurrency::find($currencyId);
+            $return[$currencyId]           ??= [
+                'currency_id'             => (string) $currencyId,
+                'currency_code'           => $block['currency_code'],
+                'currency_name'           => $block['currency_name'],
+                'currency_symbol'         => $block['currency_symbol'],
+                'currency_decimal_places' => (int) $block['currency_decimal_places'],
+                'start'                   => $start->toAtomString(),
+                'end'                     => $end->toAtomString(),
+                'spent'                   => '0',
+                'left'                    => '0',
+                'overspent'               => '0',
+            ];
+            $currentBudgetArray = $block['budgets'][$budgetId];
+
+            // var_dump($return);
+            /** @var array $journal */
+            foreach ($currentBudgetArray['transaction_journals'] as $journal) {
+                $return[$currencyId]['spent'] = bcadd($return[$currencyId]['spent'], (string) $journal['amount']);
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * Function that processes each budget limit (per budget).
+     *
+     * If you have a budget limit in EUR, only transactions in EUR will be considered.
+     * If you have a budget limit in GBP, only transactions in GBP will be considered.
+     *
+     * If you have a budget limit in EUR, and a transaction in GBP, it will not be considered for the EUR budget limit.
+     *
+     * @throws FireflyException
+     */
+    private function budgetLimits(Budget $budget, Collection $limits): array
+    {
+        app('log')->debug(sprintf('Now in budgetLimits(#%d)', $budget->id));
+        $data = [];
+
+        /** @var BudgetLimit $limit */
+        foreach ($limits as $limit) {
+            $data = array_merge($data, $this->processLimit($budget, $limit));
+        }
+
+        return $data;
+    }
+
+    /**
+     * @throws FireflyException
+     */
+    private function processLimit(Budget $budget, BudgetLimit $limit): array
+    {
+        Log::debug(sprintf('Created new ExchangeRateConverter in %s', __METHOD__));
+        $end             = clone $limit->end_date;
+        $end->endOfDay();
+        $spent           = $this->opsRepository->listExpenses($limit->start_date, $end, null, new Collection([$budget]));
+        $limitCurrencyId = $limit->transaction_currency_id;
+        $filtered        = [];
+
+        /** @var array $entry */
+        foreach ($spent as $currencyId => $entry) {
+            // only spent the entry where the entry's currency matches the budget limit's currency
+            // so $filtered will only have 1 or 0 entries
+            if ($entry['currency_id'] === $limitCurrencyId) {
+                $filtered[$currencyId] = $entry;
+            }
+        }
+        $result          = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);
+        if (1 === count($result)) {
+            $compare = bccomp($limit->amount, (string) app('steam')->positive($result[$limitCurrencyId]['spent']));
+            if (1 === $compare) {
+                // convert this amount into the native currency:
+                $result[$limitCurrencyId]['left'] = bcadd($limit->amount, (string) $result[$limitCurrencyId]['spent']);
+            }
+            if ($compare <= 0) {
+                $result[$limitCurrencyId]['overspent'] = app('steam')->positive(bcadd($limit->amount, (string) $result[$limitCurrencyId]['spent']));
+            }
+        }
+
+        return $result;
+    }
+}

app/Api/V1/Controllers/Chart/CategoryController.php

@@ -0,0 +1,126 @@
+<?php
+
+/*
+ * CategoryController.php
+ * Copyright (c) 2023 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\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\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\CleansChartData;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class BudgetController
+ */
+class CategoryController extends Controller
+{
+    use CleansChartData;
+    use ValidatesUserGroupTrait;
+
+    private AccountRepositoryInterface  $accountRepos;
+    private CurrencyRepositoryInterface $currencyRepos;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->accountRepos  = app(AccountRepositoryInterface::class);
+                $this->currencyRepos = app(CurrencyRepositoryInterface::class);
+                $userGroup           = $this->validateUserGroup($request);
+                $this->accountRepos->setUserGroup($userGroup);
+                $this->currencyRepos->setUserGroup($userGroup);
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * TODO may be worth to move to a handler but the data is simple enough.
+     * TODO see autoComplete/account controller
+     *
+     * @throws FireflyException
+     *
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+     */
+    public function dashboard(DateRequest $request): JsonResponse
+    {
+        /** @var Carbon $start */
+        $start      = $this->parameters->get('start');
+
+        /** @var Carbon $end */
+        $end        = $this->parameters->get('end');
+        $accounts   = $this->accountRepos->getAccountsByType([AccountTypeEnum::DEBT->value, AccountTypeEnum::LOAN->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::ASSET->value, AccountTypeEnum::DEFAULT->value]);
+        $currencies = [];
+        $return     = [];
+
+        // get journals for entire period:
+        /** @var GroupCollectorInterface $collector */
+        $collector  = app(GroupCollectorInterface::class);
+        $collector->setRange($start, $end)->withAccountInformation();
+        $collector->setXorAccounts($accounts)->withCategoryInformation();
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::RECONCILIATION->value]);
+        $journals   = $collector->getExtractedJournals();
+
+        /** @var array $journal */
+        foreach ($journals as $journal) {
+            $currencyId              = (int) $journal['currency_id'];
+            $currency                = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
+            $currencies[$currencyId] = $currency;
+            $categoryName            = $journal['category_name'] ?? (string) trans('firefly.no_category');
+            $amount                  = app('steam')->positive($journal['amount']);
+            $key                     = sprintf('%s-%s', $categoryName, $currency->code);
+            // create arrays
+            $return[$key] ??= [
+                'label'                   => $categoryName,
+                'currency_id'             => (string) $currency->id,
+                'currency_code'           => $currency->code,
+                'currency_name'           => $currency->name,
+                'currency_symbol'         => $currency->symbol,
+                'currency_decimal_places' => $currency->decimal_places,
+                'period'                  => null,
+                'start'                   => $start->toAtomString(),
+                'end'                     => $end->toAtomString(),
+                'amount'                  => '0',
+            ];
+
+            // add monies
+            $return[$key]['amount']  = bcadd($return[$key]['amount'], (string) $amount);
+        }
+        $return     = array_values($return);
+
+        // order by amount
+        usort($return, static fn (array $a, array $b) => (float) $a['amount'] < (float) $b['amount'] ? 1 : -1);
+
+        return response()->json($this->clean($return));
+    }
+}

app/Api/V1/Controllers/Controller.php

@@ -40,7 +40,6 @@ 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;
@@ -62,15 +61,15 @@ abstract class Controller extends BaseController
     use ValidatesRequests;
     use ValidatesUserGroupTrait;
 
-    protected const string CONTENT_TYPE      = 'application/vnd.api+json';
-    protected const string JSON_CONTENT_TYPE = 'application/json';
+    protected const string CONTENT_TYPE            = 'application/vnd.api+json';
+    protected const string JSON_CONTENT_TYPE       = 'application/json';
+    protected array               $accepts         = ['application/json', 'application/vnd.api+json'];
 
     /** @var array<int, string> */
-    protected array        $allowedSort;
-    protected ParameterBag $parameters;
-    protected bool        $convertToNative   = false;
-    protected array $accepts                 = ['application/json', 'application/vnd.api+json'];
+    protected array               $allowedSort;
+    protected bool                $convertToNative = false;
     protected TransactionCurrency $nativeCurrency;
+    protected ParameterBag        $parameters;
 
     /**
      * Controller constructor.

app/Api/V1/Controllers/Data/Export/ExportController.php

@@ -30,6 +30,8 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Support\Export\ExportDataGenerator;
 use Illuminate\Http\Response as LaravelResponse;
 
+use function Safe\date;
+
 /**
  * Class ExportController
  */
@@ -88,7 +90,7 @@ class ExportController extends Controller
             ->header('Expires', '0')
             ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
             ->header('Pragma', 'public')
-            ->header('Content-Length', (string) strlen($data[$key]))
+            ->header('Content-Length', (string) strlen((string) $data[$key]))
         ;
 
         return $response;

app/Api/V1/Controllers/Insight/Expense/TagController.php

@@ -160,7 +160,7 @@ class TagController extends Controller
                         'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
-                    $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
+                    $response[$key]['difference']       = bcadd((string) $response[$key]['difference'], (string) $journal['amount']);
                     $response[$key]['difference_float'] = (float) $response[$key]['difference']; // float but on purpose.
                 }
 
@@ -172,7 +172,7 @@ class TagController extends Controller
                         'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
-                    $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
+                    $response[$foreignKey]['difference']       = bcadd((string) $response[$foreignKey]['difference'], (string) $journal['foreign_amount']);
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // float but on purpose.
                 }
             }

app/Api/V1/Controllers/Insight/Income/PeriodController.php

@@ -75,7 +75,7 @@ class PeriodController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
         }
 

app/Api/V1/Controllers/Insight/Income/TagController.php

@@ -100,7 +100,7 @@ class TagController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
 
         }
@@ -154,7 +154,7 @@ class TagController extends Controller
                         'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
-                    $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
+                    $response[$key]['difference']       = bcadd((string) $response[$key]['difference'], (string) app('steam')->positive($journal['amount']));
                     $response[$key]['difference_float'] = (float) $response[$key]['difference'];
                 }
 
@@ -167,8 +167,8 @@ class TagController extends Controller
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
                     $response[$foreignKey]['difference']       = bcadd(
-                        $response[$foreignKey]['difference'],
-                        app('steam')->positive($journal['foreign_amount'])
+                        (string) $response[$foreignKey]['difference'],
+                        (string) app('steam')->positive($journal['foreign_amount'])
                     );
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
                 }

app/Api/V1/Controllers/Insight/Transfer/PeriodController.php

@@ -75,7 +75,7 @@ class PeriodController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
 
         }

app/Api/V1/Controllers/Insight/Transfer/TagController.php

@@ -99,7 +99,7 @@ class TagController extends Controller
                 'currency_id'      => (string) $currencyId,
                 'currency_code'    => $currencyCode,
             ];
-            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal[$field]));
+            $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], (string) app('steam')->positive($journal[$field]));
             $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
 
         }
@@ -153,7 +153,7 @@ class TagController extends Controller
                         'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
-                    $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
+                    $response[$key]['difference']       = bcadd((string) $response[$key]['difference'], (string) app('steam')->positive($journal['amount']));
                     $response[$key]['difference_float'] = (float) $response[$key]['difference'];
                 }
 
@@ -166,8 +166,8 @@ class TagController extends Controller
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
                     $response[$foreignKey]['difference']       = bcadd(
-                        $response[$foreignKey]['difference'],
-                        app('steam')->positive($journal['foreign_amount'])
+                        (string) $response[$foreignKey]['difference'],
+                        (string) app('steam')->positive($journal['foreign_amount'])
                     );
                     $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
                 }

app/Api/V1/Controllers/Models/CurrencyExchangeRate/DestroyController.php

@@ -39,10 +39,8 @@ class DestroyController extends Controller
 {
     use ValidatesUserGroupTrait;
 
-    protected array $acceptedRoles   = [UserRoleEnum::OWNER];
-
     public const string RESOURCE_KEY = 'exchange-rates';
-
+    protected array $acceptedRoles   = [UserRoleEnum::OWNER];
     private ExchangeRateRepositoryInterface $repository;
 
     public function __construct()

app/Api/V1/Controllers/Models/Transaction/StoreController.php

@@ -50,9 +50,8 @@ class StoreController extends Controller
 {
     use TransactionFilter;
 
-    private TransactionGroupRepositoryInterface $groupRepository;
-
     protected array $acceptedRoles = [UserRoleEnum::MANAGE_TRANSACTIONS];
+    private TransactionGroupRepositoryInterface $groupRepository;
 
     /**
      * TransactionController constructor.

app/Api/V1/Controllers/Models/TransactionCurrency/DestroyController.php

@@ -27,8 +27,8 @@ namespace FireflyIII\Api\V1\Controllers\Models\TransactionCurrency;
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\TransactionCurrency;
-use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Repositories\User\UserRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 

app/Api/V1/Controllers/Models/TransactionCurrency/ListController.php

@@ -177,9 +177,7 @@ class ListController extends Controller
 
         // filter and paginate list:
         $collection  = $unfiltered->filter(
-            static function (Bill $bill) use ($currency) {
-                return $bill->transaction_currency_id === $currency->id;
-            }
+            static fn (Bill $bill) => $bill->transaction_currency_id === $currency->id
         );
         $count       = $collection->count();
         $bills       = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

app/Api/V1/Controllers/Summary/BasicController.php

@@ -39,8 +39,11 @@ use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\OperationsRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Facades\Amount;
+use FireflyIII\Support\Http\Api\ExchangeRateConverter;
+use FireflyIII\Support\Report\Summarizer\TransactionSummarizer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
 /**
@@ -97,16 +100,15 @@ class BasicController extends Controller
         $start        = $dates['start'];
         $end          = $dates['end'];
         $code         = $request->get('currency_code');
-
         // balance information:
         $balanceData  = $this->getBalanceInformation($start, $end);
-        $billData     = $this->getBillInformation($start, $end);
+        $billData     = $this->getSubscriptionInformation($start, $end);
         $spentData    = $this->getLeftToSpendInfo($start, $end);
         $netWorthData = $this->getNetWorthInfo($end);
-        //                $balanceData  = [];
-        //                $billData     = [];
+        //                        $balanceData  = [];
+        //                        $billData     = [];
         //                $spentData    = [];
-        //                $netWorthData = [];
+        //                        $netWorthData = [];
         $total        = array_merge($balanceData, $billData, $spentData, $netWorthData);
 
         // give new keys
@@ -122,6 +124,7 @@ class BasicController extends Controller
 
     private function getBalanceInformation(Carbon $start, Carbon $end): array
     {
+        Log::debug('getBalanceInformation');
         // some config settings
         $convertToNative = Amount::convertToNative();
         $default         = Amount::getNativeCurrency();
@@ -130,47 +133,110 @@ class BasicController extends Controller
         $expenses        = [];
         $sums            = [];
         $return          = [];
+        $currencies      = [
+            $default->id => $default,
+        ];
 
         // collect income of user using the new group collector.
         /** @var GroupCollectorInterface $collector */
         $collector       = app(GroupCollectorInterface::class);
-        $collector->setRange($start, $end)->setPage($this->parameters->get('page'))->setTypes([TransactionTypeEnum::DEPOSIT->value]);
+        $summarizer      = new TransactionSummarizer();
+        $set             = $collector->setRange($start, $end)->setTypes([TransactionTypeEnum::DEPOSIT->value])->getExtractedJournals();
+        $incomes         = $summarizer->groupByCurrencyId($set, 'positive', false);
 
-        $set             = $collector->getExtractedJournals();
-
-        /** @var array $journal */
-        foreach ($set as $journal) {
-            $currencyId           = $convertToNative ? $default->id : (int) $journal['currency_id'];
-            $amount               = Amount::getAmountFromJournal($journal);
-            $incomes[$currencyId] ??= '0';
-            $incomes[$currencyId] = bcadd(
-                $incomes[$currencyId],
-                bcmul($amount, '-1')
-            );
-            $sums[$currencyId]    ??= '0';
-            $sums[$currencyId]    = bcadd($sums[$currencyId], bcmul($amount, '-1'));
-        }
 
+        // collect expenses of user.
         // collect expenses of user using the new group collector.
         /** @var GroupCollectorInterface $collector */
         $collector       = app(GroupCollectorInterface::class);
-        $collector->setRange($start, $end)->setPage($this->parameters->get('page'))->setTypes([TransactionTypeEnum::WITHDRAWAL->value]);
-        $set             = $collector->getExtractedJournals();
+        $set             = $collector->setRange($start, $end)->setPage($this->parameters->get('page'))->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->getExtractedJournals();
+        $expenses        = $summarizer->groupByCurrencyId($set, 'negative', false);
 
-        /** @var array $journal */
-        foreach ($set as $journal) {
-            $currencyId            = $convertToNative ? $default->id : (int) $journal['currency_id'];
-            $amount                = Amount::getAmountFromJournal($journal);
-            $expenses[$currencyId] ??= '0';
-            $expenses[$currencyId] = bcadd($expenses[$currencyId], $amount);
-            $sums[$currencyId]     ??= '0';
-            $sums[$currencyId]     = bcadd($sums[$currencyId], $amount);
+        // if convert to native, do so right now.
+        if ($convertToNative) {
+            $newExpenses = [
+                $default->id => [
+                    'currency_id'             => $default->id,
+                    'currency_code'           => $default->code,
+                    'currency_symbol'         => $default->symbol,
+                    'currency_decimal_places' => $default->decimal_places,
+                    'sum'                     => '0',
+                ],
+            ];
+            $newIncomes  = [
+                $default->id => [
+                    'currency_id'             => $default->id,
+                    'currency_code'           => $default->code,
+                    'currency_symbol'         => $default->symbol,
+                    'currency_decimal_places' => $default->decimal_places,
+                    'sum'                     => '0',
+                ],
+            ];
+            $sums        = [
+                $default->id => [
+                    'currency_id'             => $default->id,
+                    'currency_code'           => $default->code,
+                    'currency_symbol'         => $default->symbol,
+                    'currency_decimal_places' => $default->decimal_places,
+                    'sum'                     => '0',
+                ],
+            ];
+
+            $converter   = new ExchangeRateConverter();
+            // loop over income and expenses
+            foreach ([$expenses, $incomes] as $index => $array) {
+
+                // loop over either one.
+                foreach ($array as $entry) {
+
+                    // if it is the native currency already.
+                    if ($entry['currency_id'] === $default->id) {
+                        $sums[$default->id]['sum'] = bcadd((string) $entry['sum'], $sums[$default->id]['sum']);
+
+                        // don't forget to add it to newExpenses and newIncome
+                        if (0 === $index) {
+                            $newExpenses[$default->id]['sum'] = bcadd($newExpenses[$default->id]['sum'], (string) $entry['sum']);
+                        }
+                        if (1 === $index) {
+                            $newIncomes[$default->id]['sum'] = bcadd($newIncomes[$default->id]['sum'], (string) $entry['sum']);
+                        }
+
+                        continue;
+                    }
+
+                    $currencies[$entry['currency_id']] ??= $this->currencyRepos->find($entry['currency_id']);
+                    $convertedSum              = $converter->convert($currencies[$entry['currency_id']], $default, $start, $entry['sum']);
+                    $sums[$default->id]['sum'] = bcadd($sums[$default->id]['sum'], $convertedSum);
+                    if (0 === $index) {
+                        $newExpenses[$default->id]['sum'] = bcadd($newExpenses[$default->id]['sum'], $convertedSum);
+                    }
+                    if (1 === $index) {
+                        $newIncomes[$default->id]['sum'] = bcadd($newIncomes[$default->id]['sum'], $convertedSum);
+                    }
+                }
+            }
+            $incomes     = $newIncomes;
+            $expenses    = $newExpenses;
+        }
+        if (!$convertToNative) {
+            foreach ([$expenses, $incomes] as $array) {
+                foreach ($array as $entry) {
+                    $currencyId               = $entry['currency_id'];
+                    $sums[$currencyId] ??= [
+                        'currency_id'             => $entry['currency_id'],
+                        'currency_code'           => $entry['currency_code'],
+                        'currency_symbol'         => $entry['currency_symbol'],
+                        'currency_decimal_places' => $entry['currency_decimal_places'],
+                        'sum'                     => '0',
+                    ];
+                    $sums[$currencyId]['sum'] = bcadd($sums[$currencyId]['sum'], (string) $entry['sum']);
+                }
+            }
         }
-
         // format amounts:
         $keys            = array_keys($sums);
         foreach ($keys as $currencyId) {
-            $currency = $this->currencyRepos->find($currencyId);
+            $currency = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
             if (null === $currency) {
                 continue;
             }
@@ -178,37 +244,37 @@ class BasicController extends Controller
             $return[] = [
                 'key'                     => sprintf('balance-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_balance_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => $sums[$currencyId] ?? '0',
+                'monetary_value'          => $sums[$currencyId]['sum'] ?? '0',
                 'currency_id'             => (string) $currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
-                'value_parsed'            => app('amount')->formatAnything($currency, $sums[$currencyId] ?? '0', false),
+                'value_parsed'            => app('amount')->formatAnything($currency, $sums[$currencyId]['sum'] ?? '0', false),
                 'local_icon'              => 'balance-scale',
-                'sub_title'               => app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false)
-                                             .' + '.app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false),
+                'sub_title'               => app('amount')->formatAnything($currency, $expenses[$currencyId]['sum'] ?? '0', false)
+                                             .' + '.app('amount')->formatAnything($currency, $incomes[$currencyId]['sum'] ?? '0', false),
             ];
             $return[] = [
                 'key'                     => sprintf('spent-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_spent_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => $expenses[$currencyId] ?? '0',
+                'monetary_value'          => $expenses[$currencyId]['sum'] ?? '0',
                 'currency_id'             => (string) $currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
-                'value_parsed'            => app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false),
+                'value_parsed'            => app('amount')->formatAnything($currency, $expenses[$currencyId]['sum'] ?? '0', false),
                 'local_icon'              => 'balance-scale',
                 'sub_title'               => '',
             ];
             $return[] = [
                 'key'                     => sprintf('earned-in-%s', $currency->code),
                 'title'                   => trans('firefly.box_earned_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => $incomes[$currencyId] ?? '0',
+                'monetary_value'          => $incomes[$currencyId]['sum'] ?? '0',
                 'currency_id'             => (string) $currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
-                'value_parsed'            => app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false),
+                'value_parsed'            => app('amount')->formatAnything($currency, $incomes[$currencyId]['sum'] ?? '0', false),
                 'local_icon'              => 'balance-scale',
                 'sub_title'               => '',
             ];
@@ -227,7 +293,7 @@ class BasicController extends Controller
                 'value_parsed'            => app('amount')->formatAnything($currency, '0', false),
                 'local_icon'              => 'balance-scale',
                 'sub_title'               => app('amount')->formatAnything($currency, '0', false)
-                    .' + '.app('amount')->formatAnything($currency, '0', false),
+                                             .' + '.app('amount')->formatAnything($currency, '0', false),
             ];
             $return[] = [
                 'key'                     => sprintf('spent-in-%s', $currency->code),
@@ -258,15 +324,72 @@ class BasicController extends Controller
         return $return;
     }
 
-    private function getBillInformation(Carbon $start, Carbon $end): array
+    private function getSubscriptionInformation(Carbon $start, Carbon $end): array
     {
-        app('log')->debug(sprintf('Now in getBillInformation("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d-')));
+        Log::debug(sprintf('Now in getBillInformation("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d-')));
         /*
          * Since both this method and the chart use the exact same data, we can suffice
          * with calling the one method in the bill repository that will get this amount.
          */
         $paidAmount   = $this->billRepository->sumPaidInRange($start, $end);
         $unpaidAmount = $this->billRepository->sumUnpaidInRange($start, $end);
+        $currencies   = [
+            $this->nativeCurrency->id => $this->nativeCurrency,
+        ];
+
+        if ($this->convertToNative) {
+            $converter       = new ExchangeRateConverter();
+            $newPaidAmount   = [[
+                'id'             => $this->nativeCurrency->id,
+                'name'           => $this->nativeCurrency->name,
+                'symbol'         => $this->nativeCurrency->symbol,
+                'code'           => $this->nativeCurrency->code,
+                'decimal_places' => $this->nativeCurrency->decimal_places,
+                'sum'            => '0',
+            ]];
+
+            $newUnpaidAmount = [[
+                'id'             => $this->nativeCurrency->id,
+                'name'           => $this->nativeCurrency->name,
+                'symbol'         => $this->nativeCurrency->symbol,
+                'code'           => $this->nativeCurrency->code,
+                'decimal_places' => $this->nativeCurrency->decimal_places,
+                'sum'            => '0',
+            ]];
+            foreach ([$paidAmount, $unpaidAmount] as $index => $array) {
+                foreach ($array as $item) {
+                    $currencyId                = (int) $item['id'];
+                    if (0 === $index) {
+                        // paid amount
+                        if ($currencyId === $this->nativeCurrency->id) {
+                            $newPaidAmount[0]['sum'] = bcadd($newPaidAmount[0]['sum'], (string) $item['sum']);
+
+                            continue;
+                        }
+                        $currencies[$currencyId] ??= $this->currencyRepos->find($currencyId);
+                        $convertedAmount         = $converter->convert($currencies[$currencyId], $this->nativeCurrency, $start, $item['sum']);
+                        $newPaidAmount[0]['sum'] = bcadd($newPaidAmount[0]['sum'], $convertedAmount);
+
+                        continue;
+                    }
+                    // unpaid amount
+                    if ($currencyId === $this->nativeCurrency->id) {
+                        $newUnpaidAmount[0]['sum'] = bcadd($newUnpaidAmount[0]['sum'], (string) $item['sum']);
+
+                        continue;
+                    }
+                    $currencies[$currencyId] ??= $this->currencyRepos->find($currencyId);
+                    $convertedAmount           = $converter->convert($currencies[$currencyId], $this->nativeCurrency, $start, $item['sum']);
+                    $newUnpaidAmount[0]['sum'] = bcadd($newUnpaidAmount[0]['sum'], $convertedAmount);
+                }
+            }
+            $paidAmount      = $newPaidAmount;
+            $unpaidAmount    = $newUnpaidAmount;
+        }
+
+        //        var_dump($paidAmount);
+        //        var_dump($unpaidAmount);
+        //        exit;
 
         $return       = [];
 
@@ -274,7 +397,7 @@ class BasicController extends Controller
          * @var array $info
          */
         foreach ($paidAmount as $info) {
-            $amount   = bcmul($info['sum'], '-1');
+            $amount   = bcmul((string) $info['sum'], '-1');
             $return[] = [
                 'key'                     => sprintf('bills-paid-in-%s', $info['code']),
                 'title'                   => trans('firefly.box_bill_paid_in_currency', ['currency' => $info['symbol']]),
@@ -293,7 +416,7 @@ class BasicController extends Controller
          * @var array $info
          */
         foreach ($unpaidAmount as $info) {
-            $amount   = bcmul($info['sum'], '-1');
+            $amount   = bcmul((string) $info['sum'], '-1');
             $return[] = [
                 'key'                     => sprintf('bills-unpaid-in-%s', $info['code']),
                 'title'                   => trans('firefly.box_bill_unpaid_in_currency', ['currency' => $info['symbol']]),
@@ -307,7 +430,7 @@ class BasicController extends Controller
                 'sub_title'               => '',
             ];
         }
-        app('log')->debug(sprintf('Done with getBillInformation("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d-')));
+        Log::debug(sprintf('Done with getBillInformation("%s", "%s")', $start->format('Y-m-d'), $end->format('Y-m-d-')));
 
         if (0 === count($return)) {
             $currency = $this->nativeCurrency;
@@ -348,30 +471,60 @@ 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')));
+        $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;
+        $currencies = [];
+
+        // first, create an entry for each entry in the "available" array.
+        /** @var array $availableBudget */
+        foreach ($available as $currencyId => $availableBudget) {
+            $currencies[$currencyId] ??= $this->currencyRepos->find($currencyId);
+            $return[$currencyId] = [
+                'key'                     => sprintf('left-to-spend-in-%s', $currencies[$currencyId]->code),
+                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currencies[$currencyId]->symbol]),
+                'no_available_budgets'    => false,
+                'monetary_value'          => $availableBudget,
+                'currency_id'             => (string) $currencies[$currencyId]->id,
+                'currency_code'           => $currencies[$currencyId]->code,
+                'currency_symbol'         => $currencies[$currencyId]->symbol,
+                'currency_decimal_places' => $currencies[$currencyId]->decimal_places,
+                'value_parsed'            => app('amount')->formatFlat($currencies[$currencyId]->symbol, $currencies[$currencyId]->decimal_places, $availableBudget, false),
+                'local_icon'              => 'money',
+                'sub_title'               => app('amount')->formatFlat(
+                    $currencies[$currencyId]->symbol,
+                    $currencies[$currencyId]->decimal_places,
+                    $availableBudget,
+                    false
+                ),
+            ];
+        }
         foreach ($spent as $row) {
             // either an amount was budgeted or 0 is available.
-            $currencyId      = $row['currency_id'];
-            $amount          = (string) ($available[$currencyId] ?? '0');
-            $spentInCurrency = $row['sum'];
-            $leftToSpend     = bcadd($amount, $spentInCurrency);
-            $perDay          = '0';
+            $currencyId          = (int) $row['currency_id'];
+            $amount              = (string) ($available[$currencyId] ?? '0');
+            if (0 === bccomp($amount, '0')) {
+                // #9858 skip over currencies with no available budget.
+                continue;
+            }
+            $spentInCurrency     = $row['sum'];
+            $leftToSpend         = bcadd($amount, (string) $spentInCurrency);
+            $perDay              = '0';
             if (0 !== $days && bccomp($leftToSpend, '0') > -1) {
                 $perDay = bcdiv($leftToSpend, (string) $days);
             }
 
             Log::debug(sprintf('Spent %s %s', $row['currency_code'], $row['sum']));
 
-            $return[]        = [
+            $return[$currencyId] = [
                 'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
                 'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $row['currency_symbol']]),
+                'no_available_budgets'    => false,
                 'monetary_value'          => $leftToSpend,
                 'currency_id'             => (string) $row['currency_id'],
                 'currency_code'           => $row['currency_code'],
@@ -387,28 +540,66 @@ class BasicController extends Controller
                 ),
             ];
         }
+        unset($leftToSpend);
         if (0 === count($return)) {
-            $currency = $this->nativeCurrency;
-            $return[] = [
-                'key'                     => sprintf('left-to-spend-in-%s', $currency->code),
-                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currency->symbol]),
-                'monetary_value'          => '0',
-                'currency_id'             => (string) $currency->id,
-                'currency_code'           => $currency->code,
-                'currency_symbol'         => $currency->symbol,
-                'currency_decimal_places' => $currency->decimal_places,
-                'value_parsed'            => app('amount')->formatFlat($currency->symbol, $currency->decimal_places, '0', false),
-                'local_icon'              => 'money',
-                'sub_title'               => app('amount')->formatFlat(
-                    $currency->symbol,
-                    $currency->decimal_places,
-                    '0',
-                    false
-                ),
-            ];
+            // a small trick to get every expense in this period, regardless of budget.
+            $spent = $this->opsRepository->sumExpenses($start, $end, null, new Collection());
+            foreach ($spent as $row) {
+                // either an amount was budgeted or 0 is available.
+                $currencyId          = (int) $row['currency_id'];
+                $spentInCurrency     = $row['sum'];
+                $perDay              = '0';
+                if (0 !== $days && -1 === bccomp((string) $spentInCurrency, '0')) {
+                    $perDay = bcdiv((string) $spentInCurrency, (string) $days);
+                }
+
+                Log::debug(sprintf('Spent %s %s', $row['currency_code'], $row['sum']));
+
+                $return[$currencyId] = [
+                    'key'                     => sprintf('left-to-spend-in-%s', $row['currency_code']),
+                    'title'                   => trans('firefly.spent'),
+                    'no_available_budgets'    => true,
+                    'monetary_value'          => $spentInCurrency,
+                    'currency_id'             => (string) $row['currency_id'],
+                    'currency_code'           => $row['currency_code'],
+                    'currency_symbol'         => $row['currency_symbol'],
+                    'currency_decimal_places' => $row['currency_decimal_places'],
+                    'value_parsed'            => app('amount')->formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $spentInCurrency, false),
+                    'local_icon'              => 'money',
+                    'sub_title'               => app('amount')->formatFlat(
+                        $row['currency_symbol'],
+                        $row['currency_decimal_places'],
+                        $perDay,
+                        false
+                    ),
+                ];
+            }
+
+            //            $amount = '0';
+            //            // $days
+            //            // fill in by money spent, just count it.
+            //            $currency              = $this->nativeCurrency;
+            //            $return[$currency->id] = [
+            //                'key'                     => sprintf('left-to-spend-in-%s', $currency->code),
+            //                'title'                   => trans('firefly.box_left_to_spend_in_currency', ['currency' => $currency->symbol]),
+            //                'monetary_value'          => '0',
+            //                'no_available_budgets'    => true,
+            //                'currency_id'             => (string) $currency->id,
+            //                'currency_code'           => $currency->code,
+            //                'currency_symbol'         => $currency->symbol,
+            //                'currency_decimal_places' => $currency->decimal_places,
+            //                'value_parsed'            => app('amount')->formatFlat($currency->symbol, $currency->decimal_places, '0', false),
+            //                'local_icon'              => 'money',
+            //                'sub_title'               => app('amount')->formatFlat(
+            //                    $currency->symbol,
+            //                    $currency->decimal_places,
+            //                    '0',
+            //                    false
+            //                ),
+            //            ];
         }
 
-        return $return;
+        return array_values($return);
     }
 
     private function getNetWorthInfo(Carbon $end): array
@@ -440,7 +631,7 @@ class BasicController extends Controller
                 continue;
             }
             $amount   = $data['balance'];
-            if (0 === bccomp($amount, '0')) {
+            if (0 === bccomp((string) $amount, '0')) {
                 continue;
             }
             // return stuff

app/Api/V1/Requests/Chart/ChartRequest.php

@@ -0,0 +1,91 @@
+<?php
+
+/*
+ * DashboardChartRequest.php
+ * Copyright (c) 2023 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\Chart;
+
+use FireflyIII\Enums\UserRoleEnum;
+use FireflyIII\Support\Http\Api\ValidatesUserGroupTrait;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\Validator;
+
+/**
+ * Class ChartRequest
+ */
+class ChartRequest extends FormRequest
+{
+    use ChecksLogin;
+    use ConvertsDataTypes;
+    use ValidatesUserGroupTrait;
+
+    protected array $acceptedRoles = [UserRoleEnum::READ_ONLY];
+
+    public function getParameters(): array
+    {
+        return [
+            'start'       => $this->convertDateTime('start')?->startOfDay(),
+            'end'         => $this->convertDateTime('end')?->endOfDay(),
+            'preselected' => $this->convertString('preselected', 'empty'),
+            'period'      => $this->convertString('period', '1M'),
+            'accounts'    => $this->arrayFromValue($this->get('accounts')),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     */
+    public function rules(): array
+    {
+        return [
+            'start'       => 'required|date|after:1900-01-01|before:2099-12-31|before_or_equal:end',
+            'end'         => 'required|date|after:1900-01-01|before:2099-12-31|after_or_equal:start',
+            'preselected' => sprintf('nullable|in:%s', implode(',', config('firefly.preselected_accounts'))),
+            'period'      => sprintf('nullable|in:%s', implode(',', config('firefly.valid_view_ranges'))),
+            'accounts.*'  => 'exists:accounts,id',
+        ];
+
+    }
+
+    public function withValidator(Validator $validator): void
+    {
+        $validator->after(
+            static function (Validator $validator): void {
+                // validate transaction query data.
+                $data = $validator->getData();
+                if (!array_key_exists('accounts', $data)) {
+                    // $validator->errors()->add('accounts', trans('validation.filled', ['attribute' => 'accounts']));
+                    return;
+                }
+                if (!is_array($data['accounts'])) {
+                    $validator->errors()->add('accounts', trans('validation.filled', ['attribute' => 'accounts']));
+                }
+            }
+        );
+        if ($validator->fails()) {
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
+        }
+    }
+}

app/Api/V1/Requests/Data/Bulk/MoveTransactionsRequest.php

@@ -74,7 +74,7 @@ class MoveTransactionsRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

app/Api/V1/Requests/Data/Bulk/TransactionRequest.php

@@ -33,6 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Validator;
 
+use function Safe\json_decode;
+
 /**
  * Class TransactionRequest
  */
@@ -74,7 +76,7 @@ class TransactionRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Generic/DateRequest.php

@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * DateRequest.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\Generic;
+
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Request class for end points that require date parameters.
+ *
+ * Class DateRequest
+ */
+class DateRequest extends FormRequest
+{
+    use ChecksLogin;
+    use ConvertsDataTypes;
+
+    /**
+     * Get all data from the request.
+     */
+    public function getAll(): array
+    {
+        return [
+            'start' => $this->getCarbonDate('start')->startOfDay(),
+            'end'   => $this->getCarbonDate('end')->endOfDay(),
+        ];
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     */
+    public function rules(): array
+    {
+        return [
+            'start' => 'required|date|after:1900-01-01|before:2099-12-31',
+            'end'   => 'required|date|after_or_equal:start|before:2099-12-31|after:1900-01-01',
+        ];
+    }
+}

app/Api/V1/Requests/Generic/SingleDateRequest.php

@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * DateRequest.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\Generic;
+
+use Carbon\Carbon;
+use FireflyIII\Support\Request\ChecksLogin;
+use FireflyIII\Support\Request\ConvertsDataTypes;
+use Illuminate\Foundation\Http\FormRequest;
+
+/**
+ * Request class for end points that require a date parameter.
+ *
+ * Class SingleDateRequest
+ */
+class SingleDateRequest extends FormRequest
+{
+    use ChecksLogin;
+    use ConvertsDataTypes;
+
+    /**
+     * Get all data from the request.
+     */
+    public function getDate(): Carbon
+    {
+        return $this->getCarbonDate('date');
+    }
+
+    /**
+     * The rules that the incoming request must be matched against.
+     */
+    public function rules(): array
+    {
+        return [
+            'date' => 'required|date|after:1900-01-01|before:2099-12-31',
+        ];
+    }
+}

app/Api/V1/Requests/Models/Account/UpdateRequest.php

@@ -144,7 +144,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/Attachment/StoreRequest.php

@@ -58,9 +58,7 @@ class StoreRequest extends FormRequest
     {
         $models = config('firefly.valid_attachment_models');
         $models = array_map(
-            static function (string $className) {
-                return str_replace('FireflyIII\Models\\', '', $className);
-            },
+            static fn (string $className) => str_replace('FireflyIII\Models\\', '', $className),
             $models
         );
         $models = implode(',', $models);

app/Api/V1/Requests/Models/Attachment/UpdateRequest.php

@@ -60,9 +60,7 @@ class UpdateRequest extends FormRequest
     {
         $models = config('firefly.valid_attachment_models');
         $models = array_map(
-            static function (string $className) {
-                return str_replace('FireflyIII\Models\\', '', $className);
-            },
+            static fn (string $className) => str_replace('FireflyIII\Models\\', '', $className),
             $models
         );
         $models = implode(',', $models);

app/Api/V1/Requests/Models/AvailableBudget/Request.php

@@ -90,7 +90,7 @@ class Request extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/Bill/StoreRequest.php

@@ -129,7 +129,7 @@ class StoreRequest extends FormRequest
             $failed = false;
         }
         if ($failed) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/Bill/UpdateRequest.php

@@ -110,7 +110,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/Budget/StoreRequest.php

@@ -94,7 +94,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/Budget/UpdateRequest.php

@@ -106,7 +106,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/BudgetLimit/UpdateRequest.php

@@ -96,7 +96,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/CurrencyExchangeRate/DestroyRequest.php

@@ -45,7 +45,7 @@ class DestroyRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date'  => 'required|date|after:1900-01-01|before:2099-12-31',
+            'date' => 'required|date|after:1900-01-01|before:2099-12-31',
         ];
     }
 }

app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreRequest.php

@@ -40,16 +40,16 @@ class StoreRequest extends FormRequest
         return $this->getCarbonDate('date');
     }
 
-    public function getRate(): string
-    {
-        return (string) $this->get('rate');
-    }
-
     public function getFromCurrency(): TransactionCurrency
     {
         return TransactionCurrency::where('code', $this->get('from'))->first();
     }
 
+    public function getRate(): string
+    {
+        return (string) $this->get('rate');
+    }
+
     public function getToCurrency(): TransactionCurrency
     {
         return TransactionCurrency::where('code', $this->get('to'))->first();

app/Api/V1/Requests/Models/CurrencyExchangeRate/UpdateRequest.php

@@ -50,8 +50,8 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'date'  => 'date|after:1900-01-01|before:2099-12-31',
-            'rate'  => 'required|numeric|gt:0',
+            'date' => 'date|after:1900-01-01|before:2099-12-31',
+            'rate' => 'required|numeric|gt:0',
         ];
     }
 }

app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php

@@ -126,7 +126,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

app/Api/V1/Requests/Models/Recurrence/StoreRequest.php

@@ -193,7 +193,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php

@@ -208,7 +208,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/Rule/StoreRequest.php

@@ -148,7 +148,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

app/Api/V1/Requests/Models/Rule/UpdateRequest.php

@@ -168,7 +168,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

app/Api/V1/Requests/Models/Transaction/StoreRequest.php

@@ -83,87 +83,87 @@ class StoreRequest extends FormRequest
         foreach ($this->get('transactions') as $transaction) {
             $object   = new NullArrayObject($transaction);
             $return[] = [
-                'type'                    => $this->clearString($object['type']),
-                'date'                    => $this->dateFromValue($object['date']),
-                'order'                   => $this->integerFromValue((string) $object['order']),
+                'type'                  => $this->clearString($object['type']),
+                'date'                  => $this->dateFromValue($object['date']),
+                'order'                 => $this->integerFromValue((string) $object['order']),
 
-                'currency_id'             => $this->integerFromValue((string) $object['currency_id']),
-                'currency_code'           => $this->clearString((string) $object['currency_code']),
+                'currency_id'           => $this->integerFromValue((string) $object['currency_id']),
+                'currency_code'         => $this->clearString((string) $object['currency_code']),
 
                 // location
-                'latitude'                => $this->floatFromValue((string) $object['latitude']),
-                'longitude'               => $this->floatFromValue((string) $object['longitude']),
-                'zoom_level'              => $this->integerFromValue((string) $object['zoom_level']),
+                'latitude'              => $this->floatFromValue((string) $object['latitude']),
+                'longitude'             => $this->floatFromValue((string) $object['longitude']),
+                'zoom_level'            => $this->integerFromValue((string) $object['zoom_level']),
 
                 // foreign currency info:
-                'foreign_currency_id'     => $this->integerFromValue((string) $object['foreign_currency_id']),
-                'foreign_currency_code'   => $this->clearString((string) $object['foreign_currency_code']),
+                'foreign_currency_id'   => $this->integerFromValue((string) $object['foreign_currency_id']),
+                'foreign_currency_code' => $this->clearString((string) $object['foreign_currency_code']),
 
                 // amount and foreign amount. Cannot be 0.
-                'amount'                  => $this->clearString((string) $object['amount']),
-                'foreign_amount'          => $this->clearString((string) $object['foreign_amount']),
+                'amount'                => $this->clearString((string) $object['amount']),
+                'foreign_amount'        => $this->clearString((string) $object['foreign_amount']),
 
                 // description.
-                'description'             => $this->clearString($object['description']),
+                'description'           => $this->clearString($object['description']),
 
                 // source of transaction. If everything is null, assume cash account.
-                'source_id'               => $this->integerFromValue((string) $object['source_id']),
-                'source_name'             => $this->clearString((string) $object['source_name']),
-                'source_iban'             => $this->clearIban((string) $object['source_iban']),
-                'source_number'           => $this->clearString((string) $object['source_number']),
-                'source_bic'              => $this->clearString((string) $object['source_bic']),
+                'source_id'             => $this->integerFromValue((string) $object['source_id']),
+                'source_name'           => $this->clearString((string) $object['source_name']),
+                'source_iban'           => $this->clearIban((string) $object['source_iban']),
+                'source_number'         => $this->clearString((string) $object['source_number']),
+                'source_bic'            => $this->clearString((string) $object['source_bic']),
 
                 // destination of transaction. If everything is null, assume cash account.
-                'destination_id'          => $this->integerFromValue((string) $object['destination_id']),
-                'destination_name'        => $this->clearString((string) $object['destination_name']),
-                'destination_iban'        => $this->clearIban((string) $object['destination_iban']),
-                'destination_number'      => $this->clearString((string) $object['destination_number']),
-                'destination_bic'         => $this->clearString((string) $object['destination_bic']),
+                'destination_id'        => $this->integerFromValue((string) $object['destination_id']),
+                'destination_name'      => $this->clearString((string) $object['destination_name']),
+                'destination_iban'      => $this->clearIban((string) $object['destination_iban']),
+                'destination_number'    => $this->clearString((string) $object['destination_number']),
+                'destination_bic'       => $this->clearString((string) $object['destination_bic']),
 
                 // budget info
-                'budget_id'               => $this->integerFromValue((string) $object['budget_id']),
-                'budget_name'             => $this->clearString((string) $object['budget_name']),
+                'budget_id'             => $this->integerFromValue((string) $object['budget_id']),
+                'budget_name'           => $this->clearString((string) $object['budget_name']),
 
                 // category info
-                'category_id'             => $this->integerFromValue((string) $object['category_id']),
-                'category_name'           => $this->clearString((string) $object['category_name']),
+                'category_id'           => $this->integerFromValue((string) $object['category_id']),
+                'category_name'         => $this->clearString((string) $object['category_name']),
 
                 // journal bill reference. Optional. Will only work for withdrawals
-                'bill_id'                 => $this->integerFromValue((string) $object['bill_id']),
-                'bill_name'               => $this->clearString((string) $object['bill_name']),
+                'bill_id'               => $this->integerFromValue((string) $object['bill_id']),
+                'bill_name'             => $this->clearString((string) $object['bill_name']),
 
                 // piggy bank reference. Optional. Will only work for transfers
-                'piggy_bank_id'           => $this->integerFromValue((string) $object['piggy_bank_id']),
-                'piggy_bank_name'         => $this->clearString((string) $object['piggy_bank_name']),
+                'piggy_bank_id'         => $this->integerFromValue((string) $object['piggy_bank_id']),
+                'piggy_bank_name'       => $this->clearString((string) $object['piggy_bank_name']),
 
                 // some other interesting properties
-                'reconciled'              => $this->convertBoolean((string) $object['reconciled']),
-                'notes'                   => $this->clearStringKeepNewlines((string) $object['notes']),
-                'tags'                    => $this->arrayFromValue($object['tags']),
+                'reconciled'            => $this->convertBoolean((string) $object['reconciled']),
+                'notes'                 => $this->clearStringKeepNewlines((string) $object['notes']),
+                'tags'                  => $this->arrayFromValue($object['tags']),
 
                 // all custom fields:
-                'internal_reference'      => $this->clearString((string) $object['internal_reference']),
-                'external_id'             => $this->clearString((string) $object['external_id']),
-                'original_source'         => sprintf('ff3-v%s', config('firefly.version')),
-                'recurrence_id'           => $this->integerFromValue($object['recurrence_id']),
-                'bunq_payment_id'         => $this->clearString((string) $object['bunq_payment_id']),
-                'external_url'            => $this->clearString((string) $object['external_url']),
+                'internal_reference'    => $this->clearString((string) $object['internal_reference']),
+                'external_id'           => $this->clearString((string) $object['external_id']),
+                'original_source'       => sprintf('ff3-v%s', config('firefly.version')),
+                'recurrence_id'         => $this->integerFromValue($object['recurrence_id']),
+                'bunq_payment_id'       => $this->clearString((string) $object['bunq_payment_id']),
+                'external_url'          => $this->clearString((string) $object['external_url']),
 
-                'sepa_cc'                 => $this->clearString((string) $object['sepa_cc']),
-                'sepa_ct_op'              => $this->clearString((string) $object['sepa_ct_op']),
-                'sepa_ct_id'              => $this->clearString((string) $object['sepa_ct_id']),
-                'sepa_db'                 => $this->clearString((string) $object['sepa_db']),
-                'sepa_country'            => $this->clearString((string) $object['sepa_country']),
-                'sepa_ep'                 => $this->clearString((string) $object['sepa_ep']),
-                'sepa_ci'                 => $this->clearString((string) $object['sepa_ci']),
-                'sepa_batch_id'           => $this->clearString((string) $object['sepa_batch_id']),
+                'sepa_cc'               => $this->clearString((string) $object['sepa_cc']),
+                'sepa_ct_op'            => $this->clearString((string) $object['sepa_ct_op']),
+                'sepa_ct_id'            => $this->clearString((string) $object['sepa_ct_id']),
+                'sepa_db'               => $this->clearString((string) $object['sepa_db']),
+                'sepa_country'          => $this->clearString((string) $object['sepa_country']),
+                'sepa_ep'               => $this->clearString((string) $object['sepa_ep']),
+                'sepa_ci'               => $this->clearString((string) $object['sepa_ci']),
+                'sepa_batch_id'         => $this->clearString((string) $object['sepa_batch_id']),
                 // custom date fields. Must be Carbon objects. Presence is optional.
-                'interest_date'           => $this->dateFromValue($object['interest_date']),
-                'book_date'               => $this->dateFromValue($object['book_date']),
-                'process_date'            => $this->dateFromValue($object['process_date']),
-                'due_date'                => $this->dateFromValue($object['due_date']),
-                'payment_date'            => $this->dateFromValue($object['payment_date']),
-                'invoice_date'            => $this->dateFromValue($object['invoice_date']),
+                'interest_date'         => $this->dateFromValue($object['interest_date']),
+                'book_date'             => $this->dateFromValue($object['book_date']),
+                'process_date'          => $this->dateFromValue($object['process_date']),
+                'due_date'              => $this->dateFromValue($object['due_date']),
+                'payment_date'          => $this->dateFromValue($object['payment_date']),
+                'invoice_date'          => $this->dateFromValue($object['invoice_date']),
             ];
         }
 
@@ -300,7 +300,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/Transaction/UpdateRequest.php

@@ -359,7 +359,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V1/Requests/Models/TransactionLink/StoreRequest.php

@@ -80,7 +80,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

app/Api/V1/Requests/Models/TransactionLink/UpdateRequest.php

@@ -80,7 +80,7 @@ class UpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 

app/Api/V1/Requests/System/UserUpdateRequest.php

@@ -99,7 +99,7 @@ class UserUpdateRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V2/Controllers/Autocomplete/CategoryController.php

@@ -61,13 +61,11 @@ class CategoryController extends Controller
         $queryParameters = $request->getParameters();
         $result          = $this->repository->searchCategory($queryParameters['query'], $queryParameters['size']);
         $filtered        = $result->map(
-            static function (Category $item) {
-                return [
-                    'id'    => (string) $item->id,
-                    'title' => $item->name,
-                    'meta'  => [],
-                ];
-            }
+            static fn (Category $item) => [
+                'id'    => (string) $item->id,
+                'title' => $item->name,
+                'meta'  => [],
+            ]
         );
 
         return response()->json($filtered);

app/Api/V2/Controllers/Autocomplete/TagController.php

@@ -61,15 +61,13 @@ class TagController extends Controller
         $queryParameters = $request->getParameters();
         $result          = $this->repository->searchTag($queryParameters['query']);
         $filtered        = $result->map(
-            static function (Tag $item) {
-                return [
-                    'id'    => (string) $item->id,
-                    'title' => $item->tag,
-                    'value' => (string) $item->id,
-                    'label' => $item->tag,
-                    'meta'  => [],
-                ];
-            }
+            static fn (Tag $item) => [
+                'id'    => (string) $item->id,
+                'title' => $item->tag,
+                'value' => (string) $item->id,
+                'label' => $item->tag,
+                'meta'  => [],
+            ]
         );
 
         return response()->json($filtered);

app/Api/V2/Controllers/Chart/BudgetController.php

@@ -212,13 +212,13 @@ class BudgetController extends Controller
             foreach ($currentBudgetArray['transaction_journals'] as $journal) {
                 // convert the amount to the native currency.
                 $rate                                = $converter->getCurrencyRate($this->currencies[$currencyId], $this->currency, $journal['date']);
-                $convertedAmount                     = bcmul($journal['amount'], $rate);
+                $convertedAmount                     = bcmul((string) $journal['amount'], $rate);
                 if ($journal['foreign_currency_id'] === $this->currency->id) {
                     $convertedAmount = $journal['foreign_amount'];
                 }
 
-                $return[$currencyId]['spent']        = bcadd($return[$currencyId]['spent'], $journal['amount']);
-                $return[$currencyId]['native_spent'] = bcadd($return[$currencyId]['native_spent'], $convertedAmount);
+                $return[$currencyId]['spent']        = bcadd($return[$currencyId]['spent'], (string) $journal['amount']);
+                $return[$currencyId]['native_spent'] = bcadd($return[$currencyId]['native_spent'], (string) $convertedAmount);
             }
         }
         $converter->summarize();
@@ -275,15 +275,15 @@ class BudgetController extends Controller
         }
         $result               = $this->processExpenses($budget->id, $filtered, $limit->start_date, $end);
         if (1 === count($result)) {
-            $compare = bccomp($limit->amount, app('steam')->positive($result[$limitCurrencyId]['spent']));
+            $compare = bccomp($limit->amount, (string) app('steam')->positive($result[$limitCurrencyId]['spent']));
             if (1 === $compare) {
                 // convert this amount into the native currency:
-                $result[$limitCurrencyId]['left']        = bcadd($limit->amount, $result[$limitCurrencyId]['spent']);
-                $result[$limitCurrencyId]['native_left'] = bcadd($convertedLimitAmount, $result[$limitCurrencyId]['native_spent']);
+                $result[$limitCurrencyId]['left']        = bcadd($limit->amount, (string) $result[$limitCurrencyId]['spent']);
+                $result[$limitCurrencyId]['native_left'] = bcadd($convertedLimitAmount, (string) $result[$limitCurrencyId]['native_spent']);
             }
             if ($compare <= 0) {
-                $result[$limitCurrencyId]['overspent']        = app('steam')->positive(bcadd($limit->amount, $result[$limitCurrencyId]['spent']));
-                $result[$limitCurrencyId]['native_overspent'] = app('steam')->positive(bcadd($convertedLimitAmount, $result[$limitCurrencyId]['native_spent']));
+                $result[$limitCurrencyId]['overspent']        = app('steam')->positive(bcadd($limit->amount, (string) $result[$limitCurrencyId]['spent']));
+                $result[$limitCurrencyId]['native_overspent'] = app('steam')->positive(bcadd($convertedLimitAmount, (string) $result[$limitCurrencyId]['native_spent']));
             }
         }
         $converter->summarize();

app/Api/V2/Controllers/Chart/CategoryController.php

@@ -100,7 +100,7 @@ class CategoryController extends Controller
             $currencyId                    = (int) $journal['currency_id'];
             $currency                      = $currencies[$currencyId] ?? $this->currencyRepos->find($currencyId);
             $currencies[$currencyId]       = $currency;
-            $categoryName                  = null === $journal['category_name'] ? (string) trans('firefly.no_category') : $journal['category_name'];
+            $categoryName                  = $journal['category_name'] ?? (string) trans('firefly.no_category');
             $amount                        = app('steam')->positive($journal['amount']);
             $nativeAmount                  = $converter->convert($default, $currency, $journal['date'], $amount);
             $key                           = sprintf('%s-%s', $categoryName, $currency->code);
@@ -128,15 +128,13 @@ class CategoryController extends Controller
             ];
 
             // add monies
-            $return[$key]['amount']        = bcadd($return[$key]['amount'], $amount);
-            $return[$key]['native_amount'] = bcadd($return[$key]['native_amount'], $nativeAmount);
+            $return[$key]['amount']        = bcadd($return[$key]['amount'], (string) $amount);
+            $return[$key]['native_amount'] = bcadd($return[$key]['native_amount'], (string) $nativeAmount);
         }
         $return     = array_values($return);
 
         // order by native amount
-        usort($return, static function (array $a, array $b) {
-            return (float) $a['native_amount'] < (float) $b['native_amount'] ? 1 : -1;
-        });
+        usort($return, static fn (array $a, array $b) => (float) $a['native_amount'] < (float) $b['native_amount'] ? 1 : -1);
         $converter->summarize();
 
         return response()->json($this->clean($return));

app/Api/V2/Controllers/Controller.php

@@ -33,7 +33,6 @@ use FireflyIII\Transformers\AbstractTransformer;
 use Illuminate\Database\Eloquent\Model;
 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;
@@ -56,8 +55,8 @@ class Controller extends BaseController
 
     protected const string CONTENT_TYPE     = 'application/vnd.api+json';
     protected array        $acceptedRoles   = [UserRoleEnum::READ_ONLY];
-    protected ParameterBag $parameters;
     protected bool         $convertToNative = false;
+    protected ParameterBag $parameters;
 
     public function __construct()
     {

app/Api/V2/Controllers/Summary/BasicController.php

@@ -174,8 +174,8 @@ class BasicController extends Controller
          * @var array $info
          */
         foreach ($paidAmount as $info) {
-            $amount       = bcmul($info['sum'], '-1');
-            $nativeAmount = bcmul($info['native_sum'], '-1');
+            $amount       = bcmul((string) $info['sum'], '-1');
+            $nativeAmount = bcmul((string) $info['native_sum'], '-1');
             $return[]     = [
                 'key'                     => sprintf('bills-paid-in-%s', $info['currency_code']),
                 'value'                   => $amount,
@@ -198,8 +198,8 @@ class BasicController extends Controller
          * @var array $info
          */
         foreach ($unpaidAmount as $info) {
-            $amount       = bcmul($info['sum'], '-1');
-            $nativeAmount = bcmul($info['native_sum'], '-1');
+            $amount       = bcmul((string) $info['sum'], '-1');
+            $nativeAmount = bcmul((string) $info['native_sum'], '-1');
             $return[]     = [
                 'key'                     => sprintf('bills-unpaid-in-%s', $info['currency_code']),
                 'value'                   => $amount,
@@ -279,8 +279,8 @@ class BasicController extends Controller
                     if ((int) $journal['foreign_currency_id'] === $default->id) {
                         $amountNative = $journal['foreign_amount'];
                     }
-                    $spent                   = bcadd($spent, $amount);
-                    $spentNative             = bcadd($spentNative, $amountNative);
+                    $spent                   = bcadd($spent, (string) $amount);
+                    $spentNative             = bcadd($spentNative, (string) $amountNative);
                 }
                 app('log')->debug(sprintf('Total spent in budget "%s" is %s', $budget['name'], $spent));
             }

app/Api/V2/Request/Chart/BalanceChartRequest.php

@@ -84,7 +84,7 @@ class BalanceChartRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V2/Request/Chart/ChartRequest.php

@@ -86,7 +86,7 @@ class ChartRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V2/Request/Chart/DashboardChartRequest.php

@@ -83,7 +83,7 @@ class DashboardChartRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V2/Request/Model/Transaction/StoreRequest.php

@@ -311,7 +311,7 @@ class StoreRequest extends FormRequest
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Api/V2/Request/Model/Transaction/UpdateRequest.php

@@ -64,6 +64,7 @@ class UpdateRequest extends Request
      *
      * @throws FireflyException
      */
+    #[\Override]
     public function getAll(): array
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
@@ -247,6 +248,7 @@ class UpdateRequest extends Request
     /**
      * The rules that the incoming request must be matched against.
      */
+    #[\Override]
     public function rules(): array
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
@@ -330,6 +332,7 @@ class UpdateRequest extends Request
     /**
      * Configure the validator instance.
      */
+    #[\Override]
     public function withValidator(Validator $validator): void
     {
         app('log')->debug('Now in withValidator');
@@ -361,7 +364,7 @@ class UpdateRequest extends Request
             }
         );
         if ($validator->fails()) {
-            Log::channel('audit')->error(sprintf('Validation errors in %s', __CLASS__), $validator->errors()->toArray());
+            Log::channel('audit')->error(sprintf('Validation errors in %s', self::class), $validator->errors()->toArray());
         }
     }
 }

app/Console/Commands/Correction/CorrectsAmounts.php

@@ -75,6 +75,65 @@ class CorrectsAmounts extends Command
         return 0;
     }
 
+    private function correctTransfers(): void
+    {
+        /** @var AccountRepositoryInterface $repository */
+        $repository = app(AccountRepositoryInterface::class);
+        $type       = TransactionType::where('type', TransactionTypeEnum::TRANSFER->value)->first();
+        $journals   = TransactionJournal::where('transaction_type_id', $type->id)->get();
+
+        /** @var TransactionJournal $journal */
+        foreach ($journals as $journal) {
+            $repository->setUser($journal->user);
+            $native         = Amount::getNativeCurrencyByUserGroup($journal->userGroup);
+
+            /** @var null|Transaction $source */
+            $source         = $journal->transactions()->where('amount', '<', 0)->first();
+
+            /** @var null|Transaction $destination */
+            $destination    = $journal->transactions()->where('amount', '>', 0)->first();
+            if (null === $source || null === $destination) {
+                continue;
+            }
+            if (null === $source->foreign_currency_id || null === $destination->foreign_currency_id) {
+                continue;
+            }
+            $sourceAccount  = $source->account;
+            $destAccount    = $destination->account;
+            if (null === $sourceAccount || null === $destAccount) {
+                continue;
+            }
+            $sourceCurrency = $repository->getAccountCurrency($sourceAccount) ?? $native;
+            $destCurrency   = $repository->getAccountCurrency($destAccount) ?? $native;
+
+            if ($sourceCurrency->id === $destCurrency->id) {
+                Log::debug('Both accounts have the same currency. Removing foreign currency info.');
+                $source->foreign_currency_id      = null;
+                $source->foreign_amount           = null;
+                $source->save();
+                $destination->foreign_currency_id = null;
+                $destination->foreign_amount      = null;
+                $destination->save();
+
+                continue;
+            }
+
+            // validate source
+            if ($destCurrency->id !== $source->foreign_currency_id) {
+                Log::debug(sprintf('Journal #%d: Transaction #%d refers to "%s" but should refer to "%s".', $journal->id, $source->id, $source->foreignCurrency->code, $destCurrency->code));
+                $source->foreign_currency_id = $destCurrency->id;
+                $source->save();
+            }
+
+            // validate destination:
+            if ($sourceCurrency->id !== $destination->foreign_currency_id) {
+                Log::debug(sprintf('Journal #%d: Transaction #%d refers to "%s" but should refer to "%s".', $journal->id, $destination->id, $destination->foreignCurrency->code, $sourceCurrency->code));
+                $destination->foreign_currency_id = $sourceCurrency->id;
+                $destination->save();
+            }
+        }
+    }
+
     private function fixAutoBudgets(): void
     {
         $count = AutoBudget::where('amount', '<', 0)->update(['amount' => DB::raw('amount * -1')]);
@@ -175,7 +234,7 @@ class CorrectsAmounts extends Command
     {
         try {
             $check = bccomp((string) $item->trigger_value, '0');
-        } catch (\ValueError $e) {
+        } catch (\ValueError) {
             $this->friendlyError(sprintf('Rule #%d contained invalid %s-trigger "%s". The trigger has been removed, and the rule is disabled.', $item->rule_id, $item->trigger_type, $item->trigger_value));
             $item->rule->active = false;
             $item->rule->save();
@@ -192,63 +251,4 @@ class CorrectsAmounts extends Command
 
         return false;
     }
-
-    private function correctTransfers(): void
-    {
-        /** @var AccountRepositoryInterface $repository */
-        $repository = app(AccountRepositoryInterface::class);
-        $type       = TransactionType::where('type', TransactionTypeEnum::TRANSFER->value)->first();
-        $journals   = TransactionJournal::where('transaction_type_id', $type->id)->get();
-
-        /** @var TransactionJournal $journal */
-        foreach ($journals as $journal) {
-            $repository->setUser($journal->user);
-            $native         = Amount::getNativeCurrencyByUserGroup($journal->userGroup);
-
-            /** @var null|Transaction $source */
-            $source         = $journal->transactions()->where('amount', '<', 0)->first();
-
-            /** @var null|Transaction $destination */
-            $destination    = $journal->transactions()->where('amount', '>', 0)->first();
-            if (null === $source || null === $destination) {
-                continue;
-            }
-            if (null === $source->foreign_currency_id || null === $destination->foreign_currency_id) {
-                continue;
-            }
-            $sourceAccount  = $source->account;
-            $destAccount    = $destination->account;
-            if (null === $sourceAccount || null === $destAccount) {
-                continue;
-            }
-            $sourceCurrency = $repository->getAccountCurrency($sourceAccount) ?? $native;
-            $destCurrency   = $repository->getAccountCurrency($destAccount) ?? $native;
-
-            if ($sourceCurrency->id === $destCurrency->id) {
-                Log::debug('Both accounts have the same currency. Removing foreign currency info.');
-                $source->foreign_currency_id      = null;
-                $source->foreign_amount           = null;
-                $source->save();
-                $destination->foreign_currency_id = null;
-                $destination->foreign_amount      = null;
-                $destination->save();
-
-                continue;
-            }
-
-            // validate source
-            if ($destCurrency->id !== $source->foreign_currency_id) {
-                Log::debug(sprintf('Journal #%d: Transaction #%d refers to "%s" but should refer to "%s".', $journal->id, $source->id, $source->foreignCurrency->code, $destCurrency->code));
-                $source->foreign_currency_id = $destCurrency->id;
-                $source->save();
-            }
-
-            // validate destination:
-            if ($sourceCurrency->id !== $destination->foreign_currency_id) {
-                Log::debug(sprintf('Journal #%d: Transaction #%d refers to "%s" but should refer to "%s".', $journal->id, $destination->id, $destination->foreignCurrency->code, $sourceCurrency->code));
-                $destination->foreign_currency_id = $sourceCurrency->id;
-                $destination->save();
-            }
-        }
-    }
 }

app/Console/Commands/Correction/CorrectsCurrencies.php

@@ -115,9 +115,7 @@ class CorrectsCurrencies extends Command
         $found           = array_values(
             array_filter(
                 $found,
-                static function (int $currencyId) {
-                    return 0 !== $currencyId;
-                }
+                static fn (int $currencyId) => 0 !== $currencyId
             )
         );
 

app/Console/Commands/Correction/CorrectsLongDescriptions.php

@@ -48,8 +48,8 @@ class CorrectsLongDescriptions extends Command
 
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
-            if (strlen($journal->description) > self::MAX_LENGTH) {
-                $journal->description = substr($journal->description, 0, self::MAX_LENGTH);
+            if (strlen((string) $journal->description) > self::MAX_LENGTH) {
+                $journal->description = substr((string) $journal->description, 0, self::MAX_LENGTH);
                 $journal->save();
                 $this->friendlyWarning(sprintf('Truncated description of transaction journal #%d', $journal->id));
                 ++$count;
@@ -61,7 +61,7 @@ class CorrectsLongDescriptions extends Command
         /** @var TransactionGroup $group */
         foreach ($groups as $group) {
             if (strlen((string) $group->title) > self::MAX_LENGTH) {
-                $group->title = substr($group->title, 0, self::MAX_LENGTH);
+                $group->title = substr((string) $group->title, 0, self::MAX_LENGTH);
                 $group->save();
                 $this->friendlyWarning(sprintf('Truncated description of transaction group #%d', $group->id));
                 ++$count;

app/Console/Commands/Correction/CorrectsNativeAmounts.php

@@ -38,8 +38,8 @@ use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Models\UserGroup;
-use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Repositories\UserGroup\UserGroupRepositoryInterface;
 use FireflyIII\Support\Facades\Preferences;
 use FireflyIII\Support\Http\Api\ExchangeRateConverter;
 use Illuminate\Console\Command;
@@ -128,9 +128,7 @@ class CorrectsNativeAmounts extends Command
         $repository->setUserGroup($userGroup);
         $set        = $repository->getPiggyBanks();
         $set        = $set->filter(
-            static function (PiggyBank $piggyBank) use ($currency) {
-                return $currency->id !== $piggyBank->transaction_currency_id;
-            }
+            static fn (PiggyBank $piggyBank) => $currency->id !== $piggyBank->transaction_currency_id
         );
         foreach ($set as $piggyBank) {
             $piggyBank->encrypted = false;

app/Console/Commands/Correction/CorrectsRecurringTransactions.php

@@ -100,7 +100,7 @@ class CorrectsRecurringTransactions extends Command
         $destination = $transaction->destinationAccount;
         $type        = $recurrence->transactionType;
         $link        = config(sprintf('firefly.account_to_transaction.%s.%s', $source->accountType->type, $destination->accountType->type));
-        if (null !== $link && strtolower($type->type) !== strtolower($link)) {
+        if (null !== $link && strtolower((string) $type->type) !== strtolower($link)) {
             $this->friendlyWarning(
                 sprintf('Recurring transaction #%d should be a "%s" but is a "%s" and will be corrected.', $recurrence->id, $link, $type->type)
             );

app/Console/Commands/Correction/CorrectsTransactionTypes.php

@@ -115,9 +115,7 @@ class CorrectsTransactionTypes extends Command
     private function getSourceAccount(TransactionJournal $journal): Account
     {
         $collection  = $journal->transactions->filter(
-            static function (Transaction $transaction) {
-                return $transaction->amount < 0;
-            }
+            static fn (Transaction $transaction) => $transaction->amount < 0
         );
         if (0 === $collection->count()) {
             throw new FireflyException(sprintf('300001: Journal #%d has no source transaction.', $journal->id));
@@ -144,9 +142,7 @@ class CorrectsTransactionTypes extends Command
     private function getDestinationAccount(TransactionJournal $journal): Account
     {
         $collection  = $journal->transactions->filter(
-            static function (Transaction $transaction) {
-                return $transaction->amount > 0;
-            }
+            static fn (Transaction $transaction) => $transaction->amount > 0
         );
         if (0 === $collection->count()) {
             throw new FireflyException(sprintf('300004: Journal #%d has no destination transaction.', $journal->id));

app/Console/Commands/Correction/CorrectsUnevenAmount.php

@@ -25,9 +25,11 @@ 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\Transaction;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Support\Models\AccountBalanceCalculator;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
@@ -47,7 +49,12 @@ class CorrectsUnevenAmount extends Command
     public function handle(): int
     {
         $this->count = 0;
+        // convert transfers with foreign currency info where the amount is NOT uneven (it should be)
         $this->convertOldStyleTransfers();
+
+        // convert old-style transactions between assets and liabilities.
+        $this->convertOldStyleTransactions();
+
         $this->fixUnevenAmounts();
         $this->matchCurrencies();
         if (true === config('firefly.feature_flags.running_balance_column')) {
@@ -72,8 +79,6 @@ class CorrectsUnevenAmount extends Command
         ;
         $count        = 0;
 
-        Log::debug(sprintf('Found %d potential journal(s)', $transactions->count()));
-
         /** @var Transaction $transaction */
         foreach ($transactions as $transaction) {
             /** @var null|TransactionJournal $journal */
@@ -115,10 +120,15 @@ class CorrectsUnevenAmount extends Command
                 ++$count;
             }
         }
+        if (0 === $count) {
+            return;
+        }
+        $this->friendlyPositive(sprintf('Fixed %d transfer(s) with unbalanced amounts.', $count));
     }
 
     private function fixUnevenAmounts(): void
     {
+        Log::debug('fixUnevenAmounts()');
         $journals = DB::table('transactions')
             ->groupBy('transaction_journal_id')
             ->whereNull('deleted_at')
@@ -184,7 +194,7 @@ class CorrectsUnevenAmount extends Command
             return;
         }
 
-        $amount              = bcmul('-1', $source->amount);
+        $amount              = bcmul('-1', (string) $source->amount);
 
         // fix amount of destination:
         /** @var null|Transaction $destination */
@@ -207,8 +217,8 @@ class CorrectsUnevenAmount extends Command
         }
 
         // may still be able to salvage this journal if it is a transfer with foreign currency info
-        if ($this->isForeignCurrencyTransfer($journal)) {
-            Log::debug(sprintf('Can skip foreign currency transfer #%d.', $journal->id));
+        if ($this->isForeignCurrencyTransfer($journal) || $this->isBetweenAssetAndLiability($journal)) {
+            Log::debug(sprintf('Can skip foreign currency transfer / asset+liability transaction #%d.', $journal->id));
 
             return;
         }
@@ -249,9 +259,9 @@ class CorrectsUnevenAmount extends Command
         //        Log::debug(sprintf('[c] %s', var_export($source->transaction_currency_id === $destination->foreign_currency_id,true)));
         //        Log::debug(sprintf('[d] %s', var_export((int) $destination->transaction_currency_id ===(int)  $source->foreign_currency_id, true)));
 
-        if (0 === bccomp(app('steam')->positive($source->amount), app('steam')->positive($destination->foreign_amount))
+        if (0 === bccomp((string) app('steam')->positive($source->amount), (string) app('steam')->positive($destination->foreign_amount))
             && $source->transaction_currency_id === $destination->foreign_currency_id
-            && 0 === bccomp(app('steam')->positive($destination->amount), app('steam')->positive($source->foreign_amount))
+            && 0 === bccomp((string) app('steam')->positive($destination->amount), (string) app('steam')->positive($source->foreign_amount))
             && (int) $destination->transaction_currency_id === (int) $source->foreign_currency_id
         ) {
             return true;
@@ -271,13 +281,13 @@ class CorrectsUnevenAmount extends Command
 
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
-            if (!$this->isForeignCurrencyTransfer($journal)) {
+            if (!$this->isForeignCurrencyTransfer($journal) && !$this->isBetweenAssetAndLiability($journal)) {
                 Transaction::where('transaction_journal_id', $journal->id)->update(['transaction_currency_id' => $journal->transaction_currency_id]);
                 ++$count;
 
                 continue;
             }
-            Log::debug(sprintf('Can skip foreign currency transfer #%d.', $journal->id));
+            Log::debug(sprintf('Can skip foreign currency transfer or transaction between asset and liability #%d.', $journal->id));
         }
         if (0 === $count) {
             return;
@@ -285,4 +295,155 @@ class CorrectsUnevenAmount extends Command
 
         $this->friendlyPositive(sprintf('Fixed %d journal(s) with mismatched currencies.', $journals->count()));
     }
+
+    private function isBetweenAssetAndLiability(TransactionJournal $journal): bool
+    {
+        /** @var Transaction $sourceTransaction */
+        $sourceTransaction      = $journal->transactions()->where('amount', '<', 0)->first();
+
+        /** @var Transaction $destinationTransaction */
+        $destinationTransaction = $journal->transactions()->where('amount', '>', 0)->first();
+        if (null === $sourceTransaction || null === $destinationTransaction) {
+            Log::warning('Either transaction is false, stop.');
+
+            return false;
+        }
+        if (null === $sourceTransaction->foreign_amount || null === $destinationTransaction->foreign_amount) {
+            Log::warning('Either foreign amount is false, stop.');
+
+            return false;
+        }
+
+        $source                 = $sourceTransaction->account;
+        $destination            = $destinationTransaction->account;
+
+        if (null === $source || null === $destination) {
+            Log::warning('Either is false, stop.');
+
+            return false;
+        }
+        $sourceTypes            = [AccountTypeEnum::LOAN->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value];
+
+        // source is liability, destination is asset
+        if (in_array($source->accountType->type, $sourceTypes, true) && AccountTypeEnum::ASSET->value === $destination->accountType->type) {
+            Log::debug('Source is a liability account, destination is an asset account, return TRUE.');
+
+            return true;
+        }
+        // source is asset, destination is liability
+        if (in_array($destination->accountType->type, $sourceTypes, true) && AccountTypeEnum::ASSET->value === $source->accountType->type) {
+            Log::debug('Destination is a liability account, source is an asset account, return TRUE.');
+
+            return true;
+        }
+
+        return false;
+    }
+
+    private function convertOldStyleTransactions(): void
+    {
+
+        /** @var AccountRepositoryInterface $repository */
+        $repository   = app(AccountRepositoryInterface::class);
+        Log::debug('convertOldStyleTransactions()');
+        $count        = 0;
+        $transactions = Transaction::distinct()
+            ->leftJoin('transaction_journals', 'transaction_journals.id', 'transactions.transaction_journal_id')
+            ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id')
+            ->leftJoin('accounts', 'accounts.id', 'transactions.account_id')
+            ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
+            ->whereNot('transaction_types.type', TransactionTypeEnum::TRANSFER->value)
+            ->whereNotNull('foreign_currency_id')
+            ->whereNotNull('foreign_amount')
+            ->whereIn('account_types.type', [AccountTypeEnum::ASSET->value, AccountTypeEnum::DEBT->value, AccountTypeEnum::MORTGAGE->value, AccountTypeEnum::LOAN->value])
+            ->get(['transactions.transaction_journal_id'])
+        ;
+
+        /** @var Transaction $transaction */
+        foreach ($transactions as $transaction) {
+            /** @var null|TransactionJournal $journal */
+            $journal        = TransactionJournal::find($transaction->transaction_journal_id);
+            $repository->setUser($journal->user);
+            if (null === $journal) {
+                Log::debug('Found no journal, continue.');
+
+                continue;
+            }
+            if (!$this->isBetweenAssetAndLiability($journal)) {
+                Log::debug('Not between asset and liability, continue.');
+
+                continue;
+            }
+            $source         = $journal->transactions()->where('amount', '<', 0)->first();
+            $destination    = $journal->transactions()->where('amount', '>', 0)->first();
+            $sourceAccount  = $source->account;
+            $destAccount    = $destination->account;
+            $sourceCurrency = $repository->getAccountCurrency($sourceAccount);
+            $destCurrency   = $repository->getAccountCurrency($destAccount);
+            if (null === $source || null === $destination) {
+                Log::debug('Either transaction is NULL, continue.');
+
+                continue;
+            }
+            if (0 === bccomp($source->amount, $source->foreign_amount) && 0 === bccomp($source->foreign_amount, $source->amount)) {
+                Log::debug('Already fixed, continue.');
+
+                continue;
+            }
+            // source transaction. Switch info when does not match.
+            if ((int) $source->transaction_currency_id !== (int) $sourceCurrency->id) {
+                Log::debug(sprintf('Ready to swap data in transaction #%d.', $source->id));
+                // swap amounts.
+                $amount                          = $source->amount;
+                $currency                        = $source->transaction_currency_id;
+                $source->amount                  = $source->foreign_amount;
+                $source->transaction_currency_id = $source->foreign_currency_id;
+                $source->foreign_amount          = $amount;
+                $source->foreign_currency_id     = $currency;
+                $source->saveQuietly();
+                $source->refresh();
+                //                Log::debug(sprintf('source->amount                  = %s', $source->amount));
+                //                Log::debug(sprintf('source->transaction_currency_id = %s', $source->transaction_currency_id));
+                //                Log::debug(sprintf('source->foreign_amount          = %s', $source->foreign_amount));
+                //                Log::debug(sprintf('source->foreign_currency_id     = %s', $source->foreign_currency_id));
+                ++$count;
+            }
+            // same but for destination
+            if ((int) $destination->transaction_currency_id !== (int) $destCurrency->id) {
+                ++$count;
+                Log::debug(sprintf('Ready to swap data in transaction #%d.', $destination->id));
+                // swap amounts.
+                $amount                               = $destination->amount;
+                $currency                             = $destination->transaction_currency_id;
+                $destination->amount                  = $destination->foreign_amount;
+                $destination->transaction_currency_id = $destination->foreign_currency_id;
+                $destination->foreign_amount          = $amount;
+                $destination->foreign_currency_id     = $currency;
+                $destination->balance_dirty           = true;
+                $destination->saveQuietly();
+                $destination->refresh();
+                //                Log::debug(sprintf('destination->amount                  = %s', $destination->amount));
+                //                Log::debug(sprintf('destination->transaction_currency_id = %s', $destination->transaction_currency_id));
+                //                Log::debug(sprintf('destination->foreign_amount          = %s', $destination->foreign_amount));
+                //                Log::debug(sprintf('destination->foreign_currency_id     = %s', $destination->foreign_currency_id));
+            }
+
+
+            //            // only fix the destination transaction
+            //            $destination->foreign_currency_id     = $source->transaction_currency_id;
+            //            $destination->foreign_amount          = app('steam')->positive($source->amount);
+            //            $destination->transaction_currency_id = $source->foreign_currency_id;
+            //            $destination->amount                  = app('steam')->positive($source->foreign_amount);
+            //            $destination->balance_dirty           = true;
+            //            $source->balance_dirty                = true;
+            //            $destination->save();
+            //            $source->save();
+            //            $this->friendlyWarning(sprintf('Corrected foreign amounts of transaction #%d.', $journal->id));
+        }
+        if (0 === $count) {
+            return;
+        }
+
+        $this->friendlyPositive(sprintf('Fixed %d journal(s) with unbalanced amounts.', $count));
+    }
 }

app/Console/Commands/Export/ExportsData.php

@@ -283,7 +283,7 @@ class ExportsData extends Command
                 $this->friendlyWarning(sprintf('File "%s" exists already but will be replaced.', $file));
             }
             // continue to write to file.
-            file_put_contents($file, $content);
+            \Safe\file_put_contents($file, $content);
             $this->friendlyPositive(sprintf('Wrote %s-export to file "%s".', $key, $file));
         }
     }

app/Console/Commands/Integrity/ValidatesEnvironmentVariables.php

@@ -30,13 +30,6 @@ class ValidatesEnvironmentVariables extends Command
 {
     use ShowsFriendlyMessages;
 
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature   = 'integrity:validates-environment-variables';
-
     /**
      * The console command description.
      *
@@ -44,6 +37,13 @@ class ValidatesEnvironmentVariables extends Command
      */
     protected $description = 'Makes sure you use the correct variables.';
 
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'integrity:validates-environment-variables';
+
     /**
      * Execute the console command.
      */

app/Console/Commands/System/ForcesDecimalSize.php

@@ -130,7 +130,7 @@ class ForcesDecimalSize extends Command
         // if sqlite, add function?
         if ('sqlite' === (string) config('database.default')) {
             DB::connection()->getPdo()->sqliteCreateFunction('REGEXP', static function ($pattern, $value) {
-                mb_regex_encoding('UTF-8');
+                \Safe\mb_regex_encoding('UTF-8');
                 $pattern = trim($pattern, '"');
 
                 return (false !== mb_ereg($pattern, (string) $value)) ? 1 : 0;
@@ -234,7 +234,7 @@ class ForcesDecimalSize extends Command
         /** @var Builder $query */
         $query             = Account::leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
             ->where('account_meta.name', 'currency_id')
-            ->where('account_meta.data', json_encode((string) $currency->id))
+            ->where('account_meta.data', \Safe\json_encode((string) $currency->id))
         ;
         $query->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {
             foreach ($fields as $field) {
@@ -338,7 +338,7 @@ class ForcesDecimalSize extends Command
             ->leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')
             ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
             ->where('account_meta.name', 'currency_id')
-            ->where('account_meta.data', json_encode((string) $currency->id))
+            ->where('account_meta.data', \Safe\json_encode((string) $currency->id))
             ->where(static function (Builder $q) use ($fields, $currency, $cast, $operator, $regularExpression): void {
                 foreach ($fields as $field) {
                     $q->orWhere(
@@ -394,7 +394,7 @@ class ForcesDecimalSize extends Command
             ->leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')
             ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
             ->where('account_meta.name', 'currency_id')
-            ->where('account_meta.data', json_encode((string) $currency->id))
+            ->where('account_meta.data', \Safe\json_encode((string) $currency->id))
             ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {
                 foreach ($fields as $field) {
                     $q->orWhere(
@@ -448,7 +448,7 @@ class ForcesDecimalSize extends Command
         $query             = PiggyBank::leftJoin('accounts', 'piggy_banks.account_id', '=', 'accounts.id')
             ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
             ->where('account_meta.name', 'currency_id')
-            ->where('account_meta.data', json_encode((string) $currency->id))
+            ->where('account_meta.data', \Safe\json_encode((string) $currency->id))
             ->where(static function (Builder $q) use ($fields, $currency, $operator, $cast, $regularExpression): void {
                 foreach ($fields as $field) {
                     $q->orWhere(

app/Console/Commands/System/OutputsInstructions.php

@@ -147,10 +147,7 @@ class OutputsInstructions extends Command
      */
     private function showLine(): void
     {
-        $line = '+';
-        $line .= str_repeat('-', 78);
-        $line .= '+';
-        $this->line($line);
+        $this->line(sprintf('+%s+', str_repeat('-', 78)));
     }
 
     /**
@@ -175,6 +172,13 @@ class OutputsInstructions extends Command
         }
     }
 
+    private function donationText(): void
+    {
+        $this->boxed('Did you know you can support the development of Firefly III?');
+        $this->boxed('You can donate in many ways, like GitHub Sponsors or Patreon.');
+        $this->boxed('For more information, please visit https://bit.ly/donate-to-Firefly-III');
+    }
+
     /**
      * Render instructions.
      */
@@ -228,11 +232,4 @@ class OutputsInstructions extends Command
         $this->boxed('');
         $this->showLine();
     }
-
-    private function donationText(): void
-    {
-        $this->boxed('Did you know you can support the development of Firefly III?');
-        $this->boxed('You can donate in many ways, like GitHub Sponsors or Patreon.');
-        $this->boxed('For more information, please visit https://bit.ly/donate-to-Firefly-III');
-    }
 }

app/Console/Commands/System/RecalculatesRunningBalance.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+/*
+ * RecalculatesRunningBalance.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/.
+ */
+
+namespace FireflyIII\Console\Commands\System;
+
+use FireflyIII\Console\Commands\ShowsFriendlyMessages;
+use FireflyIII\Support\Models\AccountBalanceCalculator;
+use Illuminate\Console\Command;
+
+class RecalculatesRunningBalance extends Command
+{
+    use ShowsFriendlyMessages;
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Refreshes all running balances. May take a long time to run if forced.';
+
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature   = 'firefly-iii:refresh-running-balance {--F|force : Force the execution of this command.}';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        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->correctBalanceAmounts($this->option('force'));
+            $this->friendlyInfo('Done recalculating account balances.');
+
+            return 0;
+        }
+        $this->friendlyWarning('This command has been disabled.');
+    }
+
+    private function correctBalanceAmounts(bool $forced): void
+    {
+        AccountBalanceCalculator::recalculateAll($forced);
+    }
+}

app/Console/Commands/System/ScansAttachments.php

@@ -63,15 +63,15 @@ class ScansAttachments extends Command
                 app('log')->error(sprintf('Could not decrypt data of attachment #%d: %s', $attachment->id, $e->getMessage()));
                 $decryptedContent = $encryptedContent;
             }
-            $tempFileName     = tempnam(sys_get_temp_dir(), 'FireflyIII');
+            $tempFileName     = \Safe\tempnam(sys_get_temp_dir(), 'FireflyIII');
             if (false === $tempFileName) {
                 app('log')->error(sprintf('Could not create temporary file for attachment #%d', $attachment->id));
 
                 exit(1);
             }
-            file_put_contents($tempFileName, $decryptedContent);
-            $attachment->md5  = (string) md5_file($tempFileName);
-            $attachment->mime = (string) mime_content_type($tempFileName);
+            \Safe\file_put_contents($tempFileName, $decryptedContent);
+            $attachment->md5  = (string) \Safe\md5_file($tempFileName);
+            $attachment->mime = (string) \Safe\mime_content_type($tempFileName);
             $attachment->save();
             $this->friendlyInfo(sprintf('Fixed attachment #%d', $attachment->id));
         }

app/Console/Commands/System/VerifySecurityAlerts.php

@@ -57,7 +57,7 @@ class VerifySecurityAlerts extends Command
             return 0;
         }
         $content = $disk->get('alerts.json');
-        $json    = json_decode($content, true, 10);
+        $json    = \Safe\json_decode($content, true, 10);
 
         /** @var array $array */
         foreach ($json as $array) {

app/Console/Commands/Tools/Cron.php

@@ -150,6 +150,23 @@ class Cron extends Command
         }
     }
 
+    private function checkForUpdates(bool $force): void
+    {
+        $updateCheck = new UpdateCheckCronjob();
+        $updateCheck->setForce($force);
+        $updateCheck->fire();
+
+        if ($updateCheck->jobErrored) {
+            $this->friendlyError(sprintf('Error in "update check" cron: %s', $updateCheck->message));
+        }
+        if ($updateCheck->jobFired) {
+            $this->friendlyInfo(sprintf('"Update check" cron fired: %s', $updateCheck->message));
+        }
+        if ($updateCheck->jobSucceeded) {
+            $this->friendlyPositive(sprintf('"Update check" cron ran with success: %s', $updateCheck->message));
+        }
+    }
+
     /**
      * @throws FireflyException
      */
@@ -221,21 +238,4 @@ class Cron extends Command
             $this->friendlyPositive(sprintf('"Send bill warnings" cron ran with success: %s', $autoBudget->message));
         }
     }
-
-    private function checkForUpdates(bool $force): void
-    {
-        $updateCheck = new UpdateCheckCronjob();
-        $updateCheck->setForce($force);
-        $updateCheck->fire();
-
-        if ($updateCheck->jobErrored) {
-            $this->friendlyError(sprintf('Error in "update check" cron: %s', $updateCheck->message));
-        }
-        if ($updateCheck->jobFired) {
-            $this->friendlyInfo(sprintf('"Update check" cron fired: %s', $updateCheck->message));
-        }
-        if ($updateCheck->jobSucceeded) {
-            $this->friendlyPositive(sprintf('"Update check" cron ran with success: %s', $updateCheck->message));
-        }
-    }
 }

app/Console/Commands/Upgrade/RemovesDatabaseDecryption.php

@@ -167,7 +167,7 @@ class RemovesDatabaseDecryption extends Command
     {
         // try to json_decrypt the value.
         try {
-            $newValue = json_decode($value, true, 512, JSON_THROW_ON_ERROR) ?? $value;
+            $newValue = \Safe\json_decode($value, true, 512, JSON_THROW_ON_ERROR) ?? $value;
         } catch (\JsonException $e) {
             $message = sprintf('Could not JSON decode preference row #%d: %s. This does not have to be a problem.', $id, $e->getMessage());
             $this->friendlyError($message);

app/Console/Commands/Upgrade/UpgradesDatabase.php

@@ -24,7 +24,14 @@ declare(strict_types=1);
 
 namespace FireflyIII\Console\Commands\Upgrade;
 
-set_time_limit(0);
+use Illuminate\Support\Facades\Log;
+use Safe\Exceptions\InfoException;
+
+try {
+    \Safe\set_time_limit(0);
+} catch (InfoException) {
+    Log::warning('set_time_limit returned false. This could be an issue, unless you also run XDebug.');
+}
 
 use FireflyIII\Console\Commands\ShowsFriendlyMessages;
 use Illuminate\Console\Command;

app/Console/Commands/Upgrade/UpgradesNativeAmounts.php

@@ -32,6 +32,7 @@ use Illuminate\Support\Facades\Artisan;
 class UpgradesNativeAmounts extends Command
 {
     use ShowsFriendlyMessages;
+
     public const string CONFIG_NAME = '620_native_amounts';
 
     protected $description          = 'Runs the native amounts calculations.';
@@ -61,7 +62,7 @@ class UpgradesNativeAmounts extends Command
     {
         $configVar = app('fireflyconfig')->get(self::CONFIG_NAME, false);
         if (null !== $configVar) {
-            return (bool)$configVar->data;
+            return (bool) $configVar->data;
         }
 
         return false;

app/Console/Commands/Upgrade/UpgradesRecurrenceMetaData.php

@@ -100,7 +100,7 @@ class UpgradesRecurrenceMetaData extends Command
 
         if ('tags' === $meta->name) {
             $array = explode(',', $meta->value);
-            $value = json_encode($array, JSON_THROW_ON_ERROR);
+            $value = \Safe\json_encode($array, JSON_THROW_ON_ERROR);
         }
 
         RecurrenceTransactionMeta::create(

app/Console/Commands/Upgrade/UpgradesRuleActions.php

@@ -78,8 +78,8 @@ class UpgradesRuleActions extends Command
 
         /** @var RuleAction $action */
         foreach ($actions as $action) {
-            if (str_starts_with($action->action_value, '=')) {
-                $action->action_value = sprintf('%s%s', '\=', substr($action->action_value, 1));
+            if (str_starts_with((string) $action->action_value, '=')) {
+                $action->action_value = sprintf('%s%s', '\=', substr((string) $action->action_value, 1));
                 $action->save();
                 ++$count;
             }

app/Console/Commands/Upgrade/UpgradesToGroups.php

@@ -179,9 +179,7 @@ class UpgradesToGroups extends Command
     private function getDestinationTransactions(TransactionJournal $journal): Collection
     {
         return $journal->transactions->filter(
-            static function (Transaction $transaction) {
-                return $transaction->amount > 0;
-            }
+            static fn (Transaction $transaction) => $transaction->amount > 0
         );
     }
 
@@ -236,7 +234,7 @@ class UpgradesToGroups extends Command
         $categoryId     = $this->getTransactionCategory($transaction, $opposingTr) ?? $categoryId;
 
         return [
-            'type'                => strtolower($journal->transactionType->type),
+            'type'                => strtolower((string) $journal->transactionType->type),
             'date'                => $journal->date,
             'user'                => $journal->user,
             'user_group'          => $journal->user->userGroup,

app/Console/Commands/Upgrade/UpgradesTransferCurrencies.php

@@ -38,20 +38,20 @@ class UpgradesTransferCurrencies extends Command
 {
     use ShowsFriendlyMessages;
 
-    public const string CONFIG_NAME = '480_transfer_currencies';
-    protected $description          = 'Updates transfer currency information.';
-    protected $signature            = 'upgrade:480-transfer-currencies {--F|force : Force the execution of this command.}';
+    public const string CONFIG_NAME                      = '480_transfer_currencies';
+    protected $description                               = 'Updates transfer currency information.';
+    protected $signature                                 = 'upgrade:480-transfer-currencies {--F|force : Force the execution of this command.}';
     private array                         $accountCurrencies;
     private AccountRepositoryInterface    $accountRepos;
     private JournalCLIRepositoryInterface $cliRepos;
     private int                           $count;
 
-    private ?Account             $destinationAccount;
-    private ?TransactionCurrency $destinationCurrency;
-    private ?Transaction         $destinationTransaction;
-    private ?Account             $sourceAccount;
-    private ?TransactionCurrency $sourceCurrency;
-    private ?Transaction         $sourceTransaction;
+    private ?Account             $destinationAccount     = null;
+    private ?TransactionCurrency $destinationCurrency    = null;
+    private ?Transaction         $destinationTransaction = null;
+    private ?Account             $sourceAccount          = null;
+    private ?TransactionCurrency $sourceCurrency         = null;
+    private ?Transaction         $sourceTransaction      = null;
 
     /**
      * Execute the console command.

app/Console/Kernel.php

@@ -35,6 +35,7 @@ class Kernel extends ConsoleKernel
     /**
      * Register the commands for the application.
      */
+    #[\Override]
     protected function commands(): void
     {
         $this->load(__DIR__.'/Commands');
@@ -45,6 +46,7 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      */
+    #[\Override]
     protected function schedule(Schedule $schedule): void
     {
         $schedule->call(

app/Events/Admin/InvitationCreated.php

@@ -36,15 +36,10 @@ class InvitationCreated extends Event
 {
     use SerializesModels;
 
-    public InvitedUser $invitee;
-
     public TransactionGroup $transactionGroup;
 
     /**
      * Create a new event instance.
      */
-    public function __construct(InvitedUser $invitee)
-    {
-        $this->invitee = $invitee;
-    }
+    public function __construct(public InvitedUser $invitee) {}
 }

app/Events/DestroyedTransactionGroup.php

@@ -34,14 +34,11 @@ class DestroyedTransactionGroup extends Event
 {
     use SerializesModels;
 
-    public TransactionGroup $transactionGroup;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(TransactionGroup $transactionGroup)
+    public function __construct(public TransactionGroup $transactionGroup)
     {
         app('log')->debug(sprintf('Now in %s', __METHOD__));
-        $this->transactionGroup = $transactionGroup;
     }
 }

app/Events/DestroyedTransactionLink.php

@@ -34,13 +34,10 @@ class DestroyedTransactionLink extends Event
 {
     use SerializesModels;
 
-    private TransactionJournalLink $link; // @phpstan-ignore-line
+    // @phpstan-ignore-line
 
     /**
      * DestroyedTransactionLink constructor.
      */
-    public function __construct(TransactionJournalLink $link)
-    {
-        $this->link = $link;
-    }
+    public function __construct(private TransactionJournalLink $link) {}
 }

app/Events/DetectedNewIPAddress.php

@@ -34,13 +34,8 @@ class DetectedNewIPAddress extends Event
 {
     use SerializesModels;
 
-    public User $user;
-
     /**
      * Create a new event instance. This event is triggered when a new user registers.
      */
-    public function __construct(User $user)
-    {
-        $this->user = $user;
-    }
+    public function __construct(public User $user) {}
 }

app/Events/Model/Account/Updated.php

@@ -31,10 +31,5 @@ class Updated
 {
     use SerializesModels;
 
-    public Account $account;
-
-    public function __construct(Account $account)
-    {
-        $this->account = $account;
-    }
+    public function __construct(public Account $account) {}
 }

app/Events/Model/BudgetLimit/Created.php

@@ -35,10 +35,5 @@ class Created extends Event
 {
     use SerializesModels;
 
-    public BudgetLimit $budgetLimit;
-
-    public function __construct(BudgetLimit $budgetLimit)
-    {
-        $this->budgetLimit = $budgetLimit;
-    }
+    public function __construct(public BudgetLimit $budgetLimit) {}
 }

app/Events/Model/BudgetLimit/Deleted.php

@@ -35,10 +35,5 @@ class Deleted extends Event
 {
     use SerializesModels;
 
-    public BudgetLimit $budgetLimit;
-
-    public function __construct(BudgetLimit $budgetLimit)
-    {
-        $this->budgetLimit = $budgetLimit;
-    }
+    public function __construct(public BudgetLimit $budgetLimit) {}
 }

app/Events/Model/BudgetLimit/Updated.php

@@ -35,10 +35,5 @@ class Updated extends Event
 {
     use SerializesModels;
 
-    public BudgetLimit $budgetLimit;
-
-    public function __construct(BudgetLimit $budgetLimit)
-    {
-        $this->budgetLimit = $budgetLimit;
-    }
+    public function __construct(public BudgetLimit $budgetLimit) {}
 }

app/Events/Model/PiggyBank/ChangedAmount.php

@@ -37,20 +37,16 @@ class ChangedAmount extends Event
 {
     use SerializesModels;
 
-    public string              $amount;
-    public PiggyBank           $piggyBank;
-    public ?TransactionGroup   $transactionGroup;
-    public ?TransactionJournal $transactionJournal;
+    public string    $amount;
+    public PiggyBank $piggyBank;
 
     /**
      * Create a new event instance.
      */
-    public function __construct(PiggyBank $piggyBank, string $amount, ?TransactionJournal $transactionJournal, ?TransactionGroup $transactionGroup)
+    public function __construct(PiggyBank $piggyBank, string $amount, public ?TransactionJournal $transactionJournal, public ?TransactionGroup $transactionGroup)
     {
         app('log')->debug(sprintf('Created piggy bank event for piggy bank #%d with amount %s', $piggyBank->id, $amount));
-        $this->piggyBank          = $piggyBank;
-        $this->transactionJournal = $transactionJournal;
-        $this->transactionGroup   = $transactionGroup;
-        $this->amount             = $amount;
+        $this->piggyBank = $piggyBank;
+        $this->amount    = $amount;
     }
 }

app/Events/Model/Rule/RuleActionFailedOnArray.php

@@ -34,15 +34,8 @@ class RuleActionFailedOnArray
 {
     use SerializesModels;
 
-    public string     $error;
-    public array      $journal;
-    public RuleAction $ruleAction;
-
-    public function __construct(RuleAction $ruleAction, array $journal, string $error)
+    public function __construct(public RuleAction $ruleAction, public array $journal, public string $error)
     {
         app('log')->debug('Created new RuleActionFailedOnArray');
-        $this->ruleAction = $ruleAction;
-        $this->journal    = $journal;
-        $this->error      = $error;
     }
 }

app/Events/Model/Rule/RuleActionFailedOnObject.php

@@ -35,15 +35,8 @@ class RuleActionFailedOnObject
 {
     use SerializesModels;
 
-    public string             $error;
-    public TransactionJournal $journal;
-    public RuleAction         $ruleAction;
-
-    public function __construct(RuleAction $ruleAction, TransactionJournal $journal, string $error)
+    public function __construct(public RuleAction $ruleAction, public TransactionJournal $journal, public string $error)
     {
         app('log')->debug('Created new RuleActionFailedOnObject');
-        $this->ruleAction = $ruleAction;
-        $this->journal    = $journal;
-        $this->error      = $error;
     }
 }