Merge branch 'release/5.8.0-alpha.1'

# Conflicts:
#	app/Events/ChangedPiggyBankAmount.php
#	app/Handlers/Events/PiggyBankEventHandler.php
#	changelog.md
#	composer.lock
#	config/firefly.php

.ci/php-cs-fixer/.gitignore

@@ -0,0 +1 @@
+vendor

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

@@ -0,0 +1,44 @@
+<?php
+/*
+ * .php-cs-fixer.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+$current = __DIR__;
+
+$paths = [
+    $current . '/../../app',
+    $current . '/../../config',
+    $current . '/../../database',
+    $current . '/../../routes',
+    $current . '/../../tests',
+    $current . '/../../resources/lang',
+];
+
+$finder = PhpCsFixer\Finder::create()
+                           ->in($paths);
+
+
+$config = new PhpCsFixer\Config();
+return $config->setRules([
+    '@PSR12' => true,
+    'strict_param' => true,
+    'array_syntax' => ['syntax' => 'short'],
+])
+              ->setFinder($finder)
+    ;

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

@@ -0,0 +1,5 @@
+{
+    "require": {
+        "friendsofphp/php-cs-fixer": "^3.12"
+    }
+}

.ci/phpcs.sh

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+#
+# phpstan.sh
+# Copyright (c) 2021 james@firefly-iii.org
+#
+# This file is part of Firefly III (https://github.com/firefly-iii).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+# Install composer packages
+#composer install --no-scripts --no-ansi
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+# enable test .env file.
+# cp .ci/.env.ci .env
+
+# clean up php code
+cd $SCRIPT_DIR/php-cs-fixer
+composer update
+./vendor/bin/php-cs-fixer fix --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php --allow-risky=yes
+cd $SCRIPT_DIR/..
+
+exit 0

.ci/phpstan.neon

@@ -8,26 +8,63 @@ parameters:
   ignoreErrors:
     - '#is not allowed to extend#'
     - '#is neither abstract nor final#'
-    - '#Control structures using switch should not be used\.#'
     - '#has a nullable return type declaration#'
     - '#with a nullable type declaration#'
     - '#with null as default value#'
-    - '#Constructor in [a-zA-Z0-9\\_]+ has parameter \$[a-zA-Z0-9\\_]+ with default value#'
+    - '#is not covariant with PHPDoc type array#'
     -
-        message: '#Function compact\(\) should not be used.#'
+        message: '#but containers should not be injected#'
         paths:
-            - ../app/Http/Controllers
-            - ../app/Support/Http/Controllers/RenderPartialViews.php
-            - ../app/Support/Form/FormSupport.php
-            - ../app/Support/Form/CurrencyForm.php
-            - ../app/Support/Form/AccountForm.php
+            - ../app/Support/Authentication/RemoteUserGuard.php
+    -
+        message: '#Control structures using switch should not be used.#'
+        paths:
+            - ../app/Api/V1/Controllers/Data/DestroyController.php
+            - ../app/Console/Commands/Correction/FixAccountTypes.php
+            - ../app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
+            - ../app/Exceptions/GracefulNotFoundHandler.php
+            - ../app/Generator/Webhook/StandardMessageGenerator.php
+            - ../app/Support/Amount.php
+            - ../app/Support/Navigation.php
+            - ../app/Support/ParseDateString.php
+            - ../app/Support/Search/AccountSearch.php
+            - ../app/Support/Search/OperatorQuerySearch.php
+            - ../app/Support/Twig/General.php
+            - ../app/Transformers/RecurrenceTransformer.php
+            - ../app/Validation/AccountValidator.php
+            - ../app/Validation/RecurrenceValidation.php
+            - ../app/Validation/TransactionValidation.php
+
+    -
+        message: '#Function compact\(\) should not be used#'
+        paths:
+            - ../app/Generator/Report/Account/MonthReportGenerator.php
+            - ../app/Generator/Report/Audit/MonthReportGenerator.php
+            - ../app/Generator/Report/Budget/MonthReportGenerator.php
+            - ../app/Generator/Report/Category/MonthReportGenerator.php
+            - ../app/Generator/Report/Standard/MonthReportGenerator.php
+            - ../app/Generator/Report/Standard/MultiYearReportGenerator.php
+            - ../app/Generator/Report/Standard/YearReportGenerator.php
+            - ../app/Generator/Report/Tag/MonthReportGenerator.php
+            - ../app/Http/Controllers/Account/*.php
+            - ../app/Http/Controllers/Admin/*.php
+            - ../app/Http/Controllers/*.php
             - ../app/Support/ExpandedForm.php
-            - ../app/Generator/Report
+            - ../app/Support/Form/AccountForm.php
+            - ../app/Support/Form/CurrencyForm.php
+            - ../app/Support/Form/FormSupport.php
+    -
+        message: '#Either catch a more specific exception#'
+        paths:
+            - ../app/Support/Form/FormSupport.php
+
   paths:
     - ../app
     - ../database
     - ../routes
+    - ../config
     - ../bootstrap/app.php
 
   # The level 8 is the highest level. original was 5
-  level: 3
+  level: 4
+

.ci/phpstan.sh

@@ -23,11 +23,11 @@
 # Install composer packages
 #composer install --no-scripts --no-ansi
 
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
 # enable test .env file.
-cp .ci/.env.ci .env
+# cp .ci/.env.ci .env
 
 # Do static code analysis.
 # ./vendor/bin/phpstan analyse -c .ci/phpstan.neon --no-progress
-./vendor/bin/phpstan analyse -c .ci/phpstan.neon
-
-exit 0
+./vendor/bin/phpstan analyse -c .ci/phpstan.neon --xdebug --error-format=table > phpstan-report.txt

.deploy/heroku/.locales

@@ -1,5 +1,6 @@
 bg_BG
 cs_CZ
+da_DK
 de_DE
 el_GR
 en_GB
@@ -8,7 +9,9 @@ es_ES
 fi_FI
 fr_FR
 hu_HU
+id_ID
 it_IT
+ja_JP
 nb_NO
 nl_NL
 pl_PL
@@ -17,7 +20,10 @@ pt_PT
 ro_RO
 ru_RU
 sk_SK
+sl_SI
 sv_SE
+tr_TR
+uk_UA
 vi_VN
 zh-hans_CN
 zh-hant_CN

.env.example

@@ -7,11 +7,15 @@ APP_DEBUG=false
 
 # This should be your email address.
 # If you use Docker or similar, you can set this variable from a file by using SITE_OWNER_FILE
+# The variable is used in some errors shown to users who aren't admin.
 SITE_OWNER=mail@example.com
 
 # The encryption key for your sessions. Keep this very secure.
 # Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
 # If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
+#
+# Avoid the "#" character in your APP_KEY, it may break things.
+#
 APP_KEY=SomeRandomStringOf32CharsExactly
 
 # Firefly III will launch using this language (for new users and unauthenticated visitors)
@@ -166,6 +170,12 @@ SEND_REPORT_JOURNALS=true
 # and disabled by default.
 ENABLE_EXTERNAL_MAP=false
 
+# Set this value to true if you want Firefly III to download currency exchange rates
+# from the internet. These rates are hosted by the creator of Firefly III inside
+# an Azure Storage Container.
+# Not all currencies may be available. Rates may be wrong.
+ENABLE_EXTERNAL_RATES=false
+
 # The map will default to this location:
 MAP_DEFAULT_LAT=51.983333
 MAP_DEFAULT_LONG=5.916667
@@ -192,6 +202,15 @@ AUTHENTICATION_GUARD=web
 AUTHENTICATION_GUARD_HEADER=REMOTE_USER
 AUTHENTICATION_GUARD_EMAIL=
 
+#
+# Firefly III generates a basic keypair for your OAuth tokens.
+# If you want, you can overrule the key with your own (secure) value.
+# It's also possible to set PASSPORT_PUBLIC_KEY_FILE or PASSPORT_PRIVATE_KEY_FILE
+# if you're using Docker secrets or similar solutions for secret management
+#
+PASSPORT_PRIVATE_KEY=
+PASSPORT_PUBLIC_KEY=
+
 #
 # Extra authentication settings
 #
@@ -233,7 +252,7 @@ ALLOW_WEBHOOKS=false
 STATIC_CRON_TOKEN=
 
 # You can fine tune the start-up of a Docker container by editing these environment variables.
-# Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
+# Use this at your own risk. Disabling certain checks and features may result in lots of inconsistent data.
 # However if you know what you're doing you can significantly speed up container start times.
 # Set each value to true to enable, or false to disable.
 

.github/security.md

@@ -40,7 +40,7 @@ The Firefly III developer will respond to vulnerability reports as follows:
 9.  Once the fix is confirmed, the developer will patch the vulnerability in the next patch or minor release. Upon release of the patched version of Firefly III, we will follow the **Public Disclosure Process**.
 
 ### Public Disclosure Process
-The developer publishes a public [advisory](https://github.com/firefly-iii/firefly-iii/security/advisories) to the Firefly III community via GitHub. In most cases, additional communication via Twitter, reddit and other channels will assist in educating Firefly III users and rolling out the patched release to affected users. 
+The developer publishes a public [advisory](https://github.com/firefly-iii/firefly-iii/security/advisories) to the Firefly III community via GitHub. In most cases, additional communication via Mastodon, Gitter and other channels will assist in educating Firefly III users and rolling out the patched release to affected users. 
 
 The develop will also publish any mitigating steps users can take until the fix can be applied to their Firefly III instances.
  

.github/workflows/build.yml

@@ -4,6 +4,7 @@ on:
     branches:
       - main
       - develop
+      - 5.8-dev
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

.github/workflows/stale.yml

@@ -2,6 +2,7 @@ name: "Close stale issues"
 on:
   schedule:
     - cron: "30 1 * * *"
+  workflow_dispatch:
 
 permissions:
   contents: read
@@ -13,7 +14,7 @@ jobs:
       pull-requests: write  # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v3
+      - uses: actions/stale@v6
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: >

.gitignore

@@ -6,3 +6,4 @@
 npm-debug.log
 yarn-error.log
 .env
+/.ci/php-cs-fixer/vendor

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

@@ -67,7 +67,7 @@ class AccountController extends Controller
      * Documentation for this endpoint:
      * https://api-docs.firefly-iii.org/#/autocomplete/getAccountsAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      * @throws JsonException
@@ -82,7 +82,7 @@ class AccountController extends Controller
         $date  = $data['date'] ?? today(config('app.timezone'));
 
         $return          = [];
-        $result          = $this->repository->searchAccount((string) $query, $types, $data['limit']);
+        $result          = $this->repository->searchAccount((string)$query, $types, $data['limit']);
         $defaultCurrency = app('amount')->getDefaultCurrency();
 
         /** @var Account $account */
@@ -96,7 +96,7 @@ class AccountController extends Controller
             }
 
             $return[] = [
-                'id'                      => (string) $account->id,
+                'id'                      => (string)$account->id,
                 'name'                    => $account->name,
                 'name_with_balance'       => $nameWithBalance,
                 'type'                    => $account->accountType->type,
@@ -111,12 +111,13 @@ class AccountController extends Controller
         // custom order.
         $order = [AccountType::ASSET, AccountType::REVENUE, AccountType::EXPENSE];
         usort(
-            $return, function ($a, $b) use ($order) {
-            $pos_a = array_search($a['type'], $order);
-            $pos_b = array_search($b['type'], $order);
+            $return,
+            function ($a, $b) use ($order) {
+                $pos_a = array_search($a['type'], $order, true);
+                $pos_b = array_search($b['type'], $order, true);
 
-            return $pos_a - $pos_b;
-        }
+                return $pos_a - $pos_b;
+            }
         );
 
         return response()->json($return);

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

@@ -58,8 +58,9 @@ class BillController extends Controller
     /**
      * Documentation for this endpoint is at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getBillsAC
+     * TODO expand API to add active field.
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -70,13 +71,13 @@ 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
                 ];
             }
         );
 
         return response()->json($filtered->toArray());
     }
-
 }

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

@@ -59,7 +59,7 @@ class BudgetController extends Controller
      * Documentation for this endpoint is at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getBudgetsAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -70,7 +70,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

@@ -59,7 +59,7 @@ class CategoryController extends Controller
      * Documentation for this endpoint is at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getCategoriesAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -70,7 +70,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

@@ -59,7 +59,7 @@ class CurrencyController extends Controller
      * Documentation for this endpoint is at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -72,7 +72,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,
@@ -87,7 +87,7 @@ class CurrencyController extends Controller
      * Documentation for this endpoint is at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getCurrenciesCodeAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      * @deprecated
@@ -101,7 +101,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

@@ -59,7 +59,7 @@ class ObjectGroupController extends Controller
      * Documentation for this endpoint is at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getObjectGroupsAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -72,7 +72,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,
             ];
@@ -80,5 +80,4 @@ class ObjectGroupController extends Controller
 
         return response()->json($return);
     }
-
 }

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

@@ -63,7 +63,7 @@ class PiggyBankController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -78,7 +78,7 @@ class PiggyBankController extends Controller
         foreach ($piggies as $piggy) {
             $currency   = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
             $response[] = [
-                'id'                      => (string) $piggy->id,
+                'id'                      => (string)$piggy->id,
                 'name'                    => $piggy->name,
                 'currency_id'             => $currency->id,
                 'currency_name'           => $currency->name,
@@ -95,7 +95,7 @@ class PiggyBankController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getPiggiesBalanceAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -110,10 +110,12 @@ class PiggyBankController extends Controller
             $currency      = $this->accountRepository->getAccountCurrency($piggy->account) ?? $defaultCurrency;
             $currentAmount = $this->piggyRepository->getRepetition($piggy)->currentamount ?? '0';
             $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),
+                    '%s (%s / %s)',
+                    $piggy->name,
+                    app('amount')->formatAnything($currency, $currentAmount, false),
                     app('amount')->formatAnything($currency, $piggy->targetamount, false),
                 ),
                 'currency_id'             => $currency->id,
@@ -126,5 +128,4 @@ class PiggyBankController extends Controller
 
         return response()->json($response);
     }
-
 }

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

@@ -56,7 +56,7 @@ class RecurrenceController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getRecurringAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -69,7 +69,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,
             ];
@@ -77,5 +77,4 @@ class RecurrenceController extends Controller
 
         return response()->json($response);
     }
-
 }

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

@@ -56,7 +56,7 @@ class RuleController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getRulesAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -69,7 +69,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,
             ];
@@ -77,5 +77,4 @@ class RuleController extends Controller
 
         return response()->json($response);
     }
-
 }

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

@@ -56,7 +56,7 @@ class RuleGroupController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getRuleGroupsAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -69,7 +69,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

@@ -59,7 +59,7 @@ class TagController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getTagAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -72,7 +72,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

@@ -64,7 +64,7 @@ class TransactionController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
@@ -80,8 +80,8 @@ class TransactionController extends Controller
         /** @var TransactionJournal $journal */
         foreach ($filtered as $journal) {
             $array[] = [
-                'id'                   => (string) $journal->id,
-                'transaction_group_id' => (string) $journal->transaction_group_id,
+                'id'                   => (string)$journal->id,
+                'transaction_group_id' => (string)$journal->transaction_group_id,
                 'name'                 => $journal->description,
                 'description'          => $journal->description,
             ];
@@ -94,17 +94,17 @@ class TransactionController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionsIDAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      */
     public function transactionsWithID(AutocompleteRequest $request): JsonResponse
     {
         $data   = $request->getData();
-        $result = new Collection;
+        $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) {
@@ -122,8 +122,8 @@ class TransactionController extends Controller
         /** @var TransactionJournal $journal */
         foreach ($result as $journal) {
             $array[] = [
-                'id'                   => (string) $journal->id,
-                'transaction_group_id' => (string) $journal->transaction_group_id,
+                'id'                   => (string)$journal->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

@@ -55,7 +55,7 @@ class TransactionTypeController extends Controller
      * This endpoint is documented at
      * https://api-docs.firefly-iii.org/#/autocomplete/getTransactionTypesAC
      *
-     * @param AutocompleteRequest $request
+     * @param  AutocompleteRequest  $request
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -70,7 +70,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

@@ -76,7 +76,7 @@ class AccountController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/charts/getChartAccountOverview
      *
-     * @param DateRequest $request
+     * @param  DateRequest  $request
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -98,7 +98,7 @@ class AccountController extends Controller
         $frontPage  = app('preferences')->get('frontPageAccounts', $defaultSet);
         $default    = app('amount')->getDefaultCurrency();
 
-        if (empty($frontPage->data)) {
+        if (!(is_array($frontPage->data) && count($frontPage->data) > 0)) {
             $frontPage->data = $defaultSet;
             $frontPage->save();
         }
@@ -115,7 +115,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,
@@ -127,11 +127,12 @@ class AccountController extends Controller
             ];
             $currentStart = clone $start;
             $range        = app('steam')->balanceInRange($account, $start, clone $end);
-            $previous     = round((float) array_values($range)[0], 12);
+            // 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) ? round((float) $range[$format], 12) : $previous;
+                $balance  = array_key_exists($format, $range) ? $range[$format] : $previous;
                 $previous = $balance;
                 $currentStart->addDay();
                 $currentSet['entries'][$label] = $balance;

app/Api/V1/Controllers/Controller.php

@@ -33,7 +33,6 @@ use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 use League\Fractal\Manager;
 use League\Fractal\Serializer\JsonApiSerializer;
-use Log;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;
@@ -45,7 +44,9 @@ use Symfony\Component\HttpFoundation\ParameterBag;
  */
 abstract class Controller extends BaseController
 {
-    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+    use AuthorizesRequests;
+    use DispatchesJobs;
+    use ValidatesRequests;
 
     protected const CONTENT_TYPE = 'application/vnd.api+json';
     protected array        $allowedSort;
@@ -69,7 +70,6 @@ abstract class Controller extends BaseController
                 return $next($request);
             }
         );
-
     }
 
     /**
@@ -81,11 +81,15 @@ abstract class Controller extends BaseController
      */
     private function getParameters(): ParameterBag
     {
-        $bag  = new ParameterBag;
+        $bag  = new ParameterBag();
         $page = (int)request()->get('page');
-        if (0 === $page) {
+
+        if ($page < 1) {
             $page = 1;
         }
+        if ($page > (2 ^ 16)) {
+            $page = (2 ^ 16);
+        }
         $bag->set('page', $page);
 
         // some date fields:
@@ -96,9 +100,9 @@ abstract class Controller extends BaseController
             if (null !== $date) {
                 try {
                     $obj = Carbon::parse($date);
-                } catch (InvalidDateException | InvalidFormatException $e) {
+                } catch (InvalidDateException|InvalidFormatException $e) {
                     // don't care
-                    Log::warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', $date, $e->getMessage()));
+                    app('log')->warning(sprintf('Ignored invalid date "%s" in API controller parameter check: %s', $date, $e->getMessage()));
                 }
             }
             $bag->set($field, $obj);
@@ -118,7 +122,7 @@ abstract class Controller extends BaseController
     }
 
     /**
-     * @param ParameterBag $bag
+     * @param  ParameterBag  $bag
      *
      * @return ParameterBag
      */
@@ -167,7 +171,7 @@ abstract class Controller extends BaseController
             $params[$key] = $value;
         }
 
-        return $return . http_build_query($params);
+        return $return.http_build_query($params);
     }
 
     /**
@@ -176,8 +180,8 @@ abstract class Controller extends BaseController
     final protected function getManager(): Manager
     {
         // create some objects:
-        $manager = new Manager;
-        $baseUrl = request()->getSchemeAndHttpHost() . '/api/v1';
+        $manager = new Manager();
+        $baseUrl = request()->getSchemeAndHttpHost().'/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
         return $manager;

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

@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Data\Bulk;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\Bulk\MoveTransactionsRequest;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -59,7 +58,7 @@ class AccountController extends Controller
     /**
      * This endpoint is deprecated and not documented.
      *
-     * @param MoveTransactionsRequest $request
+     * @param  MoveTransactionsRequest  $request
      *
      * @return JsonResponse
      * @deprecated
@@ -75,7 +74,5 @@ class AccountController extends Controller
         $service->moveTransactions($original, $destination);
 
         return response()->json([], 204);
-
     }
-
 }

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

@@ -63,7 +63,7 @@ class TransactionController extends Controller
     /**
      * This endpoint is documented at:
      *
-     * @param TransactionRequest $request
+     * @param  TransactionRequest  $request
      *
      * @return JsonResponse
      */
@@ -76,8 +76,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->updatesTransactionAccount($params)) {
-            $original    = $this->repository->find((int) $params['where']['account_id']);
-            $destination = $this->repository->find((int) $params['update']['account_id']);
+            $original    = $this->repository->find((int)$params['where']['account_id']);
+            $destination = $this->repository->find((int)$params['update']['account_id']);
 
             /** @var AccountDestroyService $service */
             $service = app(AccountDestroyService::class);
@@ -88,7 +88,7 @@ class TransactionController extends Controller
     }
 
     /**
-     * @param array $params
+     * @param  array  $params
      *
      * @return bool
      */
@@ -96,5 +96,4 @@ class TransactionController extends Controller
     {
         return array_key_exists('account_id', $params['where']) && array_key_exists('account_id', $params['update']);
     }
-
 }

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

@@ -45,25 +45,28 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
 use FireflyIII\Services\Internal\Destroy\JournalDestroyService;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class DestroyController
  */
 class DestroyController extends Controller
 {
+    private bool $unused;
+
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/data/destroyData
      *
-     * @param DestroyRequest $request
+     * @param  DestroyRequest  $request
      *
      * @return JsonResponse
      * @throws FireflyException
      */
     public function destroy(DestroyRequest $request): JsonResponse
     {
-        $objects = $request->getObjects();
-
+        $objects      = $request->getObjects();
+        $this->unused = $request->boolean('unused', false);
         switch ($objects) {
             default:
                 throw new FireflyException(sprintf('This endpoint can\'t handle object "%s"', $objects));
@@ -94,24 +97,32 @@ class DestroyController extends Controller
             case 'accounts':
                 $this->destroyAccounts(
                     [
-                        AccountType::ASSET, AccountType::DEFAULT,
-                        AccountType::BENEFICIARY, AccountType::EXPENSE,
-                        AccountType::REVENUE, AccountType::INITIAL_BALANCE,
-                        AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD,
+                        AccountType::ASSET,
+                        AccountType::DEFAULT,
+                        AccountType::BENEFICIARY,
+                        AccountType::EXPENSE,
+                        AccountType::REVENUE,
+                        AccountType::INITIAL_BALANCE,
+                        AccountType::DEBT,
+                        AccountType::LOAN,
+                        AccountType::MORTGAGE,
+                        AccountType::CREDITCARD,
                     ]
                 );
                 break;
             case 'asset_accounts':
                 $this->destroyAccounts(
                     [
-                        AccountType::ASSET, AccountType::DEFAULT,
+                        AccountType::ASSET,
+                        AccountType::DEFAULT,
                     ]
                 );
                 break;
             case 'expense_accounts':
                 $this->destroyAccounts(
                     [
-                        AccountType::BENEFICIARY, AccountType::EXPENSE,
+                        AccountType::BENEFICIARY,
+                        AccountType::EXPENSE,
                     ]
                 );
                 break;
@@ -125,7 +136,10 @@ class DestroyController extends Controller
             case 'liabilities':
                 $this->destroyAccounts(
                     [
-                        AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD,
+                        AccountType::DEBT,
+                        AccountType::LOAN,
+                        AccountType::MORTGAGE,
+                        AccountType::CREDITCARD,
                     ]
                 );
                 break;
@@ -162,6 +176,7 @@ class DestroyController extends Controller
                 );
                 break;
         }
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }
@@ -252,7 +267,7 @@ class DestroyController extends Controller
     }
 
     /**
-     * @param array $types
+     * @param  array  $types
      */
     private function destroyAccounts(array $types): void
     {
@@ -260,14 +275,24 @@ class DestroyController extends Controller
         $repository = app(AccountRepositoryInterface::class);
         $collection = $repository->getAccountsByType($types);
         $service    = app(AccountDestroyService::class);
+
         /** @var Account $account */
         foreach ($collection as $account) {
-            $service->destroy($account, null);
+            $count = $account->transactions()->count();
+            if (true === $this->unused && 0 === $count) {
+                Log::info(sprintf('Deleted unused account #%d "%s"', $account->id, $account->name));
+                $service->destroy($account, null);
+                continue;
+            }
+            if (false === $this->unused) {
+                Log::info(sprintf('Deleting account #%d "%s"', $account->id, $account->name));
+                $service->destroy($account, null);
+            }
         }
     }
 
     /**
-     * @param array $types
+     * @param  array  $types
      */
     private function destroyTransactions(array $types): void
     {
@@ -280,5 +305,4 @@ class DestroyController extends Controller
             $service->destroy($journal);
         }
     }
-
 }

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

@@ -57,7 +57,7 @@ class ExportController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/data/exportAccounts
      *
-     * @param ExportRequest $request
+     * @param  ExportRequest  $request
      *
      * @return LaravelResponse
      * @throws FireflyException
@@ -67,11 +67,10 @@ class ExportController extends Controller
         $this->exporter->setExportAccounts(true);
 
         return $this->returnExport('accounts');
-
     }
 
     /**
-     * @param string $key
+     * @param  string  $key
      *
      * @return LaravelResponse
      * @throws FireflyException
@@ -87,13 +86,13 @@ class ExportController extends Controller
         $response
             ->header('Content-Description', 'File Transfer')
             ->header('Content-Type', 'application/octet-stream')
-            ->header('Content-Disposition', 'attachment; filename=' . $fileName)
+            ->header('Content-Disposition', 'attachment; filename='.$fileName)
             ->header('Content-Transfer-Encoding', 'binary')
             ->header('Connection', 'Keep-Alive')
             ->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;
     }
@@ -102,7 +101,7 @@ class ExportController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/data/exportBills
      *
-     * @param ExportRequest $request
+     * @param  ExportRequest  $request
      *
      * @return LaravelResponse
      * @throws FireflyException
@@ -118,7 +117,7 @@ class ExportController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/data/exportBudgets
      *
-     * @param ExportRequest $request
+     * @param  ExportRequest  $request
      *
      * @return LaravelResponse
      * @throws FireflyException
@@ -134,7 +133,7 @@ class ExportController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/data/exportCategories
      *
-     * @param ExportRequest $request
+     * @param  ExportRequest  $request
      *
      * @return LaravelResponse
      * @throws FireflyException
@@ -150,7 +149,7 @@ class ExportController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/data/exportPiggies
      *
-     * @param ExportRequest $request
+     * @param  ExportRequest  $request
      *
      * @return LaravelResponse
      * @throws FireflyException
@@ -166,7 +165,7 @@ class ExportController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/data/exportRecurring
      *
-     * @param ExportRequest $request
+     * @param  ExportRequest  $request
      *
      * @return LaravelResponse
      * @throws FireflyException
@@ -182,7 +181,7 @@ class ExportController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/data/exportRules
      *
-     * @param ExportRequest $request
+     * @param  ExportRequest  $request
      *
      * @return LaravelResponse
      * @throws FireflyException
@@ -198,7 +197,7 @@ class ExportController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/data/exportTags
      *
-     * @param ExportRequest $request
+     * @param  ExportRequest  $request
      *
      * @return LaravelResponse
      * @throws FireflyException
@@ -214,7 +213,7 @@ class ExportController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/data/exportTransactions
      *
-     * @param ExportRequest $request
+     * @param  ExportRequest  $request
      *
      * @return LaravelResponse
      * @throws FireflyException
@@ -229,5 +228,4 @@ class ExportController extends Controller
 
         return $this->returnExport('transactions');
     }
-
 }

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

@@ -0,0 +1,93 @@
+<?php
+/*
+ * PurgeController.php
+ * Copyright (c) 2022 james@firefly-iii.org
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+namespace FireflyIII\Api\V1\Controllers\Data;
+
+use FireflyIII\Api\V1\Controllers\Controller;
+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 Illuminate\Http\JsonResponse;
+
+class PurgeController extends Controller
+{
+    /**
+     * @return JsonResponse
+     */
+    public function purge(): JsonResponse
+    {
+        $user = auth()->user();
+
+        // some manual code, too lazy to call all repositories.
+        //,transactions,withdrawals,deposits,transfers';
+
+        // budgets:
+        Budget::whereUserId($user->id)->onlyTrashed()->forceDelete();
+
+        // bills
+        Bill::whereUserId($user->id)->onlyTrashed()->forceDelete();
+
+        // piggies
+        $set = PiggyBank::leftJoin('accounts', 'accounts.id', 'piggy_banks.account_id')
+                        ->where('accounts.user_id', $user->id)->onlyTrashed()->get(['piggy_banks.*']);
+        /** @var PiggyBank $piggy */
+        foreach ($set as $piggy) {
+            $piggy->forceDelete();
+        }
+
+        // rule group
+        RuleGroup::whereUserId($user->id)->onlyTrashed()->forceDelete();
+
+        // rules
+        Rule::whereUserId($user->id)->onlyTrashed()->forceDelete();
+
+        // recurring transactions
+        Recurrence::whereUserId($user->id)->onlyTrashed()->forceDelete();
+
+        // categories
+        Category::whereUserId($user->id)->onlyTrashed()->forceDelete();
+
+        // tags
+        Tag::whereUserId($user->id)->onlyTrashed()->forceDelete();
+
+
+        // accounts
+        Account::whereUserId($user->id)->onlyTrashed()->forceDelete();
+
+        // transaction groups
+        TransactionGroup::whereUserId($user->id)->onlyTrashed()->forceDelete();
+
+        // transaction journals
+        TransactionJournal::whereUserId($user->id)->onlyTrashed()->forceDelete();
+
+        return response()->json([], 204);
+    }
+}

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

@@ -76,7 +76,7 @@ class AccountController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightExpenseAsset
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -91,11 +91,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'],
-                'currency_id'      => (string) $expense['currency_id'],
+                'difference_float' => (float)$expense['sum'], // intentional float
+                'currency_id'      => (string)$expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }
@@ -107,7 +107,7 @@ class AccountController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightExpenseExpense
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -123,16 +123,15 @@ 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'],
-                'currency_id'      => (string) $expense['currency_id'],
+                'difference_float' => (float)$expense['sum'], // intentional float
+                'currency_id'      => (string)$expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }
 
         return response()->json($result);
     }
-
 }

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

@@ -61,7 +61,7 @@ class BillController extends Controller
      *
      * Expenses per bill, possibly filtered by bill and account.
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -85,33 +85,33 @@ class BillController extends Controller
 
         $genericSet = $collector->getExtractedJournals();
         foreach ($genericSet as $journal) {
-            $billId            = (int) $journal['bill_id'];
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $billId            = (int)$journal['bill_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
             $key               = sprintf('%d-%d', $billId, $currencyId);
             $foreignKey        = sprintf('%d-%d', $billId, $foreignCurrencyId);
 
             if (0 !== $currencyId) {
                 $response[$key]                     = $response[$key] ?? [
-                        'id'               => (string) $billId,
-                        'name'             => $journal['bill_name'],
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $currencyId,
-                        'currency_code'    => $journal['currency_code'],
-                    ];
+                    'id'               => (string)$billId,
+                    'name'             => $journal['bill_name'],
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    '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'];
+                $response[$key]['difference_float'] = (float)$response[$key]['difference']; // intentional float
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignKey]                     = $response[$foreignKey] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $foreignCurrencyId,
-                        'currency_code'    => $journal['foreign_currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_code'    => $journal['foreign_currency_code'],
+                ];
                 $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
-                $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
+                $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
             }
         }
 
@@ -124,7 +124,7 @@ class BillController extends Controller
      *
      * Expenses for no bill filtered by account.
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -143,32 +143,31 @@ class BillController extends Controller
         $genericSet = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId]                     = $response[$currencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $currencyId,
-                        'currency_code'    => $journal['currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$currencyId,
+                    'currency_code'    => $journal['currency_code'],
+                ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $foreignCurrencyId,
-                        'currency_code'    => $journal['foreign_currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_code'    => $journal['foreign_currency_code'],
+                ];
                 $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
             }
         }
 
         return response()->json(array_values($response));
     }
-
 }

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

@@ -68,7 +68,7 @@ class BudgetController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightExpenseBudget
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -88,11 +88,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'],
-                    'currency_id'      => (string) $expense['currency_id'],
+                    'difference_float' => (float)$expense['sum'], // intentional float
+                    'currency_id'      => (string)$expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -105,7 +105,7 @@ class BudgetController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightExpenseNoBudget
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -120,14 +120,12 @@ class BudgetController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float) $expense['sum'],
-                'currency_id'      => (string) $expense['currency_id'],
+                'difference_float' => (float)$expense['sum'], // intentional float
+                'currency_id'      => (string)$expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }
 
         return response()->json($result);
-
     }
-
 }

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

@@ -69,7 +69,7 @@ class CategoryController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightTransferCategory
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -89,11 +89,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'],
-                    'currency_id'      => (string) $expense['currency_id'],
+                    'difference_float' => (float)$expense['sum'], // intentional float
+                    'currency_id'      => (string)$expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -106,7 +106,7 @@ class CategoryController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -121,13 +121,12 @@ class CategoryController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float) $expense['sum'],
-                'currency_id'      => (string) $expense['currency_id'],
+                'difference_float' => (float)$expense['sum'], // intentional float
+                'currency_id'      => (string)$expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }
 
         return response()->json($result);
-
     }
 }

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

@@ -34,12 +34,11 @@ use Illuminate\Http\JsonResponse;
  */
 class PeriodController extends Controller
 {
-
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightExpenseTotal
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -55,32 +54,31 @@ class PeriodController extends Controller
         $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
         $genericSet = $collector->getExtractedJournals();
         foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId]                     = $response[$currencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $currencyId,
-                        'currency_code'    => $journal['currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$currencyId,
+                    'currency_code'    => $journal['currency_code'],
+                ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // intentional float
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $foreignCurrencyId,
-                        'currency_code'    => $journal['foreign_currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_code'    => $journal['foreign_currency_code'],
+                ];
                 $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // intentional float
             }
         }
 
         return response()->json(array_values($response));
     }
-
 }

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

@@ -60,7 +60,7 @@ class TagController extends Controller
      *
      * Expenses for no tag filtered by account.
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -79,28 +79,28 @@ class TagController extends Controller
         $genericSet = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId]                     = $response[$currencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $currencyId,
-                        'currency_code'    => $journal['currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$currencyId,
+                    'currency_code'    => $journal['currency_code'],
+                ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], $journal['amount']);
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $foreignCurrencyId,
-                        'currency_code'    => $journal['foreign_currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_code'    => $journal['foreign_currency_code'],
+                ];
                 $response[$foreignCurrencyId]['difference']       = bcadd($response[$foreignCurrencyId]['difference'], $journal['foreign_amount']);
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
             }
         }
 
@@ -113,7 +113,7 @@ class TagController extends Controller
      *
      * Expenses per tag, possibly filtered by tag and account.
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -137,8 +137,8 @@ class TagController extends Controller
         $genericSet = $collector->getExtractedJournals();
         /** @var array $journal */
         foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
 
             /** @var array $tag */
             foreach ($journal['tags'] as $tag) {
@@ -149,32 +149,31 @@ class TagController extends Controller
                 // on currency ID
                 if (0 !== $currencyId) {
                     $response[$key]                     = $response[$key] ?? [
-                            'id'               => (string) $tagId,
-                            'name'             => $tag['name'],
-                            'difference'       => '0',
-                            'difference_float' => 0,
-                            'currency_id'      => (string) $currencyId,
-                            'currency_code'    => $journal['currency_code'],
-                        ];
+                        'id'               => (string)$tagId,
+                        'name'             => $tag['name'],
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        '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'];
+                    $response[$key]['difference_float'] = (float)$response[$key]['difference']; // float but on purpose.
                 }
 
                 // on foreign ID
                 if (0 !== $foreignCurrencyId) {
                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [
-                            'difference'       => '0',
-                            'difference_float' => 0,
-                            'currency_id'      => (string) $foreignCurrencyId,
-                            'currency_code'    => $journal['foreign_currency_code'],
-                        ];
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        'currency_id'      => (string)$foreignCurrencyId,
+                        'currency_code'    => $journal['foreign_currency_code'],
+                    ];
                     $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
-                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
+                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // float but on purpose.
                 }
             }
         }
 
         return response()->json(array_values($response));
     }
-
 }

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

@@ -76,7 +76,7 @@ class AccountController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightIncomeAsset
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -90,11 +90,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'],
-                'currency_id'      => (string) $entry['currency_id'],
+                'difference_float' => (float)$entry['sum'], // float but on purpose.
+                'currency_id'      => (string)$entry['currency_id'],
                 'currency_code'    => $entry['currency_code'],
             ];
         }
@@ -106,7 +106,7 @@ class AccountController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightIncomeRevenue
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -122,16 +122,15 @@ 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'],
-                'currency_id'      => (string) $entry['currency_id'],
+                'difference_float' => (float)$entry['sum'], // float but on purpose.
+                'currency_id'      => (string)$entry['currency_id'],
                 'currency_code'    => $entry['currency_code'],
             ];
         }
 
         return response()->json($result);
     }
-
 }

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

@@ -69,7 +69,7 @@ class CategoryController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightIncomeCategory
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -89,11 +89,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'],
-                    'currency_id'      => (string) $expense['currency_id'],
+                    'difference_float' => (float)$expense['sum'], // float but on purpose.
+                    'currency_id'      => (string)$expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -106,7 +106,7 @@ class CategoryController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightIncomeNoCategory
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -121,13 +121,12 @@ class CategoryController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float) $expense['sum'],
-                'currency_id'      => (string) $expense['currency_id'],
+                'difference_float' => (float)$expense['sum'], // float but on purpose.
+                'currency_id'      => (string)$expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }
 
         return response()->json($result);
-
     }
 }

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

@@ -34,12 +34,11 @@ use Illuminate\Http\JsonResponse;
  */
 class PeriodController extends Controller
 {
-
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightIncomeTotal
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -55,34 +54,34 @@ class PeriodController extends Controller
         $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
         $genericSet = $collector->getExtractedJournals();
         foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId]                     = $response[$currencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $currencyId,
-                        'currency_code'    => $journal['currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$currencyId,
+                    'currency_code'    => $journal['currency_code'],
+                ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference']; // float but on purpose.
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $foreignCurrencyId,
-                        'currency_code'    => $journal['foreign_currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_code'    => $journal['foreign_currency_code'],
+                ];
                 $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                    $response[$foreignCurrencyId]['difference'],
+                    app('steam')->positive($journal['foreign_amount'])
                 );
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference']; // float but on purpose.
             }
         }
 
         return response()->json(array_values($response));
     }
-
 }

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

@@ -61,7 +61,7 @@ class TagController extends Controller
      *
      * Expenses for no tag filtered by account.
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -80,30 +80,31 @@ class TagController extends Controller
         $genericSet = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId]                     = $response[$currencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $currencyId,
-                        'currency_code'    => $journal['currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$currencyId,
+                    'currency_code'    => $journal['currency_code'],
+                ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $foreignCurrencyId,
-                        'currency_code'    => $journal['foreign_currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_code'    => $journal['foreign_currency_code'],
+                ];
                 $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                    $response[$foreignCurrencyId]['difference'],
+                    app('steam')->positive($journal['foreign_amount'])
                 );
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
             }
         }
 
@@ -116,7 +117,7 @@ class TagController extends Controller
      *
      * Expenses per tag, possibly filtered by tag and account.
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -140,8 +141,8 @@ class TagController extends Controller
         $genericSet = $collector->getExtractedJournals();
         /** @var array $journal */
         foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
 
             /** @var array $tag */
             foreach ($journal['tags'] as $tag) {
@@ -152,34 +153,34 @@ class TagController extends Controller
                 // on currency ID
                 if (0 !== $currencyId) {
                     $response[$key]                     = $response[$key] ?? [
-                            'id'               => (string) $tagId,
-                            'name'             => $tag['name'],
-                            'difference'       => '0',
-                            'difference_float' => 0,
-                            'currency_id'      => (string) $currencyId,
-                            'currency_code'    => $journal['currency_code'],
-                        ];
+                        'id'               => (string)$tagId,
+                        'name'             => $tag['name'],
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        '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
                 if (0 !== $foreignCurrencyId) {
                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [
-                            'difference'       => '0',
-                            'difference_float' => 0,
-                            'currency_id'      => (string) $foreignCurrencyId,
-                            'currency_code'    => $journal['foreign_currency_code'],
-                        ];
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        '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'],
+                        app('steam')->positive($journal['foreign_amount'])
                     );
-                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
+                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
                 }
             }
         }
 
         return response()->json(array_values($response));
     }
-
 }

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

@@ -61,7 +61,7 @@ class AccountController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightTransfers
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */

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

@@ -68,7 +68,7 @@ class CategoryController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightTransferCategory
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -88,11 +88,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'],
-                    'currency_id'      => (string) $expense['currency_id'],
+                    'difference_float' => (float)$expense['sum'],
+                    'currency_id'      => (string)$expense['currency_id'],
                     'currency_code'    => $expense['currency_code'],
                 ];
             }
@@ -105,7 +105,7 @@ class CategoryController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightTransferNoCategory
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -120,13 +120,12 @@ class CategoryController extends Controller
         foreach ($expenses as $expense) {
             $result[] = [
                 'difference'       => $expense['sum'],
-                'difference_float' => (float) $expense['sum'],
-                'currency_id'      => (string) $expense['currency_id'],
+                'difference_float' => (float)$expense['sum'],
+                'currency_id'      => (string)$expense['currency_id'],
                 'currency_code'    => $expense['currency_code'],
             ];
         }
 
         return response()->json($result);
-
     }
 }

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

@@ -34,12 +34,11 @@ use Illuminate\Http\JsonResponse;
  */
 class PeriodController extends Controller
 {
-
     /**
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightTransferTotal
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -55,34 +54,34 @@ 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'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId]                     = $response[$currencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $currencyId,
-                        'currency_code'    => $journal['currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$currencyId,
+                    'currency_code'    => $journal['currency_code'],
+                ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $foreignCurrencyId,
-                        'currency_code'    => $journal['foreign_currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_code'    => $journal['foreign_currency_code'],
+                ];
                 $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                    $response[$foreignCurrencyId]['difference'],
+                    app('steam')->positive($journal['foreign_amount'])
                 );
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
             }
         }
 
         return response()->json(array_values($response));
     }
-
 }

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

@@ -58,7 +58,7 @@ class TagController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/insight/insightTransferNoTag
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -77,30 +77,31 @@ class TagController extends Controller
         $genericSet = $collector->getExtractedJournals();
 
         foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
                 $response[$currencyId]                     = $response[$currencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $currencyId,
-                        'currency_code'    => $journal['currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$currencyId,
+                    'currency_code'    => $journal['currency_code'],
+                ];
                 $response[$currencyId]['difference']       = bcadd($response[$currencyId]['difference'], app('steam')->positive($journal['amount']));
-                $response[$currencyId]['difference_float'] = (float) $response[$currencyId]['difference'];
+                $response[$currencyId]['difference_float'] = (float)$response[$currencyId]['difference'];
             }
             if (0 !== $foreignCurrencyId) {
                 $response[$foreignCurrencyId]                     = $response[$foreignCurrencyId] ?? [
-                        'difference'       => '0',
-                        'difference_float' => 0,
-                        'currency_id'      => (string) $foreignCurrencyId,
-                        'currency_code'    => $journal['foreign_currency_code'],
-                    ];
+                    'difference'       => '0',
+                    'difference_float' => 0,
+                    'currency_id'      => (string)$foreignCurrencyId,
+                    'currency_code'    => $journal['foreign_currency_code'],
+                ];
                 $response[$foreignCurrencyId]['difference']       = bcadd(
-                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                    $response[$foreignCurrencyId]['difference'],
+                    app('steam')->positive($journal['foreign_amount'])
                 );
-                $response[$foreignCurrencyId]['difference_float'] = (float) $response[$foreignCurrencyId]['difference'];
+                $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
             }
         }
 
@@ -113,7 +114,7 @@ class TagController extends Controller
      *
      * Transfers per tag, possibly filtered by tag and account.
      *
-     * @param GenericRequest $request
+     * @param  GenericRequest  $request
      *
      * @return JsonResponse
      */
@@ -137,8 +138,8 @@ class TagController extends Controller
         $genericSet = $collector->getExtractedJournals();
         /** @var array $journal */
         foreach ($genericSet as $journal) {
-            $currencyId        = (int) $journal['currency_id'];
-            $foreignCurrencyId = (int) $journal['foreign_currency_id'];
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
 
             /** @var array $tag */
             foreach ($journal['tags'] as $tag) {
@@ -149,29 +150,30 @@ class TagController extends Controller
                 // on currency ID
                 if (0 !== $currencyId) {
                     $response[$key]                     = $response[$key] ?? [
-                            'id'               => (string) $tagId,
-                            'name'             => $tag['name'],
-                            'difference'       => '0',
-                            'difference_float' => 0,
-                            'currency_id'      => (string) $currencyId,
-                            'currency_code'    => $journal['currency_code'],
-                        ];
+                        'id'               => (string)$tagId,
+                        'name'             => $tag['name'],
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        '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
                 if (0 !== $foreignCurrencyId) {
                     $response[$foreignKey]                     = $journal[$foreignKey] ?? [
-                            'difference'       => '0',
-                            'difference_float' => 0,
-                            'currency_id'      => (string) $foreignCurrencyId,
-                            'currency_code'    => $journal['foreign_currency_code'],
-                        ];
+                        'difference'       => '0',
+                        'difference_float' => 0,
+                        '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'],
+                        app('steam')->positive($journal['foreign_amount'])
                     );
-                    $response[$foreignKey]['difference_float'] = (float) $response[$foreignKey]['difference'];
+                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference']; // intentional float
                 }
             }
         }

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

@@ -61,7 +61,7 @@ class DestroyController extends Controller
      *
      * Remove the specified resource from storage.
      *
-     * @param Account $account
+     * @param  Account  $account
      *
      * @codeCoverageIgnore
      * @return JsonResponse
@@ -69,6 +69,7 @@ class DestroyController extends Controller
     public function destroy(Account $account): JsonResponse
     {
         $this->repository->destroy($account, null);
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }

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

@@ -73,7 +73,7 @@ class ListController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/accounts/listAttachmentByAccount
      *
-     * @param Account $account
+     * @param  Account  $account
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -82,7 +82,7 @@ class ListController extends Controller
     public function attachments(Account $account): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection = $this->repository->getAttachments($account);
 
         $count       = $collection->count();
@@ -90,7 +90,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.accounts.attachments', [$account->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.accounts.attachments', [$account->id]).$this->buildParams());
 
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
@@ -106,7 +106,7 @@ class ListController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/accounts/listPiggyBankByAccount
      *
-     * @param Account $account
+     * @param  Account  $account
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -118,7 +118,7 @@ class ListController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getPiggyBanks($account);
@@ -127,7 +127,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.accounts.piggy_banks', [$account->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.accounts.piggy_banks', [$account->id]).$this->buildParams());
 
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);
@@ -137,7 +137,6 @@ class ListController extends Controller
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 
     /**
@@ -148,15 +147,15 @@ class ListController extends Controller
      *
      * @codeCoverageIgnore
      *
-     * @param Request $request
-     * @param Account $account
+     * @param  Request  $request
+     * @param  Account  $account
      *
      * @return JsonResponse
      * @throws FireflyException
      */
     public function transactions(Request $request, Account $account): JsonResponse
     {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -181,7 +180,7 @@ class ListController extends Controller
         }
 
         $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.accounts.transactions', [$account->id]).$this->buildParams());
         $groups = $paginator->getCollection();
 
         /** @var TransactionGroupTransformer $transformer */

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

@@ -71,7 +71,7 @@ class ShowController extends Controller
      *
      * Display a listing of the resource.
      *
-     * @param Request $request
+     * @param  Request  $request
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -85,7 +85,7 @@ class ShowController extends Controller
 
         // types to get, page size:
         $types    = $this->mapAccountTypes($this->parameters->get('type'));
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of accounts. Count it and split it.
         $this->repository->resetAccountOrder();
@@ -99,7 +99,7 @@ class ShowController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($accounts, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.accounts.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.accounts.index').$this->buildParams());
 
         /** @var AccountTransformer $transformer */
         $transformer = app(AccountTransformer::class);
@@ -117,7 +117,7 @@ class ShowController extends Controller
      *
      * Show single instance.
      *
-     * @param Account $account
+     * @param  Account  $account
      *
      * @return JsonResponse
      */
@@ -135,5 +135,4 @@ class ShowController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
 }

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

@@ -63,7 +63,7 @@ class StoreController extends Controller
      *
      * Store a new instance.
      *
-     * @param StoreRequest $request
+     * @param  StoreRequest  $request
      *
      * @return JsonResponse
      */
@@ -82,5 +82,4 @@ class StoreController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
 }

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

@@ -66,8 +66,8 @@ class UpdateController extends Controller
      *
      * Update account.
      *
-     * @param UpdateRequest $request
-     * @param Account       $account
+     * @param  UpdateRequest  $request
+     * @param  Account  $account
      *
      * @return JsonResponse
      */
@@ -75,7 +75,7 @@ class UpdateController extends Controller
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
         $data         = $request->getUpdateData();
-        $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
+        $data['type'] = config('firefly.shortNamesByFullName.'.$account->accountType->type);
         $account      = $this->repository->update($account, $data);
         $manager      = $this->getManager();
         $account->refresh();

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

@@ -66,13 +66,14 @@ class DestroyController extends Controller
      *
      * @codeCoverageIgnore
      *
-     * @param Attachment $attachment
+     * @param  Attachment  $attachment
      *
      * @return JsonResponse
      */
     public function destroy(Attachment $attachment): JsonResponse
     {
         $this->repository->destroy($attachment);
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }

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

@@ -71,7 +71,7 @@ class ShowController extends Controller
      *
      * Download an attachment.
      *
-     * @param Attachment $attachment
+     * @param  Attachment  $attachment
      *
      * @codeCoverageIgnore
      * @return LaravelResponse
@@ -97,13 +97,13 @@ class ShowController extends Controller
             $response
                 ->header('Content-Description', 'File Transfer')
                 ->header('Content-Type', 'application/octet-stream')
-                ->header('Content-Disposition', 'attachment; filename=' . $quoted)
+                ->header('Content-Disposition', 'attachment; filename='.$quoted)
                 ->header('Content-Transfer-Encoding', 'binary')
                 ->header('Connection', 'Keep-Alive')
                 ->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;
         }
@@ -125,7 +125,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of attachments. Count it and split it.
         $collection  = $this->repository->get();
@@ -134,7 +134,7 @@ class ShowController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.attachments.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.attachments.index').$this->buildParams());
 
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
@@ -152,7 +152,7 @@ class ShowController extends Controller
      *
      * Display the specified resource.
      *
-     * @param Attachment $attachment
+     * @param  Attachment  $attachment
      *
      * @return JsonResponse
      */

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

@@ -71,7 +71,7 @@ class StoreController extends Controller
      *
      * Store a newly created resource in storage.
      *
-     * @param StoreRequest $request
+     * @param  StoreRequest  $request
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -97,8 +97,8 @@ class StoreController extends Controller
      *
      * @codeCoverageIgnore
      *
-     * @param Request    $request
-     * @param Attachment $attachment
+     * @param  Request  $request
+     * @param  Attachment  $attachment
      *
      * @return JsonResponse
      */

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

@@ -67,8 +67,8 @@ class UpdateController extends Controller
      *
      * Update the specified resource in storage.
      *
-     * @param UpdateRequest $request
-     * @param Attachment    $attachment
+     * @param  UpdateRequest  $request
+     * @param  Attachment  $attachment
      *
      * @return JsonResponse
      */

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

@@ -1,77 +0,0 @@
-<?php
-/*
- * DestroyController.php
- * Copyright (c) 2021 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
-
-use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Models\AvailableBudget;
-use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-
-/**
- * Class DestroyController
- */
-class DestroyController extends Controller
-{
-    private AvailableBudgetRepositoryInterface $abRepository;
-
-    /**
-     * AvailableBudgetController constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user               = auth()->user();
-                $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
-                $this->abRepository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/available_budgets/listAvailableBudget
-     *
-     * Remove the specified resource from storage.
-     *
-     * @param AvailableBudget $availableBudget
-     *
-     * @codeCoverageIgnore
-     *
-     * @return JsonResponse
-     */
-    public function destroy(AvailableBudget $availableBudget): JsonResponse
-    {
-        $this->abRepository->destroyAvailableBudget($availableBudget);
-
-        return response()->json([], 204);
-    }
-}

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

@@ -77,7 +77,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         $start = $this->parameters->get('start');
         $end   = $this->parameters->get('end');
@@ -89,7 +89,7 @@ class ShowController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($availableBudgets, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.available_budgets.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.available_budgets.index').$this->buildParams());
 
         /** @var AvailableBudgetTransformer $transformer */
         $transformer = app(AvailableBudgetTransformer::class);
@@ -107,7 +107,7 @@ class ShowController extends Controller
      *
      * Display the specified resource.
      *
-     * @param AvailableBudget $availableBudget
+     * @param  AvailableBudget  $availableBudget
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -124,5 +124,4 @@ class ShowController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
 }

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

@@ -1,105 +0,0 @@
-<?php
-/*
- * StoreController.php
- * Copyright (c) 2021 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
-
-use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Models\AvailableBudget\Request;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Factory\TransactionCurrencyFactory;
-use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
-use FireflyIII\Transformers\AvailableBudgetTransformer;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-use JsonException;
-use League\Fractal\Resource\Item;
-
-/**
- * Class StoreController
- */
-class StoreController extends Controller
-{
-    private AvailableBudgetRepositoryInterface $abRepository;
-
-    /**
-     * AvailableBudgetController constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user               = auth()->user();
-                $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
-                $this->abRepository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/available_budgets/storeAvailableBudget
-     *
-     * Store a newly created resource in storage.
-     *
-     * @param Request $request
-     *
-     * @return JsonResponse
-     * @throws FireflyException
-     * @throws JsonException
-     */
-    public function store(Request $request): JsonResponse
-    {
-        $data = $request->getAll();
-        $data['start']->startOfDay();
-        $data['end']->endOfDay();
-
-        // currency is not mandatory:
-        if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
-            $factory             = app(TransactionCurrencyFactory::class);
-            $currency            = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null);
-            $data['currency_id'] = $currency->id;
-            unset($data['currency_code']);
-        }
-        if (!array_key_exists('currency_id', $data)) {
-            $currency            = app('amount')->getDefaultCurrencyByUser(auth()->user());
-            $data['currency_id'] = $currency->id;
-        }
-
-        $availableBudget = $this->abRepository->store($data);
-        $manager         = $this->getManager();
-
-        /** @var AvailableBudgetTransformer $transformer */
-        $transformer = app(AvailableBudgetTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($availableBudget, $transformer, 'available_budgets');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-    }
-}

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

@@ -1,100 +0,0 @@
-<?php
-/*
- * UpdateController.php
- * Copyright (c) 2021 james@firefly-iii.org
- *
- * This file is part of Firefly III (https://github.com/firefly-iii).
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
-
-use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Api\V1\Requests\Models\AvailableBudget\Request;
-use FireflyIII\Factory\TransactionCurrencyFactory;
-use FireflyIII\Models\AvailableBudget;
-use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
-use FireflyIII\Transformers\AvailableBudgetTransformer;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-use League\Fractal\Resource\Item;
-
-/**
- * Class UpdateController
- */
-class UpdateController extends Controller
-{
-    private AvailableBudgetRepositoryInterface $abRepository;
-
-    /**
-     * AvailableBudgetController constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user               = auth()->user();
-                $this->abRepository = app(AvailableBudgetRepositoryInterface::class);
-                $this->abRepository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-
-    /**
-     * This endpoint is documented at:
-     * https://api-docs.firefly-iii.org/#/available_budgets/updateAvailableBudget
-     *
-     * Update the specified resource in storage.
-     *
-     * @param Request         $request
-     * @param AvailableBudget $availableBudget
-     *
-     * @return JsonResponse
-     */
-    public function update(Request $request, AvailableBudget $availableBudget): JsonResponse
-    {
-        $data = $request->getAll();
-
-        // find and validate currency ID
-        if (array_key_exists('currency_id', $data) || array_key_exists('currency_code', $data)) {
-            $factory           = app(TransactionCurrencyFactory::class);
-            $currency          = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null) ?? app('amount')->getDefaultCurrency();
-            $currency->enabled = true;
-            $currency->save();
-            unset($data['currency_code']);
-            $data['currency_id'] = $currency->id;
-        }
-
-        $this->abRepository->updateAvailableBudget($availableBudget, $data);
-        $manager = $this->getManager();
-
-        /** @var AvailableBudgetTransformer $transformer */
-        $transformer = app(AvailableBudgetTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($availableBudget, $transformer, 'available_budgets');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
-    }
-}

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

@@ -59,7 +59,7 @@ class DestroyController extends Controller
      *
      * Remove the specified resource from storage.
      *
-     * @param Bill $bill
+     * @param  Bill  $bill
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -67,8 +67,8 @@ class DestroyController extends Controller
     public function destroy(Bill $bill): JsonResponse
     {
         $this->repository->destroy($bill);
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }
-
 }

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

@@ -72,7 +72,7 @@ class ListController extends Controller
      *
      * Display a listing of the resource.
      *
-     * @param Bill $bill
+     * @param  Bill  $bill
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -81,7 +81,7 @@ class ListController extends Controller
     public function attachments(Bill $bill): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection = $this->repository->getAttachments($bill);
 
         $count       = $collection->count();
@@ -89,7 +89,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.bills.attachments', [$bill->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.bills.attachments', [$bill->id]).$this->buildParams());
 
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
@@ -107,7 +107,7 @@ class ListController extends Controller
      *
      * List all of them.
      *
-     * @param Bill $bill
+     * @param  Bill  $bill
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -118,7 +118,7 @@ class ListController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getRulesForBill($bill);
@@ -127,7 +127,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.bills.rules', [$bill->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.bills.rules', [$bill->id]).$this->buildParams());
 
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
@@ -136,7 +136,6 @@ class ListController extends Controller
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 
     /**
@@ -145,9 +144,9 @@ class ListController extends Controller
      *
      * Show all transactions.
      *
-     * @param Request $request
+     * @param  Request  $request
      *
-     * @param Bill    $bill
+     * @param  Bill  $bill
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -155,7 +154,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Bill $bill): JsonResponse
     {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -188,7 +187,7 @@ class ListController extends Controller
 
         // get paginator.
         $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.bills.transactions', [$bill->id]).$this->buildParams());
         $transactions = $paginator->getCollection();
 
         /** @var TransactionGroupTransformer $transformer */
@@ -200,5 +199,4 @@ class ListController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
 }

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

@@ -74,7 +74,7 @@ class ShowController extends Controller
         $this->repository->correctOrder();
         $bills     = $this->repository->getBills();
         $manager   = $this->getManager();
-        $pageSize  = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize  = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $count     = $bills->count();
         $bills     = $bills->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
@@ -95,7 +95,7 @@ class ShowController extends Controller
      *
      * Show the specified bill.
      *
-     * @param Bill $bill
+     * @param  Bill  $bill
      *
      * @return JsonResponse
      * @codeCoverageIgnore

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

@@ -65,7 +65,7 @@ class StoreController extends Controller
      *
      * Store a bill.
      *
-     * @param StoreRequest $request
+     * @param  StoreRequest  $request
      *
      * @return JsonResponse
      * @throws FireflyException

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

@@ -62,8 +62,8 @@ class UpdateController extends Controller
      *
      * Update a bill.
      *
-     * @param UpdateRequest $request
-     * @param Bill          $bill
+     * @param  UpdateRequest  $request
+     * @param  Bill  $bill
      *
      * @return JsonResponse
      */
@@ -80,7 +80,5 @@ class UpdateController extends Controller
         $resource = new Item($bill, $transformer, 'bills');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
-
 }

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

@@ -59,7 +59,7 @@ class DestroyController extends Controller
      *
      * Remove the specified resource from storage.
      *
-     * @param Budget $budget
+     * @param  Budget  $budget
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -67,6 +67,7 @@ class DestroyController extends Controller
     public function destroy(Budget $budget): JsonResponse
     {
         $this->repository->destroy($budget);
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }

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

@@ -74,7 +74,7 @@ class ListController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/budgets/listAttachmentByBudget
      *
-     * @param Budget $budget
+     * @param  Budget  $budget
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -83,7 +83,7 @@ class ListController extends Controller
     public function attachments(Budget $budget): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection = $this->repository->getAttachments($budget);
 
         $count       = $collection->count();
@@ -91,7 +91,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budgets.attachments', [$budget->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.budgets.attachments', [$budget->id]).$this->buildParams());
 
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
@@ -109,7 +109,7 @@ class ListController extends Controller
      *
      * Display a listing of the resource.
      *
-     * @param Budget $budget
+     * @param  Budget  $budget
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -118,13 +118,13 @@ class ListController extends Controller
     public function budgetLimits(Budget $budget): JsonResponse
     {
         $manager  = $this->getManager();
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $this->parameters->set('budget_id', $budget->id);
         $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.budgets.budget_limits', [$budget->id]).$this->buildParams());
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
@@ -141,9 +141,9 @@ class ListController extends Controller
      *
      * Show all transactions.
      *
-     * @param Request $request
+     * @param  Request  $request
      *
-     * @param Budget  $budget
+     * @param  Budget  $budget
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -151,7 +151,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Budget $budget): JsonResponse
     {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // user can overrule page size with limit parameter.
         $limit = $this->parameters->get('limit');
@@ -189,7 +189,7 @@ class ListController extends Controller
         }
 
         $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.budgets.transactions', [$budget->id]).$this->buildParams());
         $transactions = $paginator->getCollection();
 
         /** @var TransactionGroupTransformer $transformer */
@@ -207,7 +207,7 @@ class ListController extends Controller
      *
      * Show all transactions.
      *
-     * @param Request $request
+     * @param  Request  $request
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -215,7 +215,7 @@ class ListController extends Controller
      */
     public function withoutBudget(Request $request): JsonResponse
     {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // user can overrule page size with limit parameter.
         $limit = $this->parameters->get('limit');
@@ -253,7 +253,7 @@ class ListController extends Controller
         }
 
         $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.budgets.without-budget') . $this->buildParams());
+        $paginator->setPath(route('api.v1.budgets.without-budget').$this->buildParams());
         $transactions = $paginator->getCollection();
 
         /** @var TransactionGroupTransformer $transformer */
@@ -264,5 +264,4 @@ class ListController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
 }

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

@@ -78,7 +78,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getBudgets();
@@ -87,7 +87,7 @@ class ShowController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($budgets, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budgets.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.budgets.index').$this->buildParams());
 
         /** @var BudgetTransformer $transformer */
         $transformer = app(BudgetTransformer::class);
@@ -102,7 +102,7 @@ class ShowController extends Controller
     /**
      * Show a budget.
      *
-     * @param Budget $budget
+     * @param  Budget  $budget
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -119,5 +119,4 @@ class ShowController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
 }

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

@@ -62,7 +62,7 @@ class StoreController extends Controller
      *
      * Store a budget.
      *
-     * @param StoreRequest $request
+     * @param  StoreRequest  $request
      *
      * @return JsonResponse
      * @throws FireflyException

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

@@ -62,8 +62,8 @@ class UpdateController extends Controller
      *
      * Update a budget.
      *
-     * @param UpdateRequest $request
-     * @param Budget        $budget
+     * @param  UpdateRequest  $request
+     * @param  Budget  $budget
      *
      * @return JsonResponse
      */
@@ -80,6 +80,5 @@ class UpdateController extends Controller
         $resource = new Item($budget, $transformer, 'budgets');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 }

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

@@ -64,8 +64,8 @@ class DestroyController extends Controller
      *
      * Remove the specified resource from storage.
      *
-     * @param Budget      $budget
-     * @param BudgetLimit $budgetLimit
+     * @param  Budget  $budget
+     * @param  BudgetLimit  $budgetLimit
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -77,6 +77,7 @@ class DestroyController extends Controller
             throw new FireflyException('20028: The budget limit does not belong to the budget.');
         }
         $this->blRepository->destroyBudgetLimit($budgetLimit);
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }

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

@@ -71,9 +71,9 @@ class ListController extends Controller
      * https://api-docs.firefly-iii.org/#/budgets/listTransactionByBudgetLimit
      * Show all transactions.
      *
-     * @param Request     $request
-     * @param Budget      $budget
-     * @param BudgetLimit $budgetLimit
+     * @param  Request  $request
+     * @param  Budget  $budget
+     * @param  BudgetLimit  $budgetLimit
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -81,7 +81,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -110,7 +110,7 @@ class ListController extends Controller
         $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date);
         $collector->setTypes($types);
         $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.budgets.limits.transactions', [$budget->id, $budgetLimit->id]).$this->buildParams());
         $transactions = $paginator->getCollection();
 
         /** @var TransactionGroupTransformer $transformer */

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

@@ -75,8 +75,8 @@ class ShowController extends Controller
      *
      * Display a listing of the budget limits for this budget.
      *
-     * @param Request $request
-     * @param Budget  $budget
+     * @param  Request  $request
+     * @param  Budget  $budget
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -86,12 +86,12 @@ class ShowController extends Controller
     {
         $manager = $this->getManager();
         $manager->parseIncludes('budget');
-        $pageSize     = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection   = $this->blRepository->getBudgetLimits($budget, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.budgets.limits.index', [$budget->id]).$this->buildParams());
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
@@ -109,7 +109,7 @@ class ShowController extends Controller
      *
      * Display a listing of the budget limits for this budget.
      *
-     * @param DateRequest $request
+     * @param  DateRequest  $request
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -119,12 +119,12 @@ class ShowController extends Controller
     {
         $manager = $this->getManager();
         $manager->parseIncludes('budget');
-        $pageSize     = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection   = $this->blRepository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.budget-limits.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.budget-limits.index').$this->buildParams());
 
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
@@ -140,16 +140,16 @@ class ShowController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/budgets/getBudgetLimit
      *
-     * @param Request     $request
-     * @param Budget      $budget
-     * @param BudgetLimit $budgetLimit
+     * @param  Request  $request
+     * @param  Budget  $budget
+     * @param  BudgetLimit  $budgetLimit
      *
      * @return JsonResponse
      * @throws FireflyException
      */
     public function show(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {
-        if ((int) $budget->id !== (int) $budgetLimit->budget_id) {
+        if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
             throw new FireflyException('20028: The budget limit does not belong to the budget.');
         }
         // continue!
@@ -163,5 +163,4 @@ class ShowController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
 }

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

@@ -65,8 +65,8 @@ class StoreController extends Controller
      *
      * Store a newly created resource in storage.
      *
-     * @param StoreRequest $request
-     * @param Budget       $budget
+     * @param  StoreRequest  $request
+     * @param  Budget  $budget
      *
      * @return JsonResponse
      */

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

@@ -67,17 +67,16 @@ class UpdateController extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param UpdateRequest $request
-     * @param Budget        $budget
-     * @param BudgetLimit   $budgetLimit
+     * @param  UpdateRequest  $request
+     * @param  Budget  $budget
+     * @param  BudgetLimit  $budgetLimit
      *
      * @return JsonResponse
      * @throws FireflyException
      */
     public function update(UpdateRequest $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
     {
-
-        if ((int) $budget->id !== (int) $budgetLimit->budget_id) {
+        if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
             throw new FireflyException('20028: The budget limit does not belong to the budget.');
         }
         $data              = $request->getAll();
@@ -92,6 +91,5 @@ class UpdateController extends Controller
         $resource = new Item($budgetLimit, $transformer, 'budget_limits');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 }

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

@@ -59,7 +59,7 @@ class DestroyController extends Controller
      *
      * Remove the specified resource from storage.
      *
-     * @param Category $category
+     * @param  Category  $category
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -67,6 +67,7 @@ class DestroyController extends Controller
     public function destroy(Category $category): JsonResponse
     {
         $this->repository->destroy($category);
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }

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

@@ -69,7 +69,7 @@ class ListController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/categories/listAttachmentByCategory
      *
-     * @param Category $category
+     * @param  Category  $category
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -78,7 +78,7 @@ class ListController extends Controller
     public function attachments(Category $category): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection = $this->repository->getAttachments($category);
 
         $count       = $collection->count();
@@ -86,7 +86,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.categories.attachments', [$category->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.categories.attachments', [$category->id]).$this->buildParams());
 
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
@@ -104,9 +104,9 @@ class ListController extends Controller
      *
      * Show all transactions.
      *
-     * @param Request  $request
+     * @param  Request  $request
      *
-     * @param Category $category
+     * @param  Category  $category
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -114,7 +114,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Category $category): JsonResponse
     {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -145,7 +145,7 @@ class ListController extends Controller
         }
 
         $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.categories.transactions', [$category->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.categories.transactions', [$category->id]).$this->buildParams());
         $transactions = $paginator->getCollection();
 
         /** @var TransactionGroupTransformer $transformer */
@@ -157,5 +157,4 @@ class ListController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
 }

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

@@ -74,7 +74,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getCategories();
@@ -83,7 +83,7 @@ class ShowController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($categories, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.categories.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.categories.index').$this->buildParams());
 
         /** @var CategoryTransformer $transformer */
         $transformer = app(CategoryTransformer::class);
@@ -100,7 +100,7 @@ class ShowController extends Controller
      *
      * Show the category.
      *
-     * @param Category $category
+     * @param  Category  $category
      *
      * @return JsonResponse
      * @codeCoverageIgnore

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

@@ -62,7 +62,7 @@ class StoreController extends Controller
      *
      * Store new category.
      *
-     * @param StoreRequest $request
+     * @param  StoreRequest  $request
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -80,5 +80,4 @@ class StoreController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
 }

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

@@ -62,8 +62,8 @@ class UpdateController extends Controller
      *
      * Update the category.
      *
-     * @param UpdateRequest $request
-     * @param Category      $category
+     * @param  UpdateRequest  $request
+     * @param  Category  $category
      *
      * @return JsonResponse
      */
@@ -80,6 +80,5 @@ class UpdateController extends Controller
         $resource = new Item($category, $transformer, 'categories');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 }

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

@@ -62,7 +62,7 @@ class DestroyController extends Controller
      *
      * Remove the specified resource from storage.
      *
-     * @param ObjectGroup $objectGroup
+     * @param  ObjectGroup  $objectGroup
      *
      * @codeCoverageIgnore
      * @return JsonResponse
@@ -70,6 +70,7 @@ class DestroyController extends Controller
     public function destroy(ObjectGroup $objectGroup): JsonResponse
     {
         $this->repository->destroy($objectGroup);
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }

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

@@ -68,7 +68,7 @@ class ListController extends Controller
      *
      * List all bills in this object group
      *
-     * @param ObjectGroup $objectGroup
+     * @param  ObjectGroup  $objectGroup
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -78,7 +78,7 @@ class ListController extends Controller
     {
         $manager = $this->getManager();
 
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         // get list of piggy banks. Count it and split it.
         $collection = $this->repository->getBills($objectGroup);
         $count      = $collection->count();
@@ -86,7 +86,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]).$this->buildParams());
 
         /** @var BillTransformer $transformer */
         $transformer = app(BillTransformer::class);
@@ -104,7 +104,7 @@ class ListController extends Controller
      *
      * List all piggies under the object group.
      *
-     * @param ObjectGroup $objectGroup
+     * @param  ObjectGroup  $objectGroup
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -116,7 +116,7 @@ class ListController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of piggy banks. Count it and split it.
         $collection = $this->repository->getPiggyBanks($objectGroup);
@@ -125,7 +125,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.object-groups.piggy_banks', [$objectGroup->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.object-groups.piggy_banks', [$objectGroup->id]).$this->buildParams());
 
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);
@@ -135,6 +135,5 @@ class ListController extends Controller
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 }

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

@@ -69,7 +69,7 @@ class ShowController extends Controller
      *
      * Display a listing of the resource.
      *
-     * @param Request $request
+     * @param  Request  $request
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -80,7 +80,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         $this->repository->resetOrder();
         $collection   = $this->repository->get();
@@ -89,7 +89,7 @@ class ShowController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($objectGroups, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.object-groups.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.object-groups.index').$this->buildParams());
 
         /** @var ObjectGroupTransformer $transformer */
         $transformer = app(ObjectGroupTransformer::class);
@@ -107,7 +107,7 @@ class ShowController extends Controller
      *
      * Show single instance.
      *
-     * @param ObjectGroup $objectGroup
+     * @param  ObjectGroup  $objectGroup
      *
      * @return JsonResponse
      */

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

@@ -63,8 +63,8 @@ class UpdateController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/object_groups/updateObjectGroup
      *
-     * @param UpdateRequest $request
-     * @param ObjectGroup   $objectGroup
+     * @param  UpdateRequest  $request
+     * @param  ObjectGroup  $objectGroup
      *
      * @return JsonResponse
      */

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

@@ -59,7 +59,7 @@ class DestroyController extends Controller
      *
      * Delete the resource.
      *
-     * @param PiggyBank $piggyBank
+     * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -67,6 +67,7 @@ class DestroyController extends Controller
     public function destroy(PiggyBank $piggyBank): JsonResponse
     {
         $this->repository->destroy($piggyBank);
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }

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

@@ -63,7 +63,7 @@ class ListController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/piggy_banks/listAttachmentByPiggyBank
      *
-     * @param PiggyBank $piggyBank
+     * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -72,7 +72,7 @@ class ListController extends Controller
     public function attachments(PiggyBank $piggyBank): JsonResponse
     {
         $manager    = $this->getManager();
-        $pageSize   = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $collection = $this->repository->getAttachments($piggyBank);
 
         $count       = $collection->count();
@@ -80,7 +80,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($attachments, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.piggy_banks.attachments', [$piggyBank->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.piggy_banks.attachments', [$piggyBank->id]).$this->buildParams());
 
         /** @var AttachmentTransformer $transformer */
         $transformer = app(AttachmentTransformer::class);
@@ -98,7 +98,7 @@ class ListController extends Controller
      *
      * List single resource.
      *
-     * @param PiggyBank $piggyBank
+     * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -107,7 +107,7 @@ class ListController extends Controller
     public function piggyBankEvents(PiggyBank $piggyBank): JsonResponse
     {
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $manager  = $this->getManager();
 
         $collection = $this->repository->getEvents($piggyBank);
@@ -116,7 +116,7 @@ class ListController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.piggy_banks.events', [$piggyBank->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.piggy_banks.events', [$piggyBank->id]).$this->buildParams());
 
         /** @var PiggyBankEventTransformer $transformer */
         $transformer = app(PiggyBankEventTransformer::class);
@@ -126,6 +126,5 @@ class ListController extends Controller
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 }

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

@@ -73,7 +73,7 @@ class ShowController extends Controller
     {
         $manager = $this->getManager();
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->getPiggyBanks();
@@ -82,7 +82,7 @@ class ShowController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.piggy_banks.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.piggy_banks.index').$this->buildParams());
 
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);
@@ -92,7 +92,6 @@ class ShowController extends Controller
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 
     /**
@@ -101,7 +100,7 @@ class ShowController extends Controller
      *
      * List single resource.
      *
-     * @param PiggyBank $piggyBank
+     * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -117,6 +116,5 @@ class ShowController extends Controller
         $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 }

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

@@ -62,7 +62,7 @@ class StoreController extends Controller
      *
      * Store new object.
      *
-     * @param StoreRequest $request
+     * @param  StoreRequest  $request
      *
      * @return JsonResponse
      * @throws FireflyException

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

@@ -62,8 +62,8 @@ class UpdateController extends Controller
      *
      * Update piggy bank.
      *
-     * @param UpdateRequest $request
-     * @param PiggyBank     $piggyBank
+     * @param  UpdateRequest  $request
+     * @param  PiggyBank  $piggyBank
      *
      * @return JsonResponse
      */
@@ -84,6 +84,5 @@ class UpdateController extends Controller
         $resource = new Item($piggyBank, $transformer, 'piggy_banks');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 }

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

@@ -59,7 +59,7 @@ class DestroyController extends Controller
      *
      * Delete the resource.
      *
-     * @param Recurrence $recurrence
+     * @param  Recurrence  $recurrence
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -67,6 +67,7 @@ class DestroyController extends Controller
     public function destroy(Recurrence $recurrence): JsonResponse
     {
         $this->repository->destroy($recurrence);
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }

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

@@ -69,8 +69,8 @@ class ListController extends Controller
      *
      * Show transactions for this recurrence.
      *
-     * @param Request    $request
-     * @param Recurrence $recurrence
+     * @param  Request  $request
+     * @param  Recurrence  $recurrence
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -78,7 +78,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Recurrence $recurrence): JsonResponse
     {
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
@@ -110,7 +110,7 @@ class ListController extends Controller
             $collector->setRange($this->parameters->get('start'), $this->parameters->get('end'));
         }
         $paginator = $collector->getPaginatedGroups();
-        $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.transactions.index').$this->buildParams());
         $transactions = $paginator->getCollection();
 
         /** @var TransactionGroupTransformer $transformer */

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

@@ -74,7 +74,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->repository->get();
@@ -83,7 +83,7 @@ class ShowController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($piggyBanks, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.recurrences.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.recurrences.index').$this->buildParams());
 
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
@@ -93,7 +93,6 @@ class ShowController extends Controller
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 
     /**
@@ -102,7 +101,7 @@ class ShowController extends Controller
      *
      * List single resource.
      *
-     * @param Recurrence $recurrence
+     * @param  Recurrence  $recurrence
      *
      * @return JsonResponse
      * @codeCoverageIgnore

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

@@ -62,7 +62,7 @@ class StoreController extends Controller
      *
      * Store new object.
      *
-     * @param StoreRequest $request
+     * @param  StoreRequest  $request
      *
      * @return JsonResponse
      * @throws FireflyException

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

@@ -62,8 +62,8 @@ class UpdateController extends Controller
      *
      * Update single recurrence.
      *
-     * @param UpdateRequest $request
-     * @param Recurrence    $recurrence
+     * @param  UpdateRequest  $request
+     * @param  Recurrence  $recurrence
      *
      * @return JsonResponse
      */
@@ -80,6 +80,5 @@ class UpdateController extends Controller
         $resource = new Item($recurrence, $transformer, 'recurrences');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 }

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

@@ -63,7 +63,7 @@ class DestroyController extends Controller
      *
      * Delete the resource.
      *
-     * @param Rule $rule
+     * @param  Rule  $rule
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -71,6 +71,7 @@ class DestroyController extends Controller
     public function destroy(Rule $rule): JsonResponse
     {
         $this->ruleRepository->destroy($rule);
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }

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

@@ -78,7 +78,7 @@ class ShowController extends Controller
         $manager = $this->getManager();
 
         // types to get, page size:
-        $pageSize = (int) app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of budgets. Count it and split it.
         $collection = $this->ruleRepository->getAll();
@@ -87,7 +87,7 @@ class ShowController extends Controller
 
         // make paginator:
         $paginator = new LengthAwarePaginator($rules, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.rules.index') . $this->buildParams());
+        $paginator->setPath(route('api.v1.rules.index').$this->buildParams());
 
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
@@ -97,7 +97,6 @@ class ShowController extends Controller
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 
     /**
@@ -106,7 +105,7 @@ class ShowController extends Controller
      *
      * List single resource.
      *
-     * @param Rule $rule
+     * @param  Rule  $rule
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -121,6 +120,5 @@ class ShowController extends Controller
         $resource = new Item($rule, $transformer, 'rules');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-
     }
 }

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

@@ -65,7 +65,7 @@ class StoreController extends Controller
      *
      * Store new object.
      *
-     * @param StoreRequest $request
+     * @param  StoreRequest  $request
      *
      * @return JsonResponse
      */

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

@@ -69,8 +69,8 @@ class TriggerController extends Controller
      * This endpoint is documented at:
      * https://api-docs.firefly-iii.org/#/rules/testRule
      *
-     * @param TestRequest $request
-     * @param Rule        $rule
+     * @param  TestRequest  $request
+     * @param  Rule  $rule
      *
      * @return JsonResponse
      */
@@ -101,7 +101,7 @@ class TriggerController extends Controller
         $count        = $transactions->count();
 
         $paginator = new LengthAwarePaginator($transactions, $count, 31337, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.rules.test', [$rule->id]) . $this->buildParams());
+        $paginator->setPath(route('api.v1.rules.test', [$rule->id]).$this->buildParams());
 
         // resulting list is presented as JSON thing.
         $manager = $this->getManager();
@@ -121,8 +121,8 @@ class TriggerController extends Controller
      *
      * Execute the given rule group on a set of existing transactions.
      *
-     * @param TriggerRequest $request
-     * @param Rule           $rule
+     * @param  TriggerRequest  $request
+     * @param  Rule  $rule
      *
      * @return JsonResponse
      */

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

@@ -66,8 +66,8 @@ class UpdateController extends Controller
      *
      * Update a rule.
      *
-     * @param UpdateRequest $request
-     * @param Rule          $rule
+     * @param  UpdateRequest  $request
+     * @param  Rule  $rule
      *
      * @return JsonResponse
      */

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

@@ -63,7 +63,7 @@ class DestroyController extends Controller
      *
      * Delete the resource.
      *
-     * @param RuleGroup $ruleGroup
+     * @param  RuleGroup  $ruleGroup
      *
      * @return JsonResponse
      * @codeCoverageIgnore
@@ -71,6 +71,7 @@ class DestroyController extends Controller
     public function destroy(RuleGroup $ruleGroup): JsonResponse
     {
         $this->ruleGroupRepository->destroy($ruleGroup, null);
+        app('preferences')->mark();
 
         return response()->json([], 204);
     }