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

# Conflicts:
#	composer.lock
#	config/firefly.php
#	package-lock.json

.ci/phpcs.sh

@@ -26,8 +26,7 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 cd $SCRIPT_DIR/php-cs-fixer
 composer update --quiet
 rm -f .php-cs-fixer.cache
-PHP_CS_FIXER_IGNORE_ENV=true
+PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix \
-./vendor/bin/php-cs-fixer fix \
     --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
     --format=txt \
     --allow-risky=yes

.ci/phpstan.neon

@@ -1,9 +1,10 @@
 parameters:
+  scanFiles:
+    - ../_ide_helper_models.php
   universalObjectCratesClasses:
     - Illuminate\Database\Eloquent\Model
   # TODO: slowly remove these parameters and fix the issues found.
   reportUnmatchedIgnoredErrors: false
-  checkGenericClassInNonGenericObjectType: false  # remove this rule when all other issues are solved.
   ignoreErrors:
   # TODO: slowly remove these exceptions and fix the issues found.
     - '#Dynamic call to static method#' # all the Laravel ORM things depend on this.
@@ -11,6 +12,7 @@ parameters:
     - '#with no value type specified in iterable type array#' # remove this rule when all other issues are solved.
     - '#has no value type specified in iterable type array#' # remove this rule when all other issues are solved.
     - '#is not allowed to extend#'
+    - '#does not specify its types#'
     - '#switch is forbidden to use#'
     - '#is neither abstract nor final#'
     - '#on left side of \?\?\= always exists and is not nullable#'

.env.example

@@ -176,6 +176,7 @@ MAILGUN_ENDPOINT=api.mailgun.net
 # If you use Docker or similar, you can set these variables from a file by appending them with _FILE
 MANDRILL_SECRET=
 SPARKPOST_SECRET=
+MAILERSEND_API_KEY=
 
 # Firefly III can send you the following messages.
 SEND_ERROR_MESSAGE=true
@@ -312,6 +313,12 @@ PUSHER_ID=
 DEMO_USERNAME=
 DEMO_PASSWORD=
 
+#
+# Disable or enable the running balance column data
+# Please disable this. It's a very experimental feature.
+#
+USE_RUNNING_BALANCE=false
+
 #
 # The v2 layout is very experimental. If it breaks you get to keep both parts.
 # Be wary of data loss.

.github/dependabot.yml

@@ -4,6 +4,7 @@ updates:
   # Check for updates to GitHub Actions every week
   - package-ecosystem: "github-actions"
     directory: "/"
+    labels: []
     schedule:
       interval: "weekly"
 
@@ -11,6 +12,7 @@ updates:
   - package-ecosystem: "composer"
     directory: "/" # Location of package manifests
     target-branch: develop
+    labels: []
     versioning-strategy: increase
     schedule:
       interval: "weekly"
@@ -18,6 +20,7 @@ updates:
   # yarn / JS updates
   - package-ecosystem: "npm"
     directory: "/"
+    labels: []
     target-branch: develop
     versioning-strategy: increase
     schedule:

.github/label-actions.yml

@@ -4,6 +4,7 @@
 feature:
   issues:
     # Post a comment, `{issue-author}` is an optional placeholder
+    unlabel: feature
     comment: |
       Hi there! 
 
@@ -32,6 +33,7 @@ epic:
       Thank you for your contributions.
 
 enhancement:
+  unlabel: enhancement
   issues:
     # Post a comment, `{issue-author}` is an optional placeholder
     comment: |

.github/pull_request_template.md

@@ -6,6 +6,7 @@ Thank you for submitting new code to Firefly III, or any of the related projects
 - Please do not open PRs to "discuss" possible solutions or to "get feedback" on your code. I simply don't have time for that.
 - Pull requests for the MAIN branch will be closed.
 - DO NOT include translated strings in your PR.
+- PRs (or parts thereof) that only fix issues inside code comments will not be accepted.
 
 If it feels necessary to open an issue first, please do so, before you open a PR.
 

.github/workflows/close-duplicates.yml

@@ -13,7 +13,7 @@ jobs:
   close_duplicates:
     runs-on: ubuntu-latest
     steps:
-      - uses: github/command@v1.2.0
+      - uses: github/command@v1.3.0
         id: command
         with:
           allowed_contexts: "issue"

.github/workflows/release.yml

@@ -4,9 +4,13 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Release "v1.2.3" or "develop"'
+        description: 'Release "v1.2.3" or "develop" or "branch-abc"'
         required: true
         default: 'develop'
+      phpversion:
+        description: 'PHP version'
+        required: true
+        default: '8.4'
   schedule:
     - cron: '0 3 * * MON'
 
@@ -23,6 +27,11 @@ jobs:
           if [[ "develop" == "$version" ]]; then
             git checkout --track origin/develop
             git pull
+          elif [[ "$version" == branch* ]]; then
+            PULLBRANCH=${version:7}
+            echo "The branch is '$PULLBRANCH' ($version)"
+            git checkout --track origin/$PULLBRANCH
+            git pull
           else
             git config user.name github-actions
             git config user.email 41898282+github-actions[bot]@users.noreply.github.com
@@ -36,7 +45,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: ${{ github.event.inputs.phpversion }}
           extensions: mbstring, intl, zip, bcmath
       - name: crowdin action
         uses: crowdin/github-action@v2
@@ -133,7 +142,7 @@ jobs:
           rm -rf vendor composer.lock
           composer update --no-dev --no-scripts --no-plugins -q
           sudo chown -R runner:docker resources/lang
-          .ci/phpcs.sh
+          .ci/phpcs.sh || true
       - name: Import GPG key
         uses: crazy-max/ghaction-import-gpg@v6
         with:
@@ -166,6 +175,16 @@ jobs:
             tarName=FireflyIII-develop.tar.gz
           fi
 
+          # if this is a branch build, also slightly different variable names.
+          if [[ "$version" == branch* ]]; then
+            [[ -z $(git status --untracked-files=normal --porcelain) ]] && echo "this branch is clean, no need to push..." && exit 0;
+            # branch builds overrule develop
+            releaseName=$version-$(date +'%Y%m%d')
+            originalName=$releaseName
+            zipName=FireflyIII-$version.zip
+            tarName=FireflyIII-$version.tar.gz
+          fi
+
           # in both cases, if the release or tag already exists, add ".1" until it no longer exists.
           tagFound=true
           tagCount=1
@@ -207,12 +226,13 @@ jobs:
           gpg --armor --detach-sign $zipName
           gpg --armor --detach-sign $tarName
 
-          # create a development (nightly) release:
+          # describe the development release.
           if [[ "develop" == "$version" ]]; then
             echo 'Develop release.'
-            # add text to output.txt (instructions)
             rm output.txt
-            echo "Bi-weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Weekly development release of Firefly III with the latest fixes, translations and features. Docker users can find this release under the \`develop\` tag." >> output.txt
             echo "" >> output.txt
             echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
             echo "" >> output.txt
@@ -220,15 +240,62 @@ jobs:
             echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
             echo "" >> output.txt
             echo ":warning: Please be careful with this pre-release, as it may not work as expected." >> output.txt
+          fi
+          # describe a branch release
+          if [[ "$version" == branch* ]]; then
+            echo 'Branch release.'
+            rm output.txt
+            touch output.txt
+            sudo chown -R runner:docker output.txt
+            echo "Irregular BRANCH release of Firefly III. This release contains specific features or changes. Docker users can find this release under the \`$version\` tag." >> output.txt
+            echo "" >> output.txt
+            echo "This release was created on **$(date +'%Y-%m-%d')** and may contain unexpected bugs. Data loss is rare but is not impossible. The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
+            echo "" >> output.txt
+            echo "* Please read the installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "" >> output.txt
+            echo ":warning: Please be careful with this branch pre-release, as it may not work as expected." >> output.txt
+          fi
+          # describe the main release
+          if [[ "develop" != "$version" ]] && [[ "$version" != branch* ]]; then
+            sudo chown -R runner:docker output.txt
+            echo 'Main release.'
+            echo '' >> output.txt
+            echo '### Instructions' >> output.txt
+            echo '' >> output.txt
+            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
+            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
+            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
 
+          fi
+
+          # create a development release:
+          if [[ "develop" == "$version" ]]; then
             # create the release:
-            echo "Create nightly release."
+            echo "Create develop release."
-            git tag -a $releaseName -m "Nightly development release '$version' on $(date +'%Y-%m-%d')"
+            git tag -a $releaseName -m "Development release '$version' on $(date +'%Y-%m-%d')"
+
             git push origin $releaseName
             gh release create $releaseName -p --verify-tag \
               -t "Development release for $(date +'%Y-%m-%d')" \
               -F output.txt
+          fi
 
+          # create a branch release:
+          if [[ "$version" == branch* ]]; then
+
+            # create the release:
+            echo "Create branch release."
+            git tag -a $releaseName -m "Branch release '$version' on $(date +'%Y-%m-%d')"
+
+            git push origin $releaseName
+            gh release create $releaseName -p --verify-tag \
+              -t "Branch release for $(date +'%Y-%m-%d')" \
+              -F output.txt
+          fi
+
+          # create a development (nightly) release:
+          if [[ "develop" == "$version" ]] || [[ "$version" == branch* ]]; then
             # add zip file to release.
             gh release upload $releaseName $zipName
             gh release upload $releaseName $tarName
@@ -247,16 +314,6 @@ jobs:
             gh release upload $releaseName HEAD.txt
           else
             echo 'MAIN (real) release'
-            sudo chown -R runner:docker output.txt
-            # add text to output.txt (more instructions)
-            echo '' >> output.txt
-            echo '### Instructions' >> output.txt
-            echo '' >> output.txt
-            echo "* Installation instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/installation/docker/), [Portainer](https://docs.firefly-iii.org/how-to/firefly-iii/installation/portainer/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/installation/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/installation/self-managed/)" >> output.txt
-            echo "* Or read the upgrade instructions for [Docker](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/docker/), [Kubernetes](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/kubernetes/) or [self-managed servers](https://docs.firefly-iii.org/how-to/firefly-iii/upgrade/self-managed/)" >> output.txt
-            echo "* The releases are signed, and you can verify them using the [Firefly III releases PGP key](https://docs.firefly-iii.org/explanation/more-information/signatures/)." >> output.txt
-
-            echo "Create default release."
             git tag -a $releaseName -m "Here be changelog"
             git push origin $releaseName
             gh release create $releaseName -F output.txt -t "$releaseName" --verify-tag

.github/workflows/sonarcloud.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Setup PHP with Xdebug
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.3'
+          php-version: '8.4'
           coverage: xdebug
           extensions: >-
             bcmath

.github/workflows/stale.yml

@@ -12,6 +12,7 @@ jobs:
     permissions:
       issues: write  # for actions/stale to close stale issues
       pull-requests: write  # for actions/stale to close stale PRs
+      actions: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/stale@v9
@@ -35,4 +36,5 @@ jobs:
             Thank you for your contributions.
           days-before-stale: 14
           days-before-close: 7
-          exempt-issue-labels: 'enhancement,feature,bug,announcement,epic,triage'
+          exempt-all-milestones: true
+          exempt-issue-labels: 'triage'

THANKS.md

@@ -4,6 +4,12 @@ Over time, many people have contributed to Firefly III. Their efforts are not al
 Please find below all the people who contributed to the Firefly III code. Their names are mentioned in the year of their first contribution.
 
 ## 2024
+- Antônio Franco
+- yparitcher
+- Jhon Pedroza
+- mzhubail
+- tasnim
+- withbest
 - Steve Wasiura
 - imlonghao
 - Rahman Yusuf

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AccountController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -29,6 +30,7 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
+use FireflyIII\Support\Facades\Steam;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -77,7 +79,7 @@ class AccountController extends Controller
         $query           = $data['query'];
         $date            = $data['date'] ?? today(config('app.timezone'));
         $return          = [];
-        $result          = $this->repository->searchAccount((string)$query, $types, $this->parameters->get('limit'));
+        $result          = $this->repository->searchAccount((string) $query, $types, $this->parameters->get('limit'));
 
         // TODO this code is duplicated in the V2 Autocomplete controller, which means this code is due to be deprecated.
         $defaultCurrency = app('amount')->getDefaultCurrency();
@@ -88,20 +90,20 @@ class AccountController extends Controller
             $currency        = $this->repository->getAccountCurrency($account) ?? $defaultCurrency;
 
             if (in_array($account->accountType->type, $this->balanceTypes, true)) {
-                $balance         = app('steam')->balance($account, $date);
+                $balance         = Steam::finalAccountBalance($account, $date);
                 $nameWithBalance = sprintf(
                     '%s (%s)',
                     $account->name,
-                    app('amount')->formatAnything($currency, $balance, false)
+                    app('amount')->formatAnything($currency, $balance['balance'], false)
                 );
             }
 
             $return[]        = [
-                'id'                      => (string)$account->id,
+                'id'                      => (string) $account->id,
                 'name'                    => $account->name,
                 'name_with_balance'       => $nameWithBalance,
                 'type'                    => $account->accountType->type,
-                'currency_id'             => (string)$currency->id,
+                'currency_id'             => (string) $currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
@@ -114,8 +116,8 @@ class AccountController extends Controller
             $return,
             static function (array $left, array $right) {
                 $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
-                $posA  = (int)array_search($left['type'], $order, true);
+                $posA  = (int) array_search($left['type'], $order, true);
-                $posB  = (int)array_search($right['type'], $order, true);
+                $posB  = (int) array_search($right['type'], $order, true);
 
                 return $posA - $posB;
             }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * BillController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -66,7 +67,7 @@ class BillController extends Controller
         $filtered = $result->map(
             static function (Bill $item) {
                 return [
-                    'id'     => (string)$item->id,
+                    'id'     => (string) $item->id,
                     'name'   => $item->name,
                     'active' => $item->active,
                 ];

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * BudgetController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -66,7 +67,7 @@ class BudgetController extends Controller
         $filtered = $result->map(
             static function (Budget $item) {
                 return [
-                    'id'   => (string)$item->id,
+                    'id'   => (string) $item->id,
                     'name' => $item->name,
                 ];
             }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CategoryController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -66,7 +67,7 @@ class CategoryController extends Controller
         $filtered = $result->map(
             static function (Category $item) {
                 return [
-                    'id'   => (string)$item->id,
+                    'id'   => (string) $item->id,
                     'name' => $item->name,
                 ];
             }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CurrencyController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -68,7 +69,7 @@ class CurrencyController extends Controller
         /** @var TransactionCurrency $currency */
         foreach ($collection as $currency) {
             $result[] = [
-                'id'             => (string)$currency->id,
+                'id'             => (string) $currency->id,
                 'name'           => $currency->name,
                 'code'           => $currency->code,
                 'symbol'         => $currency->symbol,
@@ -94,7 +95,7 @@ class CurrencyController extends Controller
         /** @var TransactionCurrency $currency */
         foreach ($collection as $currency) {
             $result[] = [
-                'id'             => (string)$currency->id,
+                'id'             => (string) $currency->id,
                 'name'           => sprintf('%s (%s)', $currency->name, $currency->code),
                 'code'           => $currency->code,
                 'symbol'         => $currency->symbol,

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * ObjectGroupController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -68,7 +69,7 @@ class ObjectGroupController extends Controller
         /** @var ObjectGroup $objectGroup */
         foreach ($result as $objectGroup) {
             $return[] = [
-                'id'    => (string)$objectGroup->id,
+                'id'    => (string) $objectGroup->id,
                 'name'  => $objectGroup->title,
                 'title' => $objectGroup->title,
             ];

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * PiggyBankController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -67,22 +68,21 @@ class PiggyBankController extends Controller
     {
         $data     = $request->getData();
         $piggies  = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
-        $defaultCurrency = app('amount')->getDefaultCurrency();
         $response = [];
 
         /** @var PiggyBank $piggy */
         foreach ($piggies as $piggy) {
-            $currency    = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
+            $currency    = $piggy->transactionCurrency;
             $objectGroup = $piggy->objectGroups()->first();
             $response[]  = [
-                'id'                      => (string)$piggy->id,
+                'id'                      => (string) $piggy->id,
                 'name'                    => $piggy->name,
-                'currency_id'             => (string)$currency->id,
+                'currency_id'             => (string) $currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
-                'object_group_id'         => null === $objectGroup ? null : (string)$objectGroup->id,
+                'object_group_id'         => null === $objectGroup ? null : (string) $objectGroup->id,
                 'object_group_title'      => $objectGroup?->title,
             ];
         }
@@ -98,29 +98,28 @@ class PiggyBankController extends Controller
     {
         $data     = $request->getData();
         $piggies  = $this->piggyRepository->searchPiggyBank($data['query'], $this->parameters->get('limit'));
-        $defaultCurrency = app('amount')->getDefaultCurrency();
         $response = [];
 
         /** @var PiggyBank $piggy */
         foreach ($piggies as $piggy) {
-            $currency      = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
+            $currency      = $piggy->transactionCurrency;
-            $currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
+            $currentAmount = $this->piggyRepository->getCurrentAmount($piggy);
             $objectGroup   = $piggy->objectGroups()->first();
             $response[]    = [
-                'id'                      => (string)$piggy->id,
+                'id'                      => (string) $piggy->id,
                 'name'                    => $piggy->name,
                 'name_with_balance'       => sprintf(
                     '%s (%s / %s)',
                     $piggy->name,
                     app('amount')->formatAnything($currency, $currentAmount, false),
-                    app('amount')->formatAnything($currency, $piggy->targetamount, false),
+                    app('amount')->formatAnything($currency, $piggy->target_amount, false),
                 ),
-                'currency_id'             => (string)$currency->id,
+                'currency_id'             => (string) $currency->id,
                 'currency_name'           => $currency->name,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
-                'object_group_id'         => null === $objectGroup ? null : (string)$objectGroup->id,
+                'object_group_id'         => null === $objectGroup ? null : (string) $objectGroup->id,
                 'object_group_title'      => $objectGroup?->title,
             ];
         }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * RecurrenceController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -66,7 +67,7 @@ class RecurrenceController extends Controller
         /** @var Recurrence $recurrence */
         foreach ($recurrences as $recurrence) {
             $response[] = [
-                'id'          => (string)$recurrence->id,
+                'id'          => (string) $recurrence->id,
                 'name'        => $recurrence->title,
                 'description' => $recurrence->description,
             ];

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * RuleController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -65,7 +66,7 @@ class RuleController extends Controller
         /** @var Rule $rule */
         foreach ($rules as $rule) {
             $response[] = [
-                'id'          => (string)$rule->id,
+                'id'          => (string) $rule->id,
                 'name'        => $rule->title,
                 'description' => $rule->description,
             ];

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * RuleGroupController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -65,7 +66,7 @@ class RuleGroupController extends Controller
         /** @var RuleGroup $group */
         foreach ($groups as $group) {
             $response[] = [
-                'id'          => (string)$group->id,
+                'id'          => (string) $group->id,
                 'name'        => $group->title,
                 'description' => $group->description,
             ];

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * TagController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -68,7 +69,7 @@ class TagController extends Controller
         /** @var Tag $tag */
         foreach ($result as $tag) {
             $array[] = [
-                'id'   => (string)$tag->id,
+                'id'   => (string) $tag->id,
                 'name' => $tag->tag,
                 'tag'  => $tag->tag,
             ];

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * TransactionController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -76,8 +77,8 @@ class TransactionController extends Controller
         /** @var TransactionJournal $journal */
         foreach ($filtered as $journal) {
             $array[] = [
-                'id'                   => (string)$journal->id,
+                'id'                   => (string) $journal->id,
-                'transaction_group_id' => (string)$journal->transaction_group_id,
+                'transaction_group_id' => (string) $journal->transaction_group_id,
                 'name'                 => $journal->description,
                 'description'          => $journal->description,
             ];
@@ -96,7 +97,7 @@ class TransactionController extends Controller
         $result = new Collection();
         if (is_numeric($data['query'])) {
             // search for group, not journal.
-            $firstResult = $this->groupRepository->find((int)$data['query']);
+            $firstResult = $this->groupRepository->find((int) $data['query']);
             if (null !== $firstResult) {
                 // group may contain multiple journals, each a result:
                 foreach ($firstResult->transactionJournals as $journal) {
@@ -114,8 +115,8 @@ class TransactionController extends Controller
         /** @var TransactionJournal $journal */
         foreach ($result as $journal) {
             $array[] = [
-                'id'                   => (string)$journal->id,
+                'id'                   => (string) $journal->id,
-                'transaction_group_id' => (string)$journal->transaction_group_id,
+                'transaction_group_id' => (string) $journal->transaction_group_id,
                 'name'                 => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
                 'description'          => sprintf('#%d: %s', $journal->transaction_group_id, $journal->description),
             ];

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * TransactionTypeController.php
  * Copyright (c) 2020 james@firefly-iii.org
@@ -65,7 +66,7 @@ class TransactionTypeController extends Controller
         foreach ($types as $type) {
             // different key for consistency.
             $array[] = [
-                'id'   => (string)$type->id,
+                'id'   => (string) $type->id,
                 'name' => $type->type,
                 'type' => $type->type,
             ];

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

@@ -104,7 +104,7 @@ class AccountController extends Controller
             }
             $currentSet   = [
                 'label'                   => $account->name,
-                'currency_id'             => (string)$currency->id,
+                'currency_id'             => (string) $currency->id,
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
@@ -116,13 +116,13 @@ class AccountController extends Controller
             ];
             // TODO this code is also present in the V2 chart account controller so this method is due to be deprecated.
             $currentStart = clone $start;
-            $range        = app('steam')->balanceInRange($account, $start, clone $end);
+            $range        = app('steam')->finalAccountBalanceInRange($account, $start, clone $end, $this->convertToNative);
             // 2022-10-11 this method no longer converts to float.
             $previous     = array_values($range)[0];
             while ($currentStart <= $end) {
                 $format                        = $currentStart->format('Y-m-d');
                 $label                         = $currentStart->toAtomString();
-                $balance                       = array_key_exists($format, $range) ? $range[$format] : $previous;
+                $balance                       = array_key_exists($format, $range) ? $range[$format]['balance'] : $previous;
                 $previous                      = $balance;
                 $currentStart->addDay();
                 $currentSet['entries'][$label] = $balance;

app/Api/V1/Controllers/Controller.php

@@ -55,6 +55,7 @@ abstract class Controller extends BaseController
     /** @var array<int, string> */
     protected array        $allowedSort;
     protected ParameterBag $parameters;
+    protected bool        $convertToNative = false;
 
     /**
      * Controller constructor.
@@ -68,7 +69,9 @@ abstract class Controller extends BaseController
                 $this->parameters = $this->getParameters();
                 if (auth()->check()) {
                     $language              = app('steam')->getLanguage();
+                    $this->convertToNative = app('preferences')->get('convert_to_native', false)->data;
                     app()->setLocale($language);
+
                 }
 
                 return $next($request);
@@ -82,7 +85,7 @@ abstract class Controller extends BaseController
     private function getParameters(): ParameterBag
     {
         $bag      = new ParameterBag();
-        $page     = (int)request()->get('page');
+        $page     = (int) request()->get('page');
         if ($page < 1) {
             $page = 1;
         }
@@ -107,13 +110,13 @@ abstract class Controller extends BaseController
             $obj  = null;
             if (null !== $date) {
                 try {
-                    $obj = Carbon::parse((string)$date);
+                    $obj = Carbon::parse((string) $date);
                 } catch (InvalidDateException|InvalidFormatException $e) {
                     // don't care
                     app('log')->warning(
                         sprintf(
                             'Ignored invalid date "%s" in API controller parameter check: %s',
-                            substr((string)$date, 0, 20),
+                            substr((string) $date, 0, 20),
                             $e->getMessage()
                         )
                     );
@@ -134,7 +137,7 @@ abstract class Controller extends BaseController
                 $value = null;
             }
             if (null !== $value) {
-                $bag->set($integer, (int)$value);
+                $bag->set($integer, (int) $value);
             }
             if (null === $value
                 && 'limit' === $integer // @phpstan-ignore-line
@@ -144,7 +147,7 @@ abstract class Controller extends BaseController
                 $user     = auth()->user();
 
                 /** @var Preference $pageSize */
-                $pageSize = (int)app('preferences')->getForUser($user, 'listPageSize', 50)->data;
+                $pageSize = (int) app('preferences')->getForUser($user, 'listPageSize', 50)->data;
                 $bag->set($integer, $pageSize);
             }
         }
@@ -158,7 +161,7 @@ abstract class Controller extends BaseController
         $sortParameters = [];
 
         try {
-            $param = (string)request()->query->get('sort');
+            $param = (string) request()->query->get('sort');
         } catch (BadRequestException $e) {
             app('log')->error('Request field "sort" contains a non-scalar value. Value set to NULL.');
             app('log')->error($e->getMessage());

app/Api/V1/Controllers/Data/Bulk/TransactionController.php

@@ -70,8 +70,8 @@ class TransactionController extends Controller
         // to respond to what is in the $query.
         // this is OK because only one thing can be in the query at the moment.
         if ($this->isUpdateTransactionAccount($params)) {
-            $original    = $this->repository->find((int)$params['where']['account_id']);
+            $original    = $this->repository->find((int) $params['where']['account_id']);
-            $destination = $this->repository->find((int)$params['update']['account_id']);
+            $destination = $this->repository->find((int) $params['update']['account_id']);
 
             /** @var AccountDestroyService $service */
             $service     = app(AccountDestroyService::class);

app/Api/V1/Controllers/Data/DestroyController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -25,11 +26,11 @@ namespace FireflyIII\Api\V1\Controllers\Data;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\DestroyRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionJournal;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
@@ -68,7 +69,7 @@ class DestroyController extends Controller
         $allExceptAssets = [AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::RECONCILIATION, AccountType::REVENUE];
         $all             = [AccountType::ASSET, AccountType::BENEFICIARY, AccountType::CASH, AccountType::CREDITCARD, AccountType::DEBT, AccountType::DEFAULT, AccountType::EXPENSE, AccountType::IMPORT, AccountType::INITIAL_BALANCE, AccountType::LIABILITY_CREDIT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::RECONCILIATION];
         $liabilities     = [AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD];
-        $transactions    = [TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::RECONCILIATION];
+        $transactions    = [TransactionTypeEnum::WITHDRAWAL->value, TransactionTypeEnum::DEPOSIT->value, TransactionTypeEnum::TRANSFER->value, TransactionTypeEnum::RECONCILIATION->value];
 
         match ($objects) {
             'budgets'                => $this->destroyBudgets(),
@@ -86,9 +87,9 @@ class DestroyController extends Controller
             'revenue_accounts'       => $this->destroyAccounts([AccountType::REVENUE]),
             'liabilities'            => $this->destroyAccounts($liabilities),
             'transactions'           => $this->destroyTransactions($transactions),
-            'withdrawals'            => $this->destroyTransactions([TransactionType::WITHDRAWAL]),
+            'withdrawals'            => $this->destroyTransactions([TransactionTypeEnum::WITHDRAWAL->value]),
-            'deposits'               => $this->destroyTransactions([TransactionType::DEPOSIT]),
+            'deposits'               => $this->destroyTransactions([TransactionTypeEnum::DEPOSIT->value]),
-            'transfers'              => $this->destroyTransactions([TransactionType::TRANSFER]),
+            'transfers'              => $this->destroyTransactions([TransactionTypeEnum::TRANSFER->value]),
             default                  => throw new FireflyException(sprintf('200033: This endpoint can\'t handle object "%s"', $objects)),
         };
 

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

@@ -88,7 +88,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($data[$key]))
         ;
 
         return $response;

app/Api/V1/Controllers/Data/PurgeController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * PurgeController.php
  * Copyright (c) 2022 james@firefly-iii.org
@@ -28,13 +29,13 @@ use FireflyIII\Models\Account;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\Category;
-use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\Recurrence;
 use FireflyIII\Models\Rule;
 use FireflyIII\Models\RuleGroup;
 use FireflyIII\Models\Tag;
 use FireflyIII\Models\TransactionGroup;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
@@ -62,14 +63,17 @@ class PurgeController extends Controller
         Bill::whereUserId($user->id)->onlyTrashed()->forceDelete();
 
         // piggies
-        $set  = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
+        $repository = app(PiggyBankRepositoryInterface::class);
-            ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*'])
+        $repository->setUser($user);
-        ;
+        $repository->purgeAll();
-
+        //        $set  = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
-        /** @var PiggyBank $piggy */
+        //            ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*'])
-        foreach ($set as $piggy) {
+        //        ;
-            $piggy->forceDelete();
+        //
-        }
+        //        /** @var PiggyBank $piggy */
+        //        foreach ($set as $piggy) {
+        //            $piggy->forceDelete();
+        //        }
 
         // rule group
         RuleGroup::whereUserId($user->id)->onlyTrashed()->forceDelete();

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

@@ -79,11 +79,11 @@ class AccountController extends Controller
         /** @var array $expense */
         foreach ($expenses as $expense) {
             $result[] = [
-                'id'               => (string)$expense['id'],
+                'id'               => (string) $expense['id'],
                 'name'             => $expense['name'],
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'], // intentional float
+                'difference_float' => (float) $expense['sum'], // intentional float
-                'currency_id'      => (string)$expense['currency_id'],
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }
@@ -107,11 +107,11 @@ class AccountController extends Controller
         /** @var array $expense */
         foreach ($expenses as $expense) {
             $result[] = [
-                'id'               => (string)$expense['id'],
+                'id'               => (string) $expense['id'],
                 'name'             => $expense['name'],
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'], // intentional float
+                'difference_float' => (float) $expense['sum'], // intentional float
-                'currency_id'      => (string)$expense['currency_id'],
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }

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

@@ -26,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
 use Illuminate\Http\JsonResponse;
 
@@ -76,38 +76,38 @@ class BillController extends Controller
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
         $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
         $collector->setBills($bills);
 
         $genericSet = $collector->getExtractedJournals();
         foreach ($genericSet as $journal) {
-            $billId            = (int)$journal['bill_id'];
+            $billId            = (int) $journal['bill_id'];
-            $currencyId        = (int)$journal['currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
             $key               = sprintf('%d-%d', $billId, $currencyId);
             $foreignKey        = sprintf('%d-%d', $billId, $foreignCurrencyId);
 
             if (0 !== $currencyId) {
                 $response[$key] ??= [
-                    'id'               => (string)$billId,
+                    'id'               => (string) $billId,
                     'name'             => $journal['bill_name'],
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
+                    'currency_id'      => (string) $currencyId,
                     'currency_code'    => $journal['currency_code'],
                 ];
                 $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
-                $response[$key]['difference_float'] = (float)$response[$key]['difference']; // intentional float
+                $response[$key]['difference_float'] = (float) $response[$key]['difference']; // intentional float
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignKey] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_id'      => (string) $foreignCurrencyId,
                     'currency_code'    => $journal['foreign_currency_code'],
                 ];
                 $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
-                $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
+                $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
             }
         }
 
@@ -129,34 +129,34 @@ class BillController extends Controller
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
         $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
         $collector->withoutBill();
 
         $genericSet = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
+                    'currency_id'      => (string) $currencyId,
                     'currency_code'    => $journal['currency_code'],
                 ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
+                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // intentional float
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_id'      => (string) $foreignCurrencyId,
                     'currency_code'    => $journal['foreign_currency_code'],
                 ];
                 $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
+                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // intentional float
             }
         }
 

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * BudgetController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -84,11 +85,11 @@ class BudgetController extends Controller
             /** @var array $expense */
             foreach ($expenses as $expense) {
                 $result[] = [
-                    'id'               => (string)$budget->id,
+                    'id'               => (string) $budget->id,
                     'name'             => $budget->name,
                     'difference'       => $expense['sum'],
-                    'difference_float' => (float)$expense['sum'], // intentional float
+                    'difference_float' => (float) $expense['sum'], // intentional float
-                    'currency_id'      => (string)$expense['currency_id'],
+                    'currency_id'      => (string) $expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -113,8 +114,8 @@ class BudgetController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'], // intentional float
+                'difference_float' => (float) $expense['sum'], // intentional float
-                'currency_id'      => (string)$expense['currency_id'],
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }

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

@@ -85,11 +85,11 @@ class CategoryController extends Controller
             /** @var array $expense */
             foreach ($expenses as $expense) {
                 $result[] = [
-                    'id'               => (string)$category->id,
+                    'id'               => (string) $category->id,
                     'name'             => $category->name,
                     'difference'       => $expense['sum'],
-                    'difference_float' => (float)$expense['sum'], // intentional float
+                    'difference_float' => (float) $expense['sum'], // intentional float
-                    'currency_id'      => (string)$expense['currency_id'],
+                    'currency_id'      => (string) $expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -114,8 +114,8 @@ class CategoryController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'], // intentional float
+                'difference_float' => (float) $expense['sum'], // intentional float
-                'currency_id'      => (string)$expense['currency_id'],
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * PeriodController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -25,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -47,31 +48,31 @@ class PeriodController extends Controller
 
         // collect all expenses in this period (regardless of type)
         $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
         $genericSet = $collector->getExtractedJournals();
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
+                    'currency_id'      => (string) $currencyId,
                     'currency_code'    => $journal['currency_code'],
                 ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
+                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // intentional float
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_id'      => (string) $foreignCurrencyId,
                     'currency_code'    => $journal['foreign_currency_code'],
                 ];
                 $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
+                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // intentional float
             }
         }
 

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

@@ -26,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use Illuminate\Http\JsonResponse;
 
@@ -69,34 +69,34 @@ class TagController extends Controller
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
         $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
         $collector->withoutTags();
 
         $genericSet = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
+                    'currency_id'      => (string) $currencyId,
                     'currency_code'    => $journal['currency_code'],
                 ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
+                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_id'      => (string) $foreignCurrencyId,
                     'currency_code'    => $journal['foreign_currency_code'],
                 ];
                 $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
+                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose.
             }
         }
 
@@ -124,14 +124,14 @@ class TagController extends Controller
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
         $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::WITHDRAWAL->value])->setRange($start, $end)->setSourceAccounts($accounts);
         $collector->setTags($tags);
         $genericSet = $collector->getExtractedJournals();
 
         /** @var array $journal */
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             /** @var array $tag */
             foreach ($journal['tags'] as $tag) {
@@ -142,15 +142,15 @@ class TagController extends Controller
                 // on currency ID
                 if (0 !== $currencyId) {
                     $response[$key] ??= [
-                        'id'               => (string)$tagId,
+                        'id'               => (string) $tagId,
                         'name'             => $tag['name'],
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$currencyId,
+                        'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
                     $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
-                    $response[$key]['difference_float'] = (float)$response[$key]['difference']; // float but on purpose.
+                    $response[$key]['difference_float'] = (float) $response[$key]['difference']; // float but on purpose.
                 }
 
                 // on foreign ID
@@ -158,11 +158,11 @@ class TagController extends Controller
                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
                     $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
-                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // float but on purpose.
+                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // float but on purpose.
                 }
             }
         }

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

@@ -79,11 +79,11 @@ class AccountController extends Controller
         /** @var array $entry */
         foreach ($income as $entry) {
             $result[] = [
-                'id'               => (string)$entry['id'],
+                'id'               => (string) $entry['id'],
                 'name'             => $entry['name'],
                 'difference'       => $entry['sum'],
-                'difference_float' => (float)$entry['sum'], // float but on purpose.
+                'difference_float' => (float) $entry['sum'], // float but on purpose.
-                'currency_id'      => (string)$entry['currency_id'],
+                'currency_id'      => (string) $entry['currency_id'],
                 'currency_code'    => $entry['currency_code'],
             ];
         }
@@ -107,11 +107,11 @@ class AccountController extends Controller
         /** @var array $entry */
         foreach ($income as $entry) {
             $result[] = [
-                'id'               => (string)$entry['id'],
+                'id'               => (string) $entry['id'],
                 'name'             => $entry['name'],
                 'difference'       => $entry['sum'],
-                'difference_float' => (float)$entry['sum'], // float but on purpose.
+                'difference_float' => (float) $entry['sum'], // float but on purpose.
-                'currency_id'      => (string)$entry['currency_id'],
+                'currency_id'      => (string) $entry['currency_id'],
                 'currency_code'    => $entry['currency_code'],
             ];
         }

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

@@ -85,11 +85,11 @@ class CategoryController extends Controller
             /** @var array $expense */
             foreach ($expenses as $expense) {
                 $result[] = [
-                    'id'               => (string)$category->id,
+                    'id'               => (string) $category->id,
                     'name'             => $category->name,
                     'difference'       => $expense['sum'],
-                    'difference_float' => (float)$expense['sum'], // float but on purpose.
+                    'difference_float' => (float) $expense['sum'], // float but on purpose.
-                    'currency_id'      => (string)$expense['currency_id'],
+                    'currency_id'      => (string) $expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -114,8 +114,8 @@ class CategoryController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'], // float but on purpose.
+                'difference_float' => (float) $expense['sum'], // float but on purpose.
-                'currency_id'      => (string)$expense['currency_id'],
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * PeriodController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -25,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Income;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use Illuminate\Http\JsonResponse;
 
 /**
@@ -47,34 +48,34 @@ class PeriodController extends Controller
 
         // collect all expenses in this period (regardless of type)
         $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts);
         $genericSet = $collector->getExtractedJournals();
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
+                    'currency_id'      => (string) $currencyId,
                     'currency_code'    => $journal['currency_code'],
                 ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
+                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference']; // float but on purpose.
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_id'      => (string) $foreignCurrencyId,
                     'currency_code'    => $journal['foreign_currency_code'],
                 ];
                 $response[$foreignCurrencyId]['difference']       = bcadd(
                     $response[$foreignCurrencyId]['difference'],
                     app('steam')->positive($journal['foreign_amount'])
                 );
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
+                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference']; // float but on purpose.
             }
         }
 

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

@@ -26,8 +26,8 @@ namespace FireflyIII\Api\V1\Controllers\Insight\Income;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
+use FireflyIII\Enums\TransactionTypeEnum;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use Illuminate\Http\JsonResponse;
 
@@ -70,37 +70,37 @@ class TagController extends Controller
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
         $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts);
         $collector->withoutTags();
 
         $genericSet = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
+                    'currency_id'      => (string) $currencyId,
                     'currency_code'    => $journal['currency_code'],
                 ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_id'      => (string) $foreignCurrencyId,
                     'currency_code'    => $journal['foreign_currency_code'],
                 ];
                 $response[$foreignCurrencyId]['difference']       = bcadd(
                     $response[$foreignCurrencyId]['difference'],
                     app('steam')->positive($journal['foreign_amount'])
                 );
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
             }
         }
 
@@ -128,14 +128,14 @@ class TagController extends Controller
 
         // collect all expenses in this period (regardless of type) by the given bills and accounts.
         $collector  = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->setTypes([TransactionTypeEnum::DEPOSIT->value])->setRange($start, $end)->setDestinationAccounts($accounts);
         $collector->setTags($tags);
         $genericSet = $collector->getExtractedJournals();
 
         /** @var array $journal */
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             /** @var array $tag */
             foreach ($journal['tags'] as $tag) {
@@ -146,15 +146,15 @@ class TagController extends Controller
                 // on currency ID
                 if (0 !== $currencyId) {
                     $response[$key] ??= [
-                        'id'               => (string)$tagId,
+                        'id'               => (string) $tagId,
                         'name'             => $tag['name'],
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$currencyId,
+                        'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
                     $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
-                    $response[$key]['difference_float'] = (float)$response[$key]['difference'];
+                    $response[$key]['difference_float'] = (float) $response[$key]['difference'];
                 }
 
                 // on foreign ID
@@ -162,14 +162,14 @@ class TagController extends Controller
                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
                     $response[$foreignKey]['difference']       = bcadd(
                         $response[$foreignKey]['difference'],
                         app('steam')->positive($journal['foreign_amount'])
                     );
-                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
+                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
                 }
             }
         }

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * AccountController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * CategoryController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -84,11 +85,11 @@ class CategoryController extends Controller
             /** @var array $expense */
             foreach ($expenses as $expense) {
                 $result[] = [
-                    'id'               => (string)$category->id,
+                    'id'               => (string) $category->id,
                     'name'             => $category->name,
                     'difference'       => $expense['sum'],
-                    'difference_float' => (float)$expense['sum'],
+                    'difference_float' => (float) $expense['sum'],
-                    'currency_id'      => (string)$expense['currency_id'],
+                    'currency_id'      => (string) $expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -113,8 +114,8 @@ class CategoryController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float)$expense['sum'],
+                'difference_float' => (float) $expense['sum'],
-                'currency_id'      => (string)$expense['currency_id'],
+                'currency_id'      => (string) $expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * PeriodController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -50,31 +51,31 @@ class PeriodController extends Controller
         $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
         $genericSet = $collector->getExtractedJournals();
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
+                    'currency_id'      => (string) $currencyId,
                     'currency_code'    => $journal['currency_code'],
                 ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_id'      => (string) $foreignCurrencyId,
                     'currency_code'    => $journal['foreign_currency_code'],
                 ];
                 $response[$foreignCurrencyId]['difference']       = bcadd(
                     $response[$foreignCurrencyId]['difference'],
                     app('steam')->positive($journal['foreign_amount'])
                 );
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
             }
         }
 

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * TagController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -73,31 +74,31 @@ class TagController extends Controller
         $genericSet = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$currencyId,
+                    'currency_id'      => (string) $currencyId,
                     'currency_code'    => $journal['currency_code'],
                 ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
+                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId] ??= [
                     'difference'       => '0',
                     'difference_float' => 0,
-                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_id'      => (string) $foreignCurrencyId,
                     'currency_code'    => $journal['foreign_currency_code'],
                 ];
                 $response[$foreignCurrencyId]['difference']       = bcadd(
                     $response[$foreignCurrencyId]['difference'],
                     app('steam')->positive($journal['foreign_amount'])
                 );
-                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
+                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
             }
         }
 
@@ -131,8 +132,8 @@ class TagController extends Controller
 
         /** @var array $journal */
         foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
+            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
 
             /** @var array $tag */
             foreach ($journal['tags'] as $tag) {
@@ -143,15 +144,15 @@ class TagController extends Controller
                 // on currency ID
                 if (0 !== $currencyId) {
                     $response[$key] ??= [
-                        'id'               => (string)$tagId,
+                        'id'               => (string) $tagId,
                         'name'             => $tag['name'],
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$currencyId,
+                        'currency_id'      => (string) $currencyId,
                         'currency_code'    => $journal['currency_code'],
                     ];
                     $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
-                    $response[$key]['difference_float'] = (float)$response[$key]['difference'];
+                    $response[$key]['difference_float'] = (float) $response[$key]['difference'];
                 }
 
                 // on foreign ID
@@ -159,14 +160,14 @@ class TagController extends Controller
                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [
                         'difference'       => '0',
                         'difference_float' => 0,
-                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_id'      => (string) $foreignCurrencyId,
                         'currency_code'    => $journal['foreign_currency_code'],
                     ];
                     $response[$foreignKey]['difference']       = bcadd(
                         $response[$foreignKey]['difference'],
                         app('steam')->positive($journal['foreign_amount'])
                     );
-                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
+                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference']; // intentional float
                 }
             }
         }

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AccountController.php
  * Copyright (c) 2019 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AccountController.php
  * Copyright (c) 2019 james@firefly-iii.org
@@ -110,7 +111,7 @@ class ListController extends Controller
         // types to get, page size:
         $pageSize    = $this->parameters->get('limit');
 
-        // get list of budgets. Count it and split it.
+        // get list of piggy banks. Count it and split it.
         $collection  = $this->repository->getPiggyBanks($account);
         $count       = $collection->count();
         $piggyBanks  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

app/Api/V1/Controllers/Models/Account/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AccountController.php
  * Copyright (c) 2019 james@firefly-iii.org

app/Api/V1/Controllers/Models/Account/UpdateController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AccountController.php
  * Copyright (c) 2019 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Attachment/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -104,7 +105,7 @@ class ShowController extends Controller
                 ->header('Expires', '0')
                 ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
                 ->header('Pragma', 'public')
-                ->header('Content-Length', (string)strlen($content))
+                ->header('Content-Length', (string) strlen($content))
             ;
 
             return $response;

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -112,7 +113,12 @@ class StoreController extends Controller
 
             return response()->json([], 422);
         }
-        $helper->saveAttachmentFromApi($attachment, $body);
+        $result = $helper->saveAttachmentFromApi($attachment, $body);
+        if (false === $result) {
+            app('log')->error('Could not save attachment from API.');
+
+            return response()->json([], 422);
+        }
 
         return response()->json([], 204);
     }

app/Api/V1/Controllers/Models/Attachment/UpdateController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/AvailableBudget/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Bill/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Bill/UpdateController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Budget/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Budget/UpdateController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/BudgetLimit/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -68,6 +69,7 @@ class StoreController extends Controller
         $data               = $request->getAll();
         $data['start_date'] = $data['start'];
         $data['end_date']   = $data['end'];
+        $data['notes']      = $data['notes'];
         $data['budget_id']  = $budget->id;
 
         $budgetLimit        = $this->blRepository->store($data);

app/Api/V1/Controllers/Models/BudgetLimit/UpdateController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Category/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Category/UpdateController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/ObjectGroup/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/ObjectGroup/UpdateController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -27,6 +28,7 @@ use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\PiggyBank;
 use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
+use FireflyIII\Transformers\AccountTransformer;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\PiggyBankEventTransformer;
 use Illuminate\Http\JsonResponse;
@@ -57,6 +59,38 @@ class ListController extends Controller
         );
     }
 
+    /**
+     * This endpoint is documented at:
+     * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listAccountByPiggyBank
+     *
+     * List single resource.
+     *
+     * @throws FireflyException
+     */
+    public function accounts(PiggyBank $piggyBank): JsonResponse
+    {
+        // types to get, page size:
+        $pageSize    = $this->parameters->get('limit');
+        $manager     = $this->getManager();
+
+        $collection  = $piggyBank->accounts;
+        $count       = $collection->count();
+        $events      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator   = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.piggy-banks.accounts', [$piggyBank->id]).$this->buildParams());
+
+        /** @var AccountTransformer $transformer */
+        $transformer = app(AccountTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource    = new FractalCollection($events, $transformer, 'accounts');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/?urls.primaryName=2.0.0%20(v1)#/piggy_banks/listAttachmentByPiggyBank

app/Api/V1/Controllers/Models/PiggyBank/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -71,7 +72,7 @@ class ShowController extends Controller
         // types to get, page size:
         $pageSize    = $this->parameters->get('limit');
 
-        // get list of budgets. Count it and split it.
+        // get list of piggy banks. Count it and split it.
         $collection  = $this->repository->getPiggyBanks();
         $count       = $collection->count();
         $piggyBanks  = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/PiggyBank/UpdateController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Recurrence/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Recurrence/UpdateController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Rule/ExpressionController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ExpressionController.php
  * Copyright (c) 2024 Michael Thomas

app/Api/V1/Controllers/Models/Rule/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Rule/TriggerController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * TriggerController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/Rule/UpdateController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * UpdateController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * DestroyController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ListController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/RuleGroup/ShowController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * ShowController.php
  * Copyright (c) 2021 james@firefly-iii.org

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

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * StoreController.php
  * Copyright (c) 2021 james@firefly-iii.org

app/Api/V1/Controllers/Models/RuleGroup/TriggerController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * TriggerController.php
  * Copyright (c) 2021 james@firefly-iii.org