Merge branch 'release/5.5.11' into main

Bump league/commonmark from 1.5.8 to 1.6.0

.ci/phpstan.neon

@@ -10,6 +10,19 @@ parameters:
     - '#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#'
+    -
+        message: '#Function compact\(\) should not be used.#'
+        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/ExpandedForm.php
+            - ../app/Generator/Report
   paths:
     - ../app
     - ../database
@@ -17,4 +30,4 @@ parameters:
     - ../bootstrap/app.php
 
   # The level 8 is the highest level. original was 5
-  level: 5
+  level: 3

.ci/phpstan.sh

@@ -21,12 +21,13 @@
 #
 
 # Install composer packages
-composer install --no-scripts --no-ansi
+#composer install --no-scripts --no-ansi
 
 # enable test .env file.
 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 --no-progress
+./vendor/bin/phpstan analyse -c .ci/phpstan.neon
 
 exit 0

.ci/phpunit.sh

@@ -24,6 +24,7 @@
 cp .ci/.env.ci ../.env
 
 # download test database
+# TODO no longer exists
 wget --quiet https://raw.githubusercontent.com/firefly-iii/test-data/main/test_db.sqlite -o storage/database/test_db.sqlite
 
 # run phpunit

.env.example

@@ -64,7 +64,7 @@ AUDIT_LOG_LEVEL=info
 # Use "mysql" for MySQL and MariaDB.
 # Use "sqlite" for SQLite.
 DB_CONNECTION=mysql
-DB_HOST=fireflyiiidb
+DB_HOST=db
 DB_PORT=3306
 DB_DATABASE=firefly
 DB_USERNAME=firefly
@@ -155,8 +155,16 @@ SEND_REPORT_JOURNALS=true
 
 # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
 # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
+# Take note: it is no longer necessary to set this value, and it will be removed in future versions.
 MAPBOX_API_KEY=
 
+#
+# Instead of the mapbox API key, just set this value to true if you want to set the location
+# of certain things, like transactions. Since this involves an external service, it's optional
+# and disabled by default.
+#
+ENABLE_EXTERNAL_MAP=false
+
 # The map will default to this location:
 MAP_DEFAULT_LAT=51.983333
 MAP_DEFAULT_LONG=5.916667
@@ -167,6 +175,10 @@ MAP_DEFAULT_ZOOM=6
 # For full instructions on these settings please visit:
 # https://docs.firefly-iii.org/advanced-installation/authentication
 # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
+#
+# If you enable 'ldap' AND you run Docker, the Docker image will contact packagist.org
+# This is necessary to download the required packages.
+#
 LOGIN_PROVIDER=eloquent
 
 # It's also possible to change the way users are authenticated. You could use Authelia for example.
@@ -320,6 +332,7 @@ BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
 CACHE_PREFIX=firefly
 PUSHER_KEY=
+IPINFO_TOKEN=
 PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=

.github/lock.yml

@@ -1,35 +0,0 @@
-# Configuration for Lock Threads - https://github.com/dessant/lock-threads
-
-# Number of days of inactivity before a closed issue or pull request is locked
-daysUntilLock: 90
-
-# Skip issues and pull requests created before a given timestamp. Timestamp must
-# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
-skipCreatedBefore: false
-
-# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
-exemptLabels: []
-
-# Label to add before locking, such as `outdated`. Set to `false` to disable
-lockLabel: false
-
-# Comment to post before locking. Set to `false` to disable
-lockComment: false
-
-# Assign `resolved` as the reason for locking. Set to `false` to disable
-setLockReason: true
-
-# Limit to only `issues` or `pulls`
-# only: issues
-
-# Optionally, specify configuration settings just for `issues` or `pulls`
-# issues:
-#   exemptLabels:
-#     - help-wanted
-#   lockLabel: outdated
-
-# pulls:
-#   daysUntilLock: 30
-
-# Repository to extend settings from
-# _extends: repo

.github/workflows/lock.yml

@@ -0,0 +1,19 @@
+name: Lock old issues
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2
+        with:
+          github-token: ${{ github.token }}
+          issue-lock-inactive-days: '90'
+          issue-lock-comment: >
+            This issue has been automatically locked since there
+            has not been any recent activity after it was closed.
+            Please open a new issue for related bugs.

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\Account;
@@ -43,7 +42,6 @@ class AccountController extends Controller
     private array                      $balanceTypes;
     private AccountRepositoryInterface $repository;
 
-
     /**
      * AccountController constructor.
      */
@@ -104,8 +102,6 @@ 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);

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\Bill;
@@ -38,7 +37,6 @@ class BillController extends Controller
 {
     private BillRepositoryInterface $repository;
 
-
     /**
      * BillController constructor.
      */
@@ -75,7 +73,6 @@ class BillController extends Controller
             }
         );
 
-
         return response()->json($filtered->toArray());
     }
 

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\Budget;
@@ -38,7 +37,6 @@ class BudgetController extends Controller
 {
     private BudgetRepositoryInterface $repository;
 
-
     /**
      * BudgetController constructor.
      */

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

@@ -37,7 +37,6 @@ class CategoryController extends Controller
 {
     private CategoryRepositoryInterface $repository;
 
-
     /**
      * CategoryController constructor.
      */

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\TransactionCurrency;
@@ -38,7 +37,6 @@ class CurrencyController extends Controller
 {
     private CurrencyRepositoryInterface $repository;
 
-
     /**
      * CurrencyController constructor.
      */
@@ -62,7 +60,7 @@ class CurrencyController extends Controller
      *
      * @return JsonResponse
      */
-    public function currenciesWithCode(AutocompleteRequest $request): JsonResponse
+    public function currencies(AutocompleteRequest $request): JsonResponse
     {
         $data       = $request->getData();
         $collection = $this->repository->searchCurrency($data['query'], $data['limit']);
@@ -71,8 +69,8 @@ class CurrencyController extends Controller
         /** @var TransactionCurrency $currency */
         foreach ($collection as $currency) {
             $result[] = [
-                'id'             => (string) $currency->id,
-                'name'           => sprintf('%s (%s)', $currency->name, $currency->code),
+                'id'             => (string)$currency->id,
+                'name'           => $currency->name,
                 'code'           => $currency->code,
                 'symbol'         => $currency->symbol,
                 'decimal_places' => $currency->decimal_places,
@@ -87,7 +85,7 @@ class CurrencyController extends Controller
      *
      * @return JsonResponse
      */
-    public function currencies(AutocompleteRequest $request): JsonResponse
+    public function currenciesWithCode(AutocompleteRequest $request): JsonResponse
     {
         $data       = $request->getData();
         $collection = $this->repository->searchCurrency($data['query'], $data['limit']);
@@ -96,8 +94,8 @@ class CurrencyController extends Controller
         /** @var TransactionCurrency $currency */
         foreach ($collection as $currency) {
             $result[] = [
-                'id'             => (string) $currency->id,
-                'name'           => $currency->name,
+                'id'             => (string)$currency->id,
+                'name'           => sprintf('%s (%s)', $currency->name, $currency->code),
                 'code'           => $currency->code,
                 'symbol'         => $currency->symbol,
                 'decimal_places' => $currency->decimal_places,

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\ObjectGroup;
@@ -38,7 +37,6 @@ class ObjectGroupController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
 
-
     /**
      * CurrencyController constructor.
      */
@@ -68,7 +66,7 @@ class ObjectGroupController extends Controller
         $return = [];
         $result = $this->repository->search($data['query'], $data['limit']);
 
-        /** @var ObjectGroup $account */
+        /** @var ObjectGroup $objectGroup */
         foreach ($result as $objectGroup) {
             $return[] = [
                 'id'    => (string)$objectGroup->id,

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\PiggyBank;
@@ -37,11 +36,9 @@ use Illuminate\Http\JsonResponse;
  */
 class PiggyBankController extends Controller
 {
+    private AccountRepositoryInterface $accountRepository;
     private PiggyBankRepositoryInterface $piggyRepository;
 
-    private AccountRepositoryInterface   $accountRepository;
-
-
     /**
      * PiggyBankController constructor.
      */

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\Rule;
@@ -37,7 +36,6 @@ class RecurrenceController extends Controller
 {
     private RecurringRepositoryInterface $repository;
 
-
     /**
      * RecurrenceController constructor.
      */

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\Rule;
@@ -37,7 +36,6 @@ class RuleController extends Controller
 {
     private RuleRepositoryInterface $repository;
 
-
     /**
      * RuleController constructor.
      */
@@ -62,7 +60,7 @@ class RuleController extends Controller
     public function rules(AutocompleteRequest $request): JsonResponse
     {
         $data     = $request->getData();
-        $rules   = $this->repository->searchRule($data['query'], $data['limit']);
+        $rules    = $this->repository->searchRule($data['query'], $data['limit']);
         $response = [];
 
         /** @var Rule $rule */

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\RuleGroup;
@@ -37,7 +36,6 @@ class RuleGroupController extends Controller
 {
     private RuleGroupRepositoryInterface $repository;
 
-
     /**
      * RuleGroupController constructor.
      */

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\Tag;
@@ -38,7 +37,6 @@ class TagController extends Controller
 {
     private TagRepositoryInterface $repository;
 
-
     /**
      * TagController constructor.
      */

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\TransactionJournal;
@@ -38,10 +37,8 @@ use Illuminate\Support\Collection;
  */
 class TransactionController extends Controller
 {
-    private JournalRepositoryInterface          $repository;
-
     private TransactionGroupRepositoryInterface $groupRepository;
-
+    private JournalRepositoryInterface          $repository;
 
     /**
      * TransactionController constructor.
@@ -63,7 +60,6 @@ class TransactionController extends Controller
         );
     }
 
-
     /**
      * @param AutocompleteRequest $request
      *
@@ -102,7 +98,7 @@ class TransactionController extends Controller
         $result = new Collection;
         if (is_numeric($data['query'])) {
             // search for group, not journal.
-            $firstResult = $this->groupRepository->find((int) $data['query']);
+            $firstResult = $this->groupRepository->find((int)$data['query']);
             if (null !== $firstResult) {
                 // group may contain multiple journals, each a result:
                 foreach ($firstResult->transactionJournals as $journal) {

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

@@ -23,7 +23,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Api\V1\Controllers\Autocomplete;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Autocomplete\AutocompleteRequest;
 use FireflyIII\Models\TransactionType;
@@ -37,7 +36,6 @@ class TransactionTypeController extends Controller
 {
     private TransactionTypeRepositoryInterface $repository;
 
-
     /**
      * TransactionTypeController constructor.
      */
@@ -69,7 +67,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

@@ -45,7 +45,6 @@ class AccountController extends Controller
     private CurrencyRepositoryInterface $currencyRepository;
     private AccountRepositoryInterface  $repository;
 
-
     /**
      * AccountController constructor.
      *
@@ -87,12 +86,12 @@ class AccountController extends Controller
         $defaultSet = $this->repository->getAccountsByType([AccountType::ASSET])->pluck('id')->toArray();
         $frontPage  = app('preferences')->get('frontPageAccounts', $defaultSet);
         $default    = app('amount')->getDefaultCurrency();
-        // @codeCoverageIgnoreStart
+
         if (0 === count($frontPage->data)) {
             $frontPage->data = $defaultSet;
             $frontPage->save();
         }
-        // @codeCoverageIgnoreEnd
+
 
         // get accounts:
         $accounts  = $this->repository->getAccountsById($frontPage->data);
@@ -101,7 +100,7 @@ class AccountController extends Controller
         foreach ($accounts as $account) {
             $currency = $this->repository->getAccountCurrency($account);
             if (null === $currency) {
-                $currency = $default; // @codeCoverageIgnore
+                $currency = $default; 
             }
             $currentSet = [
                 'label'                   => $account->name,
@@ -109,8 +108,8 @@ class AccountController extends Controller
                 'currency_code'           => $currency->code,
                 'currency_symbol'         => $currency->symbol,
                 'currency_decimal_places' => $currency->decimal_places,
-                'start_date'              => $start->format('Y-m-d'),
-                'end_date'                => $end->format('Y-m-d'),
+                'start_date'              => $start->toAtomString(),
+                'end_date'                => $end->toAtomString(),
                 'type'                    => 'line', // line, area or bar
                 'yAxisID'                 => 0, // 0, 1, 2
                 'entries'                 => [],
@@ -121,7 +120,7 @@ class AccountController extends Controller
             $previous     = round((float)array_values($range)[0], 12);
             while ($currentStart <= $end) {
                 $format   = $currentStart->format('Y-m-d');
-                $label    = $currentStart->format('Y-m-d');
+                $label    = $currentStart->toAtomString();
                 $balance  = array_key_exists($format, $range) ? round((float)$range[$format], 12) : $previous;
                 $previous = $balance;
                 $currentStart->addDay();

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

@@ -0,0 +1,52 @@
+<?php
+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;
+use FireflyIII\Services\Internal\Destroy\AccountDestroyService;
+use Illuminate\Http\JsonResponse;
+
+/**
+ * Class AccountController
+ */
+class AccountController extends Controller
+{
+    private AccountRepositoryInterface $repository;
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->middleware(
+            function ($request, $next) {
+                $this->repository = app(AccountRepositoryInterface::class);
+                $this->repository->setUser(auth()->user());
+
+                return $next($request);
+            }
+        );
+    }
+
+    /**
+     * @param MoveTransactionsRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function moveTransactions(MoveTransactionsRequest $request): JsonResponse
+    {
+        $accountIds  = $request->getAll();
+        $original    = $this->repository->findNull($accountIds['original_account']);
+        $destination = $this->repository->findNull($accountIds['destination_account']);
+
+        /** @var AccountDestroyService $service */
+        $service = app(AccountDestroyService::class);
+        $service->moveTransactions($original, $destination);
+
+        return response()->json([], 204);
+
+    }
+
+}

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

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * AccountController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -21,12 +22,11 @@
 
 namespace FireflyIII\Api\V1\Controllers\Data\Export;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Data\Export\ExportRequest;
 use FireflyIII\Support\Export\ExportDataGenerator;
-use FireflyIII\User;
 use Illuminate\Http\Response as LaravelResponse;
+use League\Csv\CannotInsertRecord;
 
 /**
  * Class ExportController
@@ -43,23 +43,19 @@ class ExportController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user = auth()->user();
-                /** @var ExportDataGenerator $exporter */
                 $this->exporter = app(ExportDataGenerator::class);
-                $this->exporter->setUser($user);
+                $this->exporter->setUser(auth()->user());
 
                 return $next($request);
             }
         );
     }
 
-
     /**
      * @param ExportRequest $request
      *
      * @return LaravelResponse
-     * @throws \League\Csv\CannotInsertRecord
+     * @throws CannotInsertRecord
      */
     public function accounts(ExportRequest $request): LaravelResponse
     {
@@ -69,120 +65,11 @@ class ExportController extends Controller
 
     }
 
-
-    /**
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
-     * @throws \League\Csv\CannotInsertRecord
-     */
-    public function bills(ExportRequest $request): LaravelResponse
-    {
-        $this->exporter->setExportBills(true);
-
-        return $this->returnExport('bills');
-    }
-
-    /**
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
-     * @throws \League\Csv\CannotInsertRecord
-     */
-    public function budgets(ExportRequest $request): LaravelResponse
-    {
-        $this->exporter->setExportBudgets(true);
-
-        return $this->returnExport('budgets');
-    }
-
-    /**
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
-     * @throws \League\Csv\CannotInsertRecord
-     */
-    public function categories(ExportRequest $request): LaravelResponse
-    {
-        $this->exporter->setExportCategories(true);
-
-        return $this->returnExport('categories');
-    }
-
-    /**
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
-     * @throws \League\Csv\CannotInsertRecord
-     */
-    public function piggyBanks(ExportRequest $request): LaravelResponse
-    {
-        $this->exporter->setExportPiggies(true);
-
-        return $this->returnExport('piggies');
-    }
-
-    /**
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
-     * @throws \League\Csv\CannotInsertRecord
-     */
-    public function recurring(ExportRequest $request): LaravelResponse
-    {
-        $this->exporter->setExportRecurring(true);
-
-        return $this->returnExport('recurrences');
-    }
-
-    /**
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
-     * @throws \League\Csv\CannotInsertRecord
-     */
-    public function rules(ExportRequest $request): LaravelResponse
-    {
-        $this->exporter->setExportRules(true);
-
-        return $this->returnExport('rules');
-    }
-
-    /**
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
-     * @throws \League\Csv\CannotInsertRecord
-     */
-    public function tags(ExportRequest $request): LaravelResponse
-    {
-        $this->exporter->setExportTags(true);
-
-        return $this->returnExport('tags');
-    }
-
-    /**
-     * @param ExportRequest $request
-     *
-     * @return LaravelResponse
-     * @throws \League\Csv\CannotInsertRecord
-     */
-    public function transactions(ExportRequest $request): LaravelResponse
-    {
-        $params = $request->getAll();
-        $this->exporter->setStart($params['start']);
-        $this->exporter->setEnd($params['end']);
-        $this->exporter->setAccounts($params['accounts']);
-        $this->exporter->setExportTransactions(true);
-
-        return $this->returnExport('transactions');
-    }
-
     /**
      * @param string $key
      *
      * @return LaravelResponse
-     * @throws \League\Csv\CannotInsertRecord
+     * @throws CannotInsertRecord
      */
     private function returnExport(string $key): LaravelResponse
     {
@@ -201,9 +88,117 @@ class ExportController extends Controller
             ->header('Expires', '0')
             ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
             ->header('Pragma', 'public')
-            ->header('Content-Length', strlen($data[$key]));
+            ->header('Content-Length', (string)strlen($data[$key]));
 
         return $response;
     }
 
-}
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function bills(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportBills(true);
+
+        return $this->returnExport('bills');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function budgets(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportBudgets(true);
+
+        return $this->returnExport('budgets');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function categories(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportCategories(true);
+
+        return $this->returnExport('categories');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function piggyBanks(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportPiggies(true);
+
+        return $this->returnExport('piggies');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function recurring(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportRecurring(true);
+
+        return $this->returnExport('recurrences');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function rules(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportRules(true);
+
+        return $this->returnExport('rules');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function tags(ExportRequest $request): LaravelResponse
+    {
+        $this->exporter->setExportTags(true);
+
+        return $this->returnExport('tags');
+    }
+
+    /**
+     * @param ExportRequest $request
+     *
+     * @return LaravelResponse
+     * @throws CannotInsertRecord
+     */
+    public function transactions(ExportRequest $request): LaravelResponse
+    {
+        $params = $request->getAll();
+        $this->exporter->setStart($params['start']);
+        $this->exporter->setEnd($params['end']);
+        $this->exporter->setAccounts($params['accounts']);
+        $this->exporter->setExportTransactions(true);
+
+        return $this->returnExport('transactions');
+    }
+
+}

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

@@ -44,8 +44,8 @@ class AccountController extends Controller
     use ApiSupport;
 
     private CurrencyRepositoryInterface   $currencyRepository;
-    private AccountRepositoryInterface    $repository;
     private OperationsRepositoryInterface $opsRepository;
+    private AccountRepositoryInterface    $repository;
 
     /**
      * AccountController constructor.
@@ -77,18 +77,19 @@ class AccountController extends Controller
      *
      * @return JsonResponse
      */
-    public function expense(GenericRequest $request): JsonResponse
+    public function asset(GenericRequest $request): JsonResponse
     {
-        $start           = $request->getStart();
-        $end             = $request->getEnd();
-        $assetAccounts   = $request->getAssetAccounts();
-        $expenseAccounts = $request->getExpenseAccounts();
-        $expenses        = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, $expenseAccounts);
-        $result          = [];
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $assetAccounts = $request->getAssetAccounts();
+        $expenses      = $this->opsRepository->sumExpensesBySource($start, $end, $assetAccounts);
+        $result        = [];
 
         /** @var array $expense */
         foreach ($expenses as $expense) {
             $result[] = [
+                'id'               => (string)$expense['id'],
+                'name'             => $expense['name'],
                 'difference'       => $expense['sum'],
                 'difference_float' => (float)$expense['sum'],
                 'currency_id'      => (string)$expense['currency_id'],
@@ -104,17 +105,20 @@ class AccountController extends Controller
      *
      * @return JsonResponse
      */
-    public function asset(GenericRequest $request): JsonResponse
+    public function expense(GenericRequest $request): JsonResponse
     {
-        $start         = $request->getStart();
-        $end           = $request->getEnd();
-        $assetAccounts = $request->getAssetAccounts();
-        $expenses      = $this->opsRepository->sumExpenses($start, $end, $assetAccounts);
-        $result        = [];
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $assetAccounts   = $request->getAssetAccounts();
+        $expenseAccounts = $request->getExpenseAccounts();
+        $expenses        = $this->opsRepository->sumExpensesByDestination($start, $end, $assetAccounts, $expenseAccounts);
+        $result          = [];
 
         /** @var array $expense */
         foreach ($expenses as $expense) {
             $result[] = [
+                'id'               => (string)$expense['id'],
+                'name'             => $expense['name'],
                 'difference'       => $expense['sum'],
                 'difference_float' => (float)$expense['sum'],
                 'currency_id'      => (string)$expense['currency_id'],

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

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * PeriodController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -21,7 +22,6 @@
 
 namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -87,7 +87,7 @@ class BillController extends Controller
             $foreignKey        = sprintf('%d-%d', $billId, $foreignCurrencyId);
 
             if (0 !== $currencyId) {
-                $response[$key]                            = $response[$key] ?? [
+                $response[$key]                     = $response[$key] ?? [
                         'id'               => (string)$billId,
                         'name'             => $journal['bill_name'],
                         'difference'       => '0',
@@ -139,7 +139,7 @@ class BillController extends Controller
             $foreignCurrencyId = (int)$journal['foreign_currency_id'];
 
             if (0 !== $currencyId) {
-                $response[$currencyId]                            = $response[$currencyId] ?? [
+                $response[$currencyId]                     = $response[$currencyId] ?? [
                         'difference'       => '0',
                         'difference_float' => 0,
                         'currency_id'      => (string)$currencyId,
@@ -163,4 +163,4 @@ class BillController extends Controller
         return response()->json(array_values($response));
     }
 
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
@@ -36,9 +37,9 @@ use Illuminate\Support\Collection;
  */
 class BudgetController extends Controller
 {
+    private NoBudgetRepositoryInterface   $noRepository;
     private OperationsRepositoryInterface $opsRepository;
     private BudgetRepositoryInterface     $repository;
-    private NoBudgetRepositoryInterface   $noRepository;
 
     /**
      * AccountController constructor.
@@ -123,4 +124,4 @@ class BudgetController extends Controller
 
     }
 
-}
+}

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

@@ -1,9 +1,29 @@
 <?php
 
+/*
+ * CategoryController.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\Insight\Expense;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Models\Category;
@@ -18,9 +38,9 @@ use Illuminate\Support\Collection;
  */
 class CategoryController extends Controller
 {
+    private NoCategoryRepositoryInterface $noRepository;
     private OperationsRepositoryInterface $opsRepository;
     private CategoryRepositoryInterface   $repository;
-    private NoCategoryRepositoryInterface $noRepository;
 
     /**
      * AccountController constructor.
@@ -104,4 +124,4 @@ class CategoryController extends Controller
         return response()->json($result);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
@@ -79,4 +80,4 @@ class PeriodController extends Controller
         return response()->json(array_values($response));
     }
 
-}
+}

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

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * PeriodController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -21,7 +22,6 @@
 
 namespace FireflyIII\Api\V1\Controllers\Insight\Expense;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -44,82 +44,14 @@ class TagController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                $user             = auth()->user();
                 $this->repository = app(TagRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
         );
     }
 
-    /**
-     * Expenses per tag, possibly filtered by tag and account.
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
-     */
-    public function tag(GenericRequest $request): JsonResponse
-    {
-        $accounts = $request->getAssetAccounts();
-        $tags     = $request->getTags();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
-
-        // get all tags:
-        if (0 === $tags->count()) {
-            $tags = $this->repository->get();
-        }
-
-        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
-        $collector->setTags($tags);
-        $genericSet = $collector->getExtractedJournals();
-        /** @var array $entry */
-        foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
-
-            /** @var array $tag */
-            foreach ($journal['tags'] as $tag) {
-                $tagId      = $tag['id'];
-                $key        = sprintf('%d-%d', $tagId, $currencyId);
-                $foreignKey = sprintf('%d-%d', $tagId, $foreignCurrencyId);
-
-                // 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'],
-                        ];
-                    $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
-                    $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'],
-                        ];
-                    $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
-                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
-                }
-            }
-        }
-
-        return response()->json(array_values($response));
-    }
-
     /**
      * Expenses for no tag filtered by account.
      *
@@ -170,4 +102,71 @@ class TagController extends Controller
         return response()->json(array_values($response));
     }
 
-}
+    /**
+     * Expenses per tag, possibly filtered by tag and account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function tag(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $tags     = $request->getTags();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // get all tags:
+        if (0 === $tags->count()) {
+            $tags = $this->repository->get();
+        }
+
+        // collect all expenses in this period (regardless of type) by the given bills and accounts.
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
+        $collector->setTags($tags);
+        $genericSet = $collector->getExtractedJournals();
+        /** @var array $journal */
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            /** @var array $tag */
+            foreach ($journal['tags'] as $tag) {
+                $tagId      = $tag['id'];
+                $key        = sprintf('%d-%d', $tagId, $currencyId);
+                $foreignKey = sprintf('%d-%d', $tagId, $foreignCurrencyId);
+
+                // 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'],
+                        ];
+                    $response[$key]['difference']       = bcadd($response[$key]['difference'], $journal['amount']);
+                    $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'],
+                        ];
+                    $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], $journal['foreign_amount']);
+                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
+                }
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+}

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

@@ -45,8 +45,8 @@ class AccountController extends Controller
     use ApiSupport;
 
     private CurrencyRepositoryInterface   $currencyRepository;
-    private AccountRepositoryInterface    $repository;
     private OperationsRepositoryInterface $opsRepository;
+    private AccountRepositoryInterface    $repository;
 
     /**
      * AccountController constructor.
@@ -74,23 +74,24 @@ class AccountController extends Controller
     }
 
     /**
-     * // TOOD same as
+     * TODO same code as Expense/AccountController.
+     * TODO does not actually include the name of the expense account.
      * @param GenericRequest $request
      *
      * @return JsonResponse
      */
-    public function revenue(GenericRequest $request): JsonResponse
+    public function asset(GenericRequest $request): JsonResponse
     {
-        $start           = $request->getStart();
-        $end             = $request->getEnd();
-        $assetAccounts   = $request->getAssetAccounts();
-        $revenueAccounts = $request->getRevenueAccounts();
-        $income          = $this->opsRepository->sumIncome($start, $end, $assetAccounts, $revenueAccounts);
-        $result          = [];
-
+        $start         = $request->getStart();
+        $end           = $request->getEnd();
+        $assetAccounts = $request->getAssetAccounts();
+        $income        = $this->opsRepository->sumIncomeByDestination($start, $end, $assetAccounts);
+        $result        = [];
         /** @var array $entry */
         foreach ($income as $entry) {
             $result[] = [
+                'id'               => (string)$entry['id'],
+                'name'             => $entry['name'],
                 'difference'       => $entry['sum'],
                 'difference_float' => (float)$entry['sum'],
                 'currency_id'      => (string)$entry['currency_id'],
@@ -102,22 +103,26 @@ class AccountController extends Controller
     }
 
     /**
-     * TODO same code as Expense/AccountController.
+     * TODO does not actually include the name of the expense account.
      *
      * @param GenericRequest $request
      *
      * @return JsonResponse
      */
-    public function asset(GenericRequest $request): JsonResponse
+    public function revenue(GenericRequest $request): JsonResponse
     {
-        $start         = $request->getStart();
-        $end           = $request->getEnd();
-        $assetAccounts = $request->getAssetAccounts();
-        $income        = $this->opsRepository->sumIncome($start, $end, $assetAccounts);
-        $result        = [];
+        $start           = $request->getStart();
+        $end             = $request->getEnd();
+        $assetAccounts   = $request->getAssetAccounts();
+        $revenueAccounts = $request->getRevenueAccounts();
+        $income          = $this->opsRepository->sumIncomeBySource($start, $end, $assetAccounts, $revenueAccounts);
+        $result          = [];
+
         /** @var array $entry */
         foreach ($income as $entry) {
             $result[] = [
+                'id'               => (string)$entry['id'],
+                'name'             => $entry['name'],
                 'difference'       => $entry['sum'],
                 'difference_float' => (float)$entry['sum'],
                 'currency_id'      => (string)$entry['currency_id'],

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

@@ -1,9 +1,29 @@
 <?php
 
+/*
+ * CategoryController.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\Insight\Income;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Models\Category;
@@ -19,9 +39,9 @@ use Illuminate\Support\Collection;
  */
 class CategoryController extends Controller
 {
+    private NoCategoryRepositoryInterface $noRepository;
     private OperationsRepositoryInterface $opsRepository;
     private CategoryRepositoryInterface   $repository;
-    private NoCategoryRepositoryInterface $noRepository;
 
     /**
      * AccountController constructor.
@@ -105,4 +125,4 @@ class CategoryController extends Controller
         return response()->json($result);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Insight\Income;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Insight\Income;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
@@ -71,7 +72,9 @@ class PeriodController extends Controller
                         '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']       = bcadd(
+                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                );
                 $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
             }
         }
@@ -79,4 +82,4 @@ class PeriodController extends Controller
         return response()->json(array_values($response));
     }
 
-}
+}

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

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 /*
  * PeriodController.php
  * Copyright (c) 2021 james@firefly-iii.org
@@ -21,7 +22,6 @@
 
 namespace FireflyIII\Api\V1\Controllers\Insight\Income;
 
-
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -53,73 +53,6 @@ class TagController extends Controller
         );
     }
 
-    /**
-     * Expenses per tag, possibly filtered by tag and account.
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
-     */
-    public function tag(GenericRequest $request): JsonResponse
-    {
-        $accounts = $request->getAssetAccounts();
-        $tags     = $request->getTags();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
-
-        // get all tags:
-        if (0 === $tags->count()) {
-            $tags = $this->repository->get();
-        }
-
-        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
-        $collector->setTags($tags);
-        $genericSet = $collector->getExtractedJournals();
-        /** @var array $entry */
-        foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
-
-            /** @var array $tag */
-            foreach ($journal['tags'] as $tag) {
-                $tagId      = $tag['id'];
-                $key        = sprintf('%d-%d', $tagId, $currencyId);
-                $foreignKey = sprintf('%d-%d', $tagId, $foreignCurrencyId);
-
-                // 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'],
-                        ];
-                    $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
-                    $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'],
-                        ];
-                    $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount']));
-                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
-                }
-            }
-        }
-
-        return response()->json(array_values($response));
-    }
-
     /**
      * Expenses for no tag filtered by account.
      *
@@ -162,7 +95,9 @@ class TagController extends Controller
                         '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']       = bcadd(
+                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                );
                 $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
             }
         }
@@ -170,4 +105,73 @@ class TagController extends Controller
         return response()->json(array_values($response));
     }
 
-}
+    /**
+     * Expenses per tag, possibly filtered by tag and account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function tag(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $tags     = $request->getTags();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // get all tags:
+        if (0 === $tags->count()) {
+            $tags = $this->repository->get();
+        }
+
+        // collect all expenses in this period (regardless of type) by the given bills and accounts.
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->setTags($tags);
+        $genericSet = $collector->getExtractedJournals();
+        /** @var array $journal */
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            /** @var array $tag */
+            foreach ($journal['tags'] as $tag) {
+                $tagId      = $tag['id'];
+                $key        = sprintf('%d-%d', $tagId, $currencyId);
+                $foreignKey = sprintf('%d-%d', $tagId, $foreignCurrencyId);
+
+                // 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'],
+                        ];
+                    $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
+                    $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'],
+                        ];
+                    $response[$foreignKey]['difference']       = bcadd(
+                        $response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount'])
+                    );
+                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
+                }
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
@@ -58,6 +59,7 @@ class AccountController extends Controller
 
     /**
      * TODO same code as Expense/AccountController.
+     * TODO does not actually include the name of the expense account.
      *
      * @param GenericRequest $request
      *
@@ -68,18 +70,7 @@ class AccountController extends Controller
         $start         = $request->getStart();
         $end           = $request->getEnd();
         $assetAccounts = $request->getAssetAccounts();
-        $income        = $this->opsRepository->sumTransfers($start, $end, $assetAccounts);
-        $result        = [];
-        /** @var array $entry */
-        foreach ($income as $entry) {
-            $result[] = [
-                'difference'       => $entry['sum'],
-                'difference_float' => (float)$entry['sum'],
-                'currency_id'      => (string)$entry['currency_id'],
-                'currency_code'    => $entry['currency_code'],
-            ];
-        }
-
-        return response()->json($result);
+        $transfers     = $this->opsRepository->sumTransfers($start, $end, $assetAccounts);
+        return response()->json($transfers);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
@@ -36,9 +37,9 @@ use Illuminate\Support\Collection;
  */
 class CategoryController extends Controller
 {
+    private NoCategoryRepositoryInterface $noRepository;
     private OperationsRepositoryInterface $opsRepository;
     private CategoryRepositoryInterface   $repository;
-    private NoCategoryRepositoryInterface $noRepository;
 
     /**
      * AccountController constructor.
@@ -122,4 +123,4 @@ class CategoryController extends Controller
         return response()->json($result);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
@@ -71,7 +72,9 @@ class PeriodController extends Controller
                         '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']       = bcadd(
+                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                );
                 $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
             }
         }
@@ -79,4 +82,4 @@ class PeriodController extends Controller
         return response()->json(array_values($response));
     }
 
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Insight\Transfer;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Insight\GenericRequest;
@@ -54,73 +55,6 @@ class TagController extends Controller
         );
     }
 
-    /**
-     * Transfers per tag, possibly filtered by tag and account.
-     *
-     * @param GenericRequest $request
-     *
-     * @return JsonResponse
-     */
-    public function tag(GenericRequest $request): JsonResponse
-    {
-        $accounts = $request->getAssetAccounts();
-        $tags     = $request->getTags();
-        $start    = $request->getStart();
-        $end      = $request->getEnd();
-        $response = [];
-
-        // get all tags:
-        if (0 === $tags->count()) {
-            $tags = $this->repository->get();
-        }
-
-        // collect all expenses in this period (regardless of type) by the given bills and accounts.
-        $collector = app(GroupCollectorInterface::class);
-        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
-        $collector->setTags($tags);
-        $genericSet = $collector->getExtractedJournals();
-        /** @var array $entry */
-        foreach ($genericSet as $journal) {
-            $currencyId        = (int)$journal['currency_id'];
-            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
-
-            /** @var array $tag */
-            foreach ($journal['tags'] as $tag) {
-                $tagId      = $tag['id'];
-                $key        = sprintf('%d-%d', $tagId, $currencyId);
-                $foreignKey = sprintf('%d-%d', $tagId, $foreignCurrencyId);
-
-                // 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'],
-                        ];
-                    $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
-                    $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'],
-                        ];
-                    $response[$foreignKey]['difference']       = bcadd($response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount']));
-                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
-                }
-            }
-        }
-
-        return response()->json(array_values($response));
-    }
-
     /**
      * Expenses for no tag filtered by account.
      *
@@ -163,11 +97,82 @@ class TagController extends Controller
                         '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']       = bcadd(
+                    $response[$foreignCurrencyId]['difference'], app('steam')->positive($journal['foreign_amount'])
+                );
                 $response[$foreignCurrencyId]['difference_float'] = (float)$response[$foreignCurrencyId]['difference'];
             }
         }
 
         return response()->json(array_values($response));
     }
-}
+
+    /**
+     * Transfers per tag, possibly filtered by tag and account.
+     *
+     * @param GenericRequest $request
+     *
+     * @return JsonResponse
+     */
+    public function tag(GenericRequest $request): JsonResponse
+    {
+        $accounts = $request->getAssetAccounts();
+        $tags     = $request->getTags();
+        $start    = $request->getStart();
+        $end      = $request->getEnd();
+        $response = [];
+
+        // get all tags:
+        if (0 === $tags->count()) {
+            $tags = $this->repository->get();
+        }
+
+        // collect all expenses in this period (regardless of type) by the given bills and accounts.
+        $collector = app(GroupCollectorInterface::class);
+        $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
+        $collector->setTags($tags);
+        $genericSet = $collector->getExtractedJournals();
+        /** @var array $journal */
+        foreach ($genericSet as $journal) {
+            $currencyId        = (int)$journal['currency_id'];
+            $foreignCurrencyId = (int)$journal['foreign_currency_id'];
+
+            /** @var array $tag */
+            foreach ($journal['tags'] as $tag) {
+                $tagId      = $tag['id'];
+                $key        = sprintf('%d-%d', $tagId, $currencyId);
+                $foreignKey = sprintf('%d-%d', $tagId, $foreignCurrencyId);
+
+                // 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'],
+                        ];
+                    $response[$key]['difference']       = bcadd($response[$key]['difference'], app('steam')->positive($journal['amount']));
+                    $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'],
+                        ];
+                    $response[$foreignKey]['difference']       = bcadd(
+                        $response[$foreignKey]['difference'], app('steam')->positive($journal['foreign_amount'])
+                    );
+                    $response[$foreignKey]['difference_float'] = (float)$response[$foreignKey]['difference'];
+                }
+            }
+        }
+
+        return response()->json(array_values($response));
+    }
+}

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

@@ -133,7 +133,6 @@ class ListController extends Controller
 
     }
 
-
     /**
      * Show all transaction groups related to the account.
      *

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Account;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Account;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Account;
@@ -123,4 +124,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

@@ -39,7 +39,6 @@ class StoreController extends Controller
 
     private AccountRepositoryInterface $repository;
 
-
     /**
      * AccountController constructor.
      *
@@ -67,7 +66,7 @@ class StoreController extends Controller
      */
     public function store(StoreRequest $request): JsonResponse
     {
-        $data    = $request->getAllAccountData();
+        $data = $request->getAllAccountData();
         $this->repository->resetAccountOrder();
         $account = $this->repository->store($data);
         $manager = $this->getManager();

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

@@ -41,7 +41,6 @@ class UpdateController extends Controller
 
     private AccountRepositoryInterface $repository;
 
-
     /**
      * AccountController constructor.
      *

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Middleware\ApiDemoUser;
@@ -36,7 +37,6 @@ class DestroyController extends Controller
 {
     private AttachmentRepositoryInterface $repository;
 
-
     /**
      * DestroyController constructor.
      *
@@ -53,7 +53,6 @@ class DestroyController extends Controller
                 $this->repository = app(AttachmentRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-
                 return $next($request);
             }
         );
@@ -74,4 +73,4 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Middleware\ApiDemoUser;
@@ -43,7 +44,6 @@ class ShowController extends Controller
 {
     private AttachmentRepositoryInterface $repository;
 
-
     /**
      * ShowController constructor.
      *
@@ -60,7 +60,6 @@ class ShowController extends Controller
                 $this->repository = app(AttachmentRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-
                 return $next($request);
             }
         );
@@ -101,7 +100,7 @@ class ShowController extends Controller
                 ->header('Expires', '0')
                 ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
                 ->header('Pragma', 'public')
-                ->header('Content-Length', strlen($content));
+                ->header('Content-Length', (string)strlen($content));
 
             return $response;
         }
@@ -119,7 +118,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();
@@ -140,8 +139,6 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
-
     /**
      * Display the specified resource.
      *
@@ -160,4 +157,4 @@ class ShowController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Middleware\ApiDemoUser;
@@ -43,7 +44,6 @@ class StoreController extends Controller
 {
     private AttachmentRepositoryInterface $repository;
 
-
     /**
      * StoreController constructor.
      *
@@ -60,14 +60,11 @@ class StoreController extends Controller
                 $this->repository = app(AttachmentRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-
                 return $next($request);
             }
         );
     }
 
-
-
     /**
      * Store a newly created resource in storage.
      *
@@ -116,4 +113,4 @@ class StoreController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Attachment;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Middleware\ApiDemoUser;
@@ -39,7 +40,6 @@ class UpdateController extends Controller
 {
     private AttachmentRepositoryInterface $repository;
 
-
     /**
      * UpdateController constructor.
      *
@@ -56,19 +56,16 @@ class UpdateController extends Controller
                 $this->repository = app(AttachmentRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-
                 return $next($request);
             }
         );
     }
 
-
-
     /**
      * Update the specified resource in storage.
      *
      * @param UpdateRequest $request
-     * @param Attachment              $attachment
+     * @param Attachment    $attachment
      *
      * @return JsonResponse
      */
@@ -86,4 +83,4 @@ class UpdateController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\AvailableBudget;
@@ -54,6 +55,7 @@ class DestroyController extends Controller
             }
         );
     }
+
     /**
      * Remove the specified resource from storage.
      *
@@ -69,4 +71,4 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\AvailableBudget;
@@ -71,7 +72,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');
@@ -116,4 +117,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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
+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;
@@ -94,4 +95,4 @@ class StoreController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\AvailableBudget;
+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\Models\TransactionCurrency;
 use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Transformers\AvailableBudgetTransformer;
 use FireflyIII\User;
@@ -73,9 +73,9 @@ class UpdateController extends Controller
         $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();
+        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']);
@@ -94,4 +94,4 @@ class UpdateController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Bill;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Bill;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Bill;
@@ -45,19 +46,14 @@ class DestroyController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var BillRepositoryInterface repository */
                 $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
         );
     }
 
-
     /**
      * Remove the specified resource from storage.
      *
@@ -73,4 +69,4 @@ class DestroyController extends Controller
         return response()->json([], 204);
     }
 
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Bill;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Bill;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -46,7 +47,6 @@ class ListController extends Controller
 
     private BillRepositoryInterface $repository;
 
-
     /**
      * BillController constructor.
      *
@@ -57,12 +57,8 @@ class ListController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var BillRepositoryInterface repository */
                 $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -80,7 +76,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();
@@ -100,8 +96,6 @@ class ListController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
-
     /**
      * List all of them.
      *
@@ -115,7 +109,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);
@@ -129,8 +123,6 @@ class ListController extends Controller
         /** @var RuleTransformer $transformer */
         $transformer = app(RuleTransformer::class);
         $transformer->setParameters($this->parameters);
-
-
         $resource = new FractalCollection($rules, $transformer, 'rules');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
@@ -138,8 +130,6 @@ class ListController extends Controller
 
     }
 
-
-
     /**
      * Show all transactions.
      *
@@ -152,7 +142,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);
 
@@ -198,4 +188,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

@@ -19,13 +19,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Bill;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Bill;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
-use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\BillTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -51,12 +51,8 @@ class ShowController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var BillRepositoryInterface repository */
                 $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -74,7 +70,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'));
@@ -108,4 +104,4 @@ class ShowController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Bill;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Bill;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Bill\StoreRequest;
@@ -41,7 +42,6 @@ class StoreController extends Controller
 
     private BillRepositoryInterface $repository;
 
-
     /**
      * BillController constructor.
      *
@@ -52,12 +52,8 @@ class StoreController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var BillRepositoryInterface repository */
                 $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -86,4 +82,4 @@ class StoreController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Bill;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Bill;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Bill\UpdateRequest;
@@ -38,7 +39,6 @@ class UpdateController extends Controller
 {
     private BillRepositoryInterface $repository;
 
-
     /**
      * BillController constructor.
      *
@@ -49,12 +49,8 @@ class UpdateController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var BillRepositoryInterface repository */
                 $this->repository = app(BillRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -85,4 +81,4 @@ class UpdateController extends Controller
 
     }
 
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Budget;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Budget;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Budget;
@@ -66,4 +67,4 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Budget;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Budget;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -119,8 +120,6 @@ class ListController extends Controller
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);
-
-
         $resource = new FractalCollection($budgetLimits, $transformer, 'budget_limits');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
@@ -183,12 +182,10 @@ class ListController extends Controller
         /** @var TransactionGroupTransformer $transformer */
         $transformer = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
-
-
         $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Budget;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Budget;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Budget;
@@ -114,4 +115,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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Budget;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Budget;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Budget\StoreRequest;
@@ -37,7 +38,6 @@ class StoreController extends Controller
 {
     private BudgetRepositoryInterface $repository;
 
-
     /**
      * StoreController constructor.
      *
@@ -67,7 +67,7 @@ class StoreController extends Controller
      */
     public function store(StoreRequest $request): JsonResponse
     {
-        $budget  = $this->repository->store($request->getAll());
+        $budget = $this->repository->store($request->getAll());
         $budget->refresh();
         $manager = $this->getManager();
 
@@ -79,4 +79,4 @@ class StoreController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Budget;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Budget;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Budget\UpdateRequest;
@@ -78,4 +79,4 @@ class UpdateController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Exceptions\FireflyException;
@@ -37,7 +38,6 @@ class DestroyController extends Controller
 {
     private BudgetLimitRepositoryInterface $blRepository;
 
-
     /**
      * BudgetLimitController constructor.
      *
@@ -76,4 +76,4 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -44,7 +45,6 @@ class ListController extends Controller
 
     private BudgetLimitRepositoryInterface $blRepository;
 
-
     /**
      * BudgetLimitController constructor.
      *
@@ -65,7 +65,6 @@ class ListController extends Controller
         );
     }
 
-
     /**
      * Show all transactions.
      *
@@ -119,4 +118,4 @@ class ListController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,6 +19,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+declare(strict_types=1);
+
 namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
 
 use FireflyIII\Api\V1\Controllers\Controller;
@@ -96,31 +98,6 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-    /**
-     * @param Request     $request
-     * @param Budget      $budget
-     * @param BudgetLimit $budgetLimit
-     *
-     * @return JsonResponse
-     */
-    public function show(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
-    {
-        if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
-            throw new FireflyException('20028: The budget limit does not belong to the budget.');
-        }
-        // continue!
-        $manager = $this->getManager();
-
-        /** @var BudgetLimitTransformer $transformer */
-        $transformer = app(BudgetLimitTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new Item($budgetLimit, $transformer, 'budget_limits');
-
-        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
-    }
-
-
     /**
      * Display a listing of the budget limits for this budget..
      *
@@ -150,4 +127,28 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-}
+    /**
+     * @param Request     $request
+     * @param Budget      $budget
+     * @param BudgetLimit $budgetLimit
+     *
+     * @return JsonResponse
+     */
+    public function show(Request $request, Budget $budget, BudgetLimit $budgetLimit): JsonResponse
+    {
+        if ((int)$budget->id !== (int)$budgetLimit->budget_id) {
+            throw new FireflyException('20028: The budget limit does not belong to the budget.');
+        }
+        // continue!
+        $manager = $this->getManager();
+
+        /** @var BudgetLimitTransformer $transformer */
+        $transformer = app(BudgetLimitTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $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/BudgetLimit/StoreController.php

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\BudgetLimit\StoreRequest;
@@ -39,7 +40,6 @@ class StoreController extends Controller
 {
     private BudgetLimitRepositoryInterface $blRepository;
 
-
     /**
      * BudgetLimitController constructor.
      *
@@ -60,7 +60,6 @@ class StoreController extends Controller
         );
     }
 
-
     /**
      * Store a newly created resource in storage.
      *
@@ -79,8 +78,6 @@ class StoreController extends Controller
 
         $budgetLimit = $this->blRepository->store($data);
         $manager     = $this->getManager();
-
-
         /** @var BudgetLimitTransformer $transformer */
         $transformer = app(BudgetLimitTransformer::class);
         $transformer->setParameters($this->parameters);
@@ -89,4 +86,4 @@ class StoreController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\BudgetLimit;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\BudgetLimit\UpdateRequest;
@@ -28,7 +29,6 @@ use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
-use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Transformers\BudgetLimitTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -41,7 +41,6 @@ class UpdateController extends Controller
 {
     private BudgetLimitRepositoryInterface $blRepository;
 
-
     /**
      * BudgetLimitController constructor.
      *
@@ -91,4 +90,4 @@ class UpdateController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Category;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Category;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Category;
@@ -35,7 +36,6 @@ class DestroyController extends Controller
 {
     private CategoryRepositoryInterface $repository;
 
-
     /**
      * CategoryController constructor.
      *
@@ -46,12 +46,8 @@ class DestroyController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var CategoryRepositoryInterface repository */
                 $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -72,7 +68,4 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
-
-
-
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Category;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Category;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -55,19 +56,14 @@ class ListController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var CategoryRepositoryInterface repository */
                 $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
         );
     }
 
-
     /**
      * @param Category $category
      *
@@ -97,7 +93,6 @@ class ListController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
     /**
      * Show all transactions.
      *
@@ -154,4 +149,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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Category;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Category;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Category;
@@ -50,19 +51,14 @@ class ShowController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var CategoryRepositoryInterface repository */
                 $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
         );
     }
 
-
     /**
      * Display a listing of the resource.
      *
@@ -74,7 +70,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();
@@ -88,8 +84,6 @@ class ShowController extends Controller
         /** @var CategoryTransformer $transformer */
         $transformer = app(CategoryTransformer::class);
         $transformer->setParameters($this->parameters);
-
-
         $resource = new FractalCollection($categories, $transformer, 'categories');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
@@ -116,4 +110,4 @@ class ShowController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Category;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Category;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Category\StoreRequest;
@@ -38,7 +39,6 @@ class StoreController extends Controller
 {
     private CategoryRepositoryInterface $repository;
 
-
     /**
      * CategoryController constructor.
      *
@@ -49,12 +49,8 @@ class StoreController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var CategoryRepositoryInterface repository */
                 $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -83,4 +79,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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Category;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Category;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Category\UpdateRequest;
@@ -48,12 +49,8 @@ class UpdateController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $admin */
-                $admin = auth()->user();
-
-                /** @var CategoryRepositoryInterface repository */
                 $this->repository = app(CategoryRepositoryInterface::class);
-                $this->repository->setUser($admin);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -64,7 +61,7 @@ class UpdateController extends Controller
      * Update the category.
      *
      * @param UpdateRequest $request
-     * @param Category              $category
+     * @param Category      $category
      *
      * @return JsonResponse
      */
@@ -83,4 +80,4 @@ class UpdateController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\ObjectGroup;
@@ -35,7 +36,6 @@ class DestroyController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
 
-
     /**
      * ObjectGroupController constructor.
      *
@@ -70,4 +70,4 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\ObjectGroup;
@@ -40,7 +41,6 @@ class ListController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
 
-
     /**
      * ObjectGroupController constructor.
      *
@@ -61,6 +61,37 @@ class ListController extends Controller
         );
     }
 
+    /**
+     * List all bills
+     *
+     * @param ObjectGroup $objectGroup
+     *
+     * @return JsonResponse
+     * @codeCoverageIgnore
+     */
+    public function bills(ObjectGroup $objectGroup): JsonResponse
+    {
+        $manager = $this->getManager();
+
+        $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();
+        $bills      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
+
+        // make paginator:
+        $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
+        $paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]) . $this->buildParams());
+
+        /** @var BillTransformer $transformer */
+        $transformer = app(BillTransformer::class);
+        $transformer->setParameters($this->parameters);
+
+        $resource = new FractalCollection($bills, $transformer, 'bills');
+        $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
+
+        return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
+    }
 
     /**
      * List all piggies under the object group.
@@ -97,36 +128,4 @@ class ListController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-
-    /**
-     * List all bills
-     *
-     * @param ObjectGroup $objectGroup
-     *
-     * @return JsonResponse
-     * @codeCoverageIgnore
-     */
-    public function bills(ObjectGroup $objectGroup): JsonResponse
-    {
-        $manager = $this->getManager();
-
-        $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();
-        $bills      = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-
-        // make paginator:
-        $paginator = new LengthAwarePaginator($bills, $count, $pageSize, $this->parameters->get('page'));
-        $paginator->setPath(route('api.v1.currencies.bills', [$objectGroup->id]) . $this->buildParams());
-
-        /** @var BillTransformer $transformer */
-        $transformer = app(BillTransformer::class);
-        $transformer->setParameters($this->parameters);
-
-        $resource = new FractalCollection($bills, $transformer, 'bills');
-        $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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\ObjectGroup;
@@ -41,7 +42,6 @@ class ShowController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
 
-
     /**
      * ObjectGroupController constructor.
      *
@@ -62,7 +62,6 @@ class ShowController extends Controller
         );
     }
 
-
     /**
      * Display a listing of the resource.
      *
@@ -97,7 +96,6 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
     /**
      * Show single instance.
      *
@@ -118,6 +116,4 @@ class ShowController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-
-
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\ObjectGroup;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\ObjectGroup\UpdateRequest;
@@ -38,7 +39,6 @@ class UpdateController extends Controller
 {
     private ObjectGroupRepositoryInterface $repository;
 
-
     /**
      * ObjectGroupController constructor.
      *
@@ -59,7 +59,6 @@ class UpdateController extends Controller
         );
     }
 
-
     /**
      * @param UpdateRequest $request
      * @param ObjectGroup   $objectGroup
@@ -80,4 +79,4 @@ class UpdateController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\PiggyBank;
@@ -47,7 +48,6 @@ class DestroyController extends Controller
                 $this->repository = app(PiggyBankRepositoryInterface::class);
                 $this->repository->setUser(auth()->user());
 
-
                 return $next($request);
             }
         );
@@ -67,4 +67,4 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\PiggyBank;
@@ -52,7 +53,6 @@ class ListController extends Controller
                 $this->repository = app(PiggyBankRepositoryInterface::class);
                 $this->repository->setUser(auth()->user());
 
-
                 return $next($request);
             }
         );
@@ -67,7 +67,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();
@@ -98,7 +98,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);
@@ -119,4 +119,4 @@ class ListController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\PiggyBank;
@@ -52,7 +53,6 @@ class ShowController extends Controller
                 $this->repository = app(PiggyBankRepositoryInterface::class);
                 $this->repository->setUser(auth()->user());
 
-
                 return $next($request);
             }
         );
@@ -68,7 +68,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();
@@ -111,4 +111,4 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\PiggyBank\StoreRequest;
@@ -50,7 +51,6 @@ class StoreController extends Controller
                 $this->repository = app(PiggyBankRepositoryInterface::class);
                 $this->repository->setUser(auth()->user());
 
-
                 return $next($request);
             }
         );
@@ -77,4 +77,4 @@ class StoreController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\PiggyBank;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\PiggyBank\UpdateRequest;
@@ -50,7 +51,6 @@ class UpdateController extends Controller
                 $this->repository = app(PiggyBankRepositoryInterface::class);
                 $this->repository->setUser(auth()->user());
 
-
                 return $next($request);
             }
         );
@@ -60,7 +60,7 @@ class UpdateController extends Controller
      * Update piggy bank.
      *
      * @param UpdateRequest $request
-     * @param PiggyBank        $piggyBank
+     * @param PiggyBank     $piggyBank
      *
      * @return JsonResponse
      */
@@ -83,4 +83,4 @@ class UpdateController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Recurrence;
@@ -45,19 +46,14 @@ class DestroyController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user = auth()->user();
-
-                /** @var RecurringRepositoryInterface repository */
                 $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
         );
     }
 
-
     /**
      * Delete the resource.
      *
@@ -72,4 +68,4 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -53,12 +54,8 @@ class ListController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user = auth()->user();
-
-                /** @var RecurringRepositoryInterface repository */
                 $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -120,4 +117,4 @@ class ListController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Recurrence;
@@ -50,12 +51,8 @@ class ShowController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user = auth()->user();
-
-                /** @var RecurringRepositoryInterface repository */
                 $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -114,7 +111,5 @@ class ShowController 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/Recurrence/StoreController.php

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Recurrence\StoreRequest;
@@ -48,12 +49,8 @@ class StoreController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user = auth()->user();
-
-                /** @var RecurringRepositoryInterface repository */
                 $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
@@ -82,4 +79,4 @@ class StoreController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -1,86 +0,0 @@
-<?php
-/*
- * TriggerController.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/>.
- */
-
-namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
-
-
-use FireflyIII\Api\V1\Controllers\Controller;
-use FireflyIII\Exceptions\FireflyException;
-use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface;
-use FireflyIII\Support\Cronjobs\RecurringCronjob;
-use FireflyIII\User;
-use Illuminate\Http\JsonResponse;
-use Log;
-
-/**
- * Class TriggerController
- */
-class TriggerController extends Controller
-{
-    private RecurringRepositoryInterface $repository;
-
-    /**
-     * RecurrenceController constructor.
-     *
-     * @codeCoverageIgnore
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->middleware(
-            function ($request, $next) {
-                /** @var User $user */
-                $user = auth()->user();
-
-                /** @var RecurringRepositoryInterface repository */
-                $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser($user);
-
-                return $next($request);
-            }
-        );
-    }
-
-
-    /**
-     * @return JsonResponse
-     * @throws FireflyException
-     * @codeCoverageIgnore
-     *
-     * TODO currently unused + unreachable.
-     */
-    public function trigger(): JsonResponse
-    {
-        /** @var RecurringCronjob $recurring */
-        $recurring = app(RecurringCronjob::class);
-        try {
-            $result = $recurring->fire();
-        } catch (FireflyException $e) {
-            Log::error($e->getMessage());
-            throw new FireflyException('200022: Error in cron job.', 0, $e);
-        }
-        if (false === $result) {
-            return response()->json([], 204);
-        }
-
-        return response()->json();
-    }
-}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Recurrence;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Recurrence\UpdateRequest;
@@ -48,33 +49,27 @@ class UpdateController extends Controller
         parent::__construct();
         $this->middleware(
             function ($request, $next) {
-                /** @var User $user */
-                $user = auth()->user();
-
-                /** @var RecurringRepositoryInterface repository */
                 $this->repository = app(RecurringRepositoryInterface::class);
-                $this->repository->setUser($user);
+                $this->repository->setUser(auth()->user());
 
                 return $next($request);
             }
         );
     }
 
-
-
     /**
      * Update single recurrence.
      *
      * @param UpdateRequest $request
-     * @param Recurrence              $recurrence
+     * @param Recurrence    $recurrence
      *
      * @return JsonResponse
      */
     public function update(UpdateRequest $request, Recurrence $recurrence): JsonResponse
     {
-        $data     = $request->getAll();
+        $data       = $request->getAll();
         $recurrence = $this->repository->update($recurrence, $data);
-        $manager  = $this->getManager();
+        $manager    = $this->getManager();
 
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
@@ -85,4 +80,4 @@ class UpdateController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,12 +19,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Rule;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Rule;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Rule;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -71,4 +71,4 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Rule;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Rule;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
@@ -33,8 +34,7 @@ use FireflyIII\User;
 class ListController extends Controller
 {
     private AccountRepositoryInterface $accountRepository;
-    private RuleRepositoryInterface $ruleRepository;
-
+    private RuleRepositoryInterface    $ruleRepository;
 
     /**
      * RuleController constructor.
@@ -59,4 +59,4 @@ class ListController extends Controller
             }
         );
     }
-}
+}

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

@@ -19,12 +19,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Rule;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Rule;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Rule;
-use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\Transformers\RuleTransformer;
 use FireflyIII\User;
@@ -62,7 +62,6 @@ class ShowController extends Controller
         );
     }
 
-
     /**
      * List all of them.
      *
@@ -74,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->ruleRepository->getAll();
@@ -96,8 +95,6 @@ class ShowController extends Controller
 
     }
 
-
-
     /**
      * List single resource.
      *
@@ -118,4 +115,4 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Rule;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Rule;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Rule\StoreRequest;
@@ -77,4 +78,4 @@ class StoreController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Rule;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Rule;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Rule\TestRequest;
@@ -43,7 +44,6 @@ class TriggerController extends Controller
 {
     private RuleRepositoryInterface $ruleRepository;
 
-
     /**
      * RuleController constructor.
      *
@@ -112,7 +112,6 @@ class TriggerController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
     /**
      * Execute the given rule group on a set of existing transactions.
      *
@@ -149,4 +148,4 @@ class TriggerController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Rule;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Rule;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Rule\UpdateRequest;
@@ -38,7 +39,6 @@ class UpdateController extends Controller
 {
     private RuleRepositoryInterface $ruleRepository;
 
-
     /**
      * RuleController constructor.
      *
@@ -60,12 +60,11 @@ class UpdateController extends Controller
         );
     }
 
-
     /**
      * Update a rule.
      *
      * @param UpdateRequest $request
-     * @param Rule              $rule
+     * @param Rule          $rule
      *
      * @return JsonResponse
      */
@@ -83,4 +82,4 @@ class UpdateController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\RuleGroup;
@@ -70,4 +71,4 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\RuleGroup;
@@ -39,7 +40,6 @@ class ListController extends Controller
 {
     private RuleGroupRepositoryInterface $ruleGroupRepository;
 
-
     /**
      * RuleGroupController constructor.
      *
@@ -61,7 +61,6 @@ class ListController extends Controller
         );
     }
 
-
     /**
      * @param RuleGroup $group
      *
@@ -93,4 +92,4 @@ class ListController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\RuleGroup;
@@ -40,7 +41,6 @@ class ShowController extends Controller
 {
     private RuleGroupRepositoryInterface $ruleGroupRepository;
 
-
     /**
      * RuleGroupController constructor.
      *
@@ -62,7 +62,6 @@ class ShowController extends Controller
         );
     }
 
-
     /**
      * List all of them.
      *
@@ -94,7 +93,6 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
     /**
      * List single resource.
      *
@@ -116,4 +114,4 @@ class ShowController extends Controller
 
     }
 
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\RuleGroup\StoreRequest;
@@ -40,7 +41,6 @@ class StoreController extends Controller
     private AccountRepositoryInterface   $accountRepository;
     private RuleGroupRepositoryInterface $ruleGroupRepository;
 
-
     /**
      * RuleGroupController constructor.
      *
@@ -65,7 +65,6 @@ class StoreController extends Controller
         );
     }
 
-
     /**
      * Store new object.
      *
@@ -87,4 +86,4 @@ class StoreController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\RuleGroup\TestRequest;
@@ -36,6 +37,7 @@ use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection as FractalCollection;
+use Exception;
 
 /**
  * Class TriggerController
@@ -44,7 +46,6 @@ class TriggerController extends Controller
 {
     private RuleGroupRepositoryInterface $ruleGroupRepository;
 
-
     /**
      * RuleGroupController constructor.
      *
@@ -66,10 +67,9 @@ class TriggerController extends Controller
         );
     }
 
-
     /**
      * @param TestRequest $request
-     * @param RuleGroup            $group
+     * @param RuleGroup   $group
      *
      * @return JsonResponse
      * @throws FireflyException
@@ -121,12 +121,11 @@ class TriggerController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
     /**
      * Execute the given rule group on a set of existing transactions.
      *
      * @param TriggerRequest $request
-     * @param RuleGroup               $group
+     * @param RuleGroup      $group
      *
      * @return JsonResponse
      * @throws Exception
@@ -166,4 +165,4 @@ class TriggerController extends Controller
         return response()->json([], 204);
     }
 
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\RuleGroup;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\RuleGroup\UpdateRequest;
@@ -39,7 +40,6 @@ class UpdateController extends Controller
 
     private RuleGroupRepositoryInterface $ruleGroupRepository;
 
-
     /**
      * RuleGroupController constructor.
      *
@@ -61,12 +61,11 @@ class UpdateController extends Controller
         );
     }
 
-
     /**
      * Update a rule group.
      *
      * @param UpdateRequest $request
-     * @param RuleGroup              $ruleGroup
+     * @param RuleGroup     $ruleGroup
      *
      * @return JsonResponse
      */
@@ -83,4 +82,4 @@ class UpdateController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,13 +19,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Tag;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Tag;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 
@@ -36,7 +36,6 @@ class DestroyController extends Controller
 {
     private TagRepositoryInterface $repository;
 
-
     /**
      * TagController constructor.
      *
@@ -58,8 +57,6 @@ class DestroyController extends Controller
         );
     }
 
-
-
     /**
      * Delete the resource.
      *
@@ -74,4 +71,4 @@ class DestroyController extends Controller
 
         return response()->json([], 204);
     }
-}
+}

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Tag;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Tag;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
@@ -42,8 +43,8 @@ use League\Fractal\Resource\Collection as FractalCollection;
 class ListController extends Controller
 {
     use TransactionFilter;
-    private TagRepositoryInterface $repository;
 
+    private TagRepositoryInterface $repository;
 
     /**
      * TagController constructor.
@@ -66,8 +67,6 @@ class ListController extends Controller
         );
     }
 
-
-
     /**
      * @param Tag $tag
      *
@@ -77,7 +76,7 @@ class ListController extends Controller
     public function attachments(Tag $tag): 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($tag);
 
         $count       = $collection->count();
@@ -97,8 +96,6 @@ class ListController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
-
     /**
      * Show all transactions.
      *
@@ -110,7 +107,7 @@ class ListController extends Controller
      */
     public function transactions(Request $request, Tag $tag): 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);
 
@@ -151,4 +148,4 @@ class ListController extends Controller
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
-}
+}

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

@@ -19,13 +19,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Tag;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Tag;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\TagTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -41,7 +41,6 @@ class ShowController extends Controller
 {
     private TagRepositoryInterface $repository;
 
-
     /**
      * TagController constructor.
      *
@@ -73,7 +72,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();
@@ -94,8 +93,6 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
-
     /**
      * List single resource.
      *
@@ -116,4 +113,4 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
 
     }
-}
+}

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

@@ -19,13 +19,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Tag;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Tag;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Tag\StoreRequest;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\TagTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -38,7 +38,6 @@ class StoreController extends Controller
 {
     private TagRepositoryInterface $repository;
 
-
     /**
      * TagController constructor.
      *
@@ -60,8 +59,6 @@ class StoreController extends Controller
         );
     }
 
-
-
     /**
      * Store new object.
      *

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

@@ -19,14 +19,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Tag;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Tag;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Api\V1\Requests\Models\Tag\UpdateRequest;
 use FireflyIII\Models\Tag;
 use FireflyIII\Repositories\Tag\TagRepositoryInterface;
-use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\TagTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
@@ -39,7 +39,6 @@ class UpdateController extends Controller
 {
     private TagRepositoryInterface $repository;
 
-
     /**
      * TagController constructor.
      *
@@ -61,13 +60,11 @@ class UpdateController extends Controller
         );
     }
 
-
-
     /**
      * Update a rule.
      *
      * @param UpdateRequest $request
-     * @param Tag              $tag
+     * @param Tag           $tag
      *
      * @return JsonResponse
      */
@@ -85,4 +82,4 @@ class UpdateController extends Controller
 
     }
 
-}
+}