Merge branch 'release/5.5.7' into main

added has_no_bill and has_any_bill search parameters

.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: 2

.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

@@ -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
@@ -320,6 +328,7 @@ BROADCAST_DRIVER=log
 QUEUE_DRIVER=sync
 CACHE_PREFIX=firefly
 PUSHER_KEY=
+IPINFO_TOKEN=
 PUSHER_SECRET=
 PUSHER_ID=
 DEMO_USERNAME=

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.
      */

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;

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.
      */

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;
@@ -61,7 +60,6 @@ class TransactionController extends Controller
         );
     }
 
-
     /**
      * @param AutocompleteRequest $request
      *

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.
      */

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'),
+                'start_date'              => $start->toAtomString(),
-                'end_date'                => $end->format('Y-m-d'),
+                '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,71 @@
+<?php
+declare(strict_types=1);
+/*
+ * AccountController.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\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,11 +22,9 @@
 
 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;
 
@@ -44,18 +43,14 @@ 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
      *
@@ -93,7 +88,7 @@ class ExportController extends Controller
             ->header('Expires', '0')
             ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0')
             ->header('Pragma', 'public')
-            ->header('Content-Length', strlen($data[$key]));
+            ->header('Content-Length', (string)strlen($data[$key]));
 
         return $response;
     }

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

@@ -82,12 +82,14 @@ class AccountController extends Controller
         $start         = $request->getStart();
         $end           = $request->getEnd();
         $assetAccounts = $request->getAssetAccounts();
-        $expenses      = $this->opsRepository->sumExpenses($start, $end, $assetAccounts);
+        $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'],
@@ -109,12 +111,14 @@ class AccountController extends Controller
         $end             = $request->getEnd();
         $assetAccounts   = $request->getAssetAccounts();
         $expenseAccounts = $request->getExpenseAccounts();
-        $expenses        = $this->opsRepository->sumExpenses($start, $end, $assetAccounts, $expenseAccounts);
+        $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;

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;

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;

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;

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,9 +44,8 @@ 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);
             }
@@ -128,7 +127,7 @@ class TagController extends Controller
         $collector->setTypes([TransactionType::WITHDRAWAL])->setRange($start, $end)->setSourceAccounts($accounts);
         $collector->setTags($tags);
         $genericSet = $collector->getExtractedJournals();
-        /** @var array $entry */
+        /** @var array $journal */
         foreach ($genericSet as $journal) {
             $currencyId        = (int)$journal['currency_id'];
             $foreignCurrencyId = (int)$journal['foreign_currency_id'];

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

@@ -75,7 +75,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
      *
      * @return JsonResponse
@@ -85,11 +85,13 @@ class AccountController extends Controller
         $start         = $request->getStart();
         $end           = $request->getEnd();
         $assetAccounts = $request->getAssetAccounts();
-        $income        = $this->opsRepository->sumIncome($start, $end, $assetAccounts);
+        $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'],
@@ -101,7 +103,7 @@ class AccountController extends Controller
     }
 
     /**
-     * // TOOD same as
+     * TODO does not actually include the name of the expense account.
      *
      * @param GenericRequest $request
      *
@@ -113,12 +115,14 @@ class AccountController extends Controller
         $end             = $request->getEnd();
         $assetAccounts   = $request->getAssetAccounts();
         $revenueAccounts = $request->getRevenueAccounts();
-        $income          = $this->opsRepository->sumIncome($start, $end, $assetAccounts, $revenueAccounts);
+        $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;

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;

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;
@@ -130,7 +130,7 @@ class TagController extends Controller
         $collector->setTypes([TransactionType::DEPOSIT])->setRange($start, $end)->setDestinationAccounts($accounts);
         $collector->setTags($tags);
         $genericSet = $collector->getExtractedJournals();
-        /** @var array $entry */
+        /** @var array $journal */
         foreach ($genericSet as $journal) {
             $currencyId        = (int)$journal['currency_id'];
             $foreignCurrencyId = (int)$journal['foreign_currency_id'];

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);
+        $transfers     = $this->opsRepository->sumTransfers($start, $end, $assetAccounts);
-        $result        = [];
+        return response()->json($transfers);
-        /** @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);
     }
 }

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;

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;

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;
@@ -131,7 +132,7 @@ class TagController extends Controller
         $collector->setTypes([TransactionType::TRANSFER])->setRange($start, $end)->setDestinationAccounts($accounts);
         $collector->setTags($tags);
         $genericSet = $collector->getExtractedJournals();
-        /** @var array $entry */
+        /** @var array $journal */
         foreach ($genericSet as $journal) {
             $currencyId        = (int)$journal['currency_id'];
             $foreignCurrencyId = (int)$journal['foreign_currency_id'];

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;

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

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

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);
             }
         );

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;
         }
@@ -140,7 +139,6 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
     /**
      * Display the specified resource.
      *

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,13 +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.
      *

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,13 +56,11 @@ class UpdateController extends Controller
                 $this->repository = app(AttachmentRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-
                 return $next($request);
             }
         );
     }
 
-
     /**
      * Update the specified resource in storage.
      *

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;

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;

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;

app/Api/V1/Controllers/Models/AvailableBudget/UpdateController.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;

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.
      *

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);
             }
@@ -100,7 +96,6 @@ class ListController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
     /**
      * List all of them.
      *
@@ -128,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));
 
@@ -137,7 +130,6 @@ class ListController extends Controller
 
     }
 
-
     /**
      * Show all transactions.
      *

app/Api/V1/Controllers/Models/Bill/ShowController.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;
@@ -50,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);
             }

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);
             }

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);
             }

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;

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,8 +182,6 @@ 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));
 

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;

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.
      *

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;

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.
      *

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.
      *

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;

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);

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;
@@ -40,7 +41,6 @@ class UpdateController extends Controller
 {
     private BudgetLimitRepositoryInterface $blRepository;
 
-
     /**
      * BudgetLimitController constructor.
      *

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,6 +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.
      *

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.
      *
@@ -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));
 

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);
             }

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);
             }

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.
      *

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.
      *

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

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);
             }
         );

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);
             }
         );

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);
             }
         );

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);
             }
         );

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);
             }
         );

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.
      *

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);
             }

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);
             }

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,19 +49,14 @@ 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.
      *

app/Api/V1/Controllers/Models/Rule/DestroyController.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\Models\Rule;

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;
@@ -35,7 +36,6 @@ class ListController extends Controller
     private AccountRepositoryInterface $accountRepository;
     private RuleRepositoryInterface    $ruleRepository;
 
-
     /**
      * RuleController constructor.
      *

app/Api/V1/Controllers/Models/Rule/ShowController.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\Models\Rule;
@@ -61,7 +62,6 @@ class ShowController extends Controller
         );
     }
 
-
     /**
      * List all of them.
      *
@@ -95,7 +95,6 @@ class ShowController extends Controller
 
     }
 
-
     /**
      * List single resource.
      *

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;

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.
      *

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,7 +60,6 @@ class UpdateController extends Controller
         );
     }
 
-
     /**
      * Update a rule.
      *

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;

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
      *

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.
      *

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.
      *

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,7 +67,6 @@ class TriggerController extends Controller
         );
     }
 
-
     /**
      * @param TestRequest $request
      * @param RuleGroup   $group
@@ -121,7 +121,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.
      *

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,7 +61,6 @@ class UpdateController extends Controller
         );
     }
 
-
     /**
      * Update a rule group.
      *

app/Api/V1/Controllers/Models/Tag/DestroyController.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\Models\Tag;
@@ -35,7 +36,6 @@ class DestroyController extends Controller
 {
     private TagRepositoryInterface $repository;
 
-
     /**
      * TagController constructor.
      *
@@ -57,7 +57,6 @@ class DestroyController extends Controller
         );
     }
 
-
     /**
      * Delete the resource.
      *

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;
@@ -45,7 +46,6 @@ class ListController extends Controller
 
     private TagRepositoryInterface $repository;
 
-
     /**
      * TagController constructor.
      *
@@ -67,7 +67,6 @@ class ListController extends Controller
         );
     }
 
-
     /**
      * @param Tag $tag
      *
@@ -97,7 +96,6 @@ class ListController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
     /**
      * Show all transactions.
      *

app/Api/V1/Controllers/Models/Tag/ShowController.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\Models\Tag;
@@ -40,7 +41,6 @@ class ShowController extends Controller
 {
     private TagRepositoryInterface $repository;
 
-
     /**
      * TagController constructor.
      *
@@ -93,7 +93,6 @@ class ShowController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
     /**
      * List single resource.
      *

app/Api/V1/Controllers/Models/Tag/StoreController.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\Api\V1\Requests\Models\Tag\StoreRequest;
@@ -37,7 +38,6 @@ class StoreController extends Controller
 {
     private TagRepositoryInterface $repository;
 
-
     /**
      * TagController constructor.
      *
@@ -59,7 +59,6 @@ class StoreController extends Controller
         );
     }
 
-
     /**
      * Store new object.
      *

app/Api/V1/Controllers/Models/Tag/UpdateController.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\Api\V1\Requests\Models\Tag\UpdateRequest;
@@ -38,7 +39,6 @@ class UpdateController extends Controller
 {
     private TagRepositoryInterface $repository;
 
-
     /**
      * TagController constructor.
      *
@@ -60,7 +60,6 @@ class UpdateController extends Controller
         );
     }
 
-
     /**
      * Update a rule.
      *

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Transaction;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Transaction;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Events\DestroyedTransactionGroup;
@@ -37,7 +38,6 @@ class DestroyController extends Controller
 {
     private JournalRepositoryInterface $repository;
 
-
     /**
      * TransactionController constructor.
      *
@@ -59,7 +59,6 @@ class DestroyController extends Controller
         );
     }
 
-
     /**
      * Remove the specified resource from storage.
      *
@@ -77,7 +76,6 @@ class DestroyController extends Controller
         return response()->json([], 204);
     }
 
-
     /**
      * Remove the specified resource from storage.
      *

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

@@ -19,8 +19,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace FireflyIII\Api\V1\Controllers\Models\Transaction;
+declare(strict_types=1);
 
+namespace FireflyIII\Api\V1\Controllers\Models\Transaction;
 
 use FireflyIII\Api\V1\Controllers\Controller;
 use FireflyIII\Models\TransactionGroup;
@@ -64,7 +65,6 @@ class ListController extends Controller
         );
     }
 
-
     /**
      * @param TransactionGroup $transactionGroup
      *
@@ -97,7 +97,6 @@ class ListController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
     /**
      * @param TransactionGroup $transactionGroup
      *
@@ -114,8 +113,6 @@ class ListController extends Controller
         }
         $count  = $collection->count();
         $events = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
-
-
         // make paginator:
         $paginator = new LengthAwarePaginator($events, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.transactions.piggy_bank_events', [$transactionGroup->id]) . $this->buildParams());
@@ -126,8 +123,6 @@ class ListController extends Controller
 
         $resource = new FractalCollection($events, $transformer, 'piggy_bank_events');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
-
-
         //        /** @var PiggyBankEventTransformer $transformer */
         //        $transformer = app(PiggyBankEventTransformer::class);
         //        $transformer->setParameters($this->parameters);
@@ -137,7 +132,6 @@ class ListController extends Controller
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', self::CONTENT_TYPE);
     }
 
-
     /**
      * @param TransactionJournal $transactionJournal
      *