Use PSR-12 code style

app/Http/Controllers/Chart/PiggyBankController.php

@@ -69,7 +69,7 @@ class PiggyBankController extends Controller
     public function history(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank): JsonResponse
     {
         // chart properties for cache:
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty('chart.piggy-bank.history');
         $cache->addProperty($piggyBank->id);
         if ($cache->has()) {
@@ -84,7 +84,7 @@ class PiggyBankController extends Controller
 
         /** @var PiggyBankEvent $firstEvent */
         $firstEvent = $set->first();
-        $firstDate  = null === $firstEvent ? new Carbon : $firstEvent->date;
+        $firstDate  = null === $firstEvent ? new Carbon() : $firstEvent->date;
 
         // which ever is older:
         $oldest = $startDate->lt($firstDate) ? $startDate : $firstDate;

app/Http/Controllers/Chart/ReportController.php

@@ -43,7 +43,8 @@ use Log;
  */
 class ReportController extends Controller
 {
-    use BasicDataSupport, ChartGeneration;
+    use BasicDataSupport;
+    use ChartGeneration;
 
     /** @var GeneratorInterface Chart generation methods. */
     protected $generator;
@@ -74,7 +75,7 @@ class ReportController extends Controller
     public function netWorth(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
     {
         // chart properties for cache:
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty('chart.report.net-worth');
         $cache->addProperty($start);
         $cache->addProperty(implode(',', $accounts->pluck('id')->toArray()));
@@ -125,7 +126,6 @@ class ReportController extends Controller
                     ];
                 }
                 $chartData[$currencyId]['entries'][$label] = $netWorthItem['balance'];
-
             }
             $current->addDays(7);
         }
@@ -149,7 +149,7 @@ class ReportController extends Controller
     public function operations(Collection $accounts, Carbon $start, Carbon $end): JsonResponse
     {
         // chart properties for cache:
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty('chart.report.operations');
         $cache->addProperty($start);
         $cache->addProperty($accounts);

app/Http/Controllers/Chart/TagReportController.php

@@ -37,7 +37,8 @@ use Illuminate\Support\Collection;
  */
 class TagReportController extends Controller
 {
-    use AugumentData, TransactionCalculation;
+    use AugumentData;
+    use TransactionCalculation;
 
     /** @var GeneratorInterface Chart generation methods. */
     protected $generator;

app/Http/Controllers/Chart/TransactionController.php

@@ -39,7 +39,6 @@ use JsonException;
  */
 class TransactionController extends Controller
 {
-
     /** @var GeneratorInterface Chart generation methods. */
     protected $generator;
 
@@ -60,7 +59,7 @@ class TransactionController extends Controller
      */
     public function budgets(Carbon $start, Carbon $end)
     {
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('chart.transactions.budgets');
@@ -104,7 +103,7 @@ class TransactionController extends Controller
      */
     public function categories(string $objectType, Carbon $start, Carbon $end)
     {
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($objectType);
@@ -144,7 +143,6 @@ class TransactionController extends Controller
                     'currency_code'   => $journal['currency_code'],
                 ];
             $data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']);
-
         }
         $chart = $this->generator->multiCurrencyPieChart($data);
         $cache->store($chart);
@@ -162,7 +160,7 @@ class TransactionController extends Controller
      */
     public function destinationAccounts(string $objectType, Carbon $start, Carbon $end)
     {
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($objectType);
@@ -219,7 +217,7 @@ class TransactionController extends Controller
      */
     public function sourceAccounts(string $objectType, Carbon $start, Carbon $end)
     {
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($objectType);
@@ -259,7 +257,6 @@ class TransactionController extends Controller
                     'currency_code'   => $journal['currency_code'],
                 ];
             $data[$title]['amount'] = bcadd($data[$title]['amount'], $journal['amount']);
-
         }
         $chart = $this->generator->multiCurrencyPieChart($data);
         $cache->store($chart);

app/Http/Controllers/Export/IndexController.php

@@ -38,7 +38,6 @@ use Illuminate\View\View;
  */
 class IndexController extends Controller
 {
-
     private JournalRepositoryInterface $journalRepository;
 
     /**
@@ -112,5 +111,4 @@ class IndexController extends Controller
     {
         return view('export.index');
     }
-
 }

app/Http/Controllers/Json/AutoCompleteController.php

@@ -29,6 +29,4 @@ use FireflyIII\Http\Controllers\Controller;
  */
 class AutoCompleteController extends Controller
 {
-
-
 }

app/Http/Controllers/Json/BoxController.php

@@ -67,7 +67,7 @@ class BoxController extends Controller
         $display  = 2; // see method docs.
         $boxTitle = (string) trans('firefly.spent');
 
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty($today);
@@ -138,7 +138,7 @@ class BoxController extends Controller
         $start = session('start', Carbon::now()->startOfMonth());
         /** @var Carbon $end */
         $end   = session('end', Carbon::now()->endOfMonth());
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('box-balance');
@@ -261,5 +261,4 @@ class BoxController extends Controller
 
         return response()->json($return);
     }
-
 }

app/Http/Controllers/Json/BudgetController.php

@@ -113,5 +113,4 @@ class BudgetController extends Controller
             ]
         );
     }
-
 }

app/Http/Controllers/Json/FrontpageController.php

@@ -70,12 +70,10 @@ class FrontpageController extends Controller
         if (!empty($info)) {
             try {
                 $html = view('json.piggy-banks', compact('info'))->render();
-
             } catch (Throwable $e) { // @phpstan-ignore-line
                 Log::error(sprintf('Cannot render json.piggy-banks: %s', $e->getMessage()));
                 $html = 'Could not render view.';
             }
-
         }
 
         return response()->json(['html' => $html]);

app/Http/Controllers/Json/IntroController.php

@@ -55,7 +55,6 @@ class IntroController extends Controller
             return response()->json($steps);
         }
         if ($this->hasOutroStep($route)) {
-
             // save last step:
             $lastStep = $steps[count($steps) - 1];
             // remove last step:
@@ -63,7 +62,6 @@ class IntroController extends Controller
             // merge arrays and add last step again
             $steps   = array_merge($steps, $specificSteps);
             $steps[] = $lastStep;
-
         }
         if (!$this->hasOutroStep($route)) {
             $steps = array_merge($steps, $specificSteps);
@@ -142,5 +140,4 @@ class IntroController extends Controller
 
         return response()->json(['result' => sprintf('Reported demo watched for route "%s" (%s): %s.', $route, $specialPage, $key)]);
     }
-
 }

app/Http/Controllers/Json/ReconcileController.php

@@ -161,7 +161,6 @@ class ReconcileController extends Controller
                     'selectedIds'
                 )
             )->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('View error: %s', $e->getMessage()));
             $view = sprintf('Could not render accounts.reconcile.overview: %s', $e->getMessage());
@@ -262,7 +261,6 @@ class ReconcileController extends Controller
                 'accounts.reconcile.transactions',
                 compact('account', 'journals', 'currency', 'start', 'end', 'selectionStart', 'selectionEnd')
             )->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render: %s', $e->getMessage()));
             $html = sprintf('Could not render accounts.reconcile.transactions: %s', $e->getMessage());

app/Http/Controllers/Json/RecurrenceController.php

@@ -97,7 +97,7 @@ class RecurrenceController extends Controller
             $repetitionMoment = explode(',', $request->get('type'))[1] ?? '2018-01-01';
         }
         $actualStart->startOfDay();
-        $repetition                    = new RecurrenceRepetition;
+        $repetition                    = new RecurrenceRepetition();
         $repetition->repetition_type   = $repetitionType;
         $repetition->repetition_moment = $repetitionMoment;
         $repetition->repetition_skip   = (int) $request->get('skip');

app/Http/Controllers/Json/RuleController.php

@@ -51,7 +51,6 @@ class RuleController extends Controller
         }
         try {
             $view = view('rules.partials.action', compact('actions', 'count'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Cannot render rules.partials.action: %s', $e->getMessage()));
             $view = 'Could not render view.';
@@ -74,7 +73,6 @@ class RuleController extends Controller
         $triggers  = [];
         foreach ($operators as $key => $operator) {
             if ('user_action' !== $key && false === $operator['alias']) {
-
                 $triggers[$key] = (string) trans(sprintf('firefly.rule_trigger_%s_choice', $key));
             }
         }
@@ -89,5 +87,4 @@ class RuleController extends Controller
 
         return response()->json(['html' => $view]);
     }
-
 }

app/Http/Controllers/ObjectGroup/DeleteController.php

@@ -92,5 +92,4 @@ class DeleteController extends Controller
 
         return redirect($this->getPreviousUrl('object-groups.delete.url'));
     }
-
 }

app/Http/Controllers/ObjectGroup/EditController.php

@@ -101,11 +101,9 @@ class EditController extends Controller
         $redirect = redirect($this->getPreviousUrl('object-groups.edit.url'));
 
         if (1 === (int) $request->get('return_to_edit')) {
-
             session()->put('object-groups.edit.fromUpdate', true);
 
             $redirect = redirect(route('object-groups.edit', [$piggyBank->id]));
-
         }
 
         return $redirect;

app/Http/Controllers/ObjectGroup/IndexController.php

@@ -88,5 +88,4 @@ class IndexController extends Controller
 
         return response()->json([]);
     }
-
 }

app/Http/Controllers/PiggyBank/AmountController.php

@@ -40,7 +40,6 @@ use Log;
  */
 class AmountController extends Controller
 {
-
     private AccountRepositoryInterface   $accountRepos;
     private PiggyBankRepositoryInterface $piggyRepos;
 

app/Http/Controllers/PiggyBank/CreateController.php

@@ -118,11 +118,9 @@ class CreateController extends Controller
         $redirect = redirect($this->getPreviousUrl('piggy-banks.create.url'));
 
         if (1 === (int) $request->get('create_another')) {
-
             session()->put('piggy-banks.create.fromStore', true);
 
             $redirect = redirect(route('piggy-banks.create'))->withInput();
-
         }
 
         return $redirect;

app/Http/Controllers/PiggyBank/DeleteController.php

@@ -36,7 +36,6 @@ use Illuminate\View\View;
  */
 class DeleteController extends Controller
 {
-
     private PiggyBankRepositoryInterface $piggyRepos;
 
     /**

app/Http/Controllers/PiggyBank/EditController.php

@@ -141,14 +141,11 @@ class EditController extends Controller
         $redirect = redirect($this->getPreviousUrl('piggy-banks.edit.url'));
 
         if (1 === (int) $request->get('return_to_edit')) {
-
             session()->put('piggy-banks.edit.fromUpdate', true);
 
             $redirect = redirect(route('piggy-banks.edit', [$piggyBank->id]));
-
         }
 
         return $redirect;
     }
-
 }

app/Http/Controllers/PiggyBank/IndexController.php

@@ -88,7 +88,7 @@ class IndexController extends Controller
         $end = session('end', Carbon::now()->endOfMonth());
 
         // transform piggies using the transformer:
-        $parameters = new ParameterBag;
+        $parameters = new ParameterBag();
         $parameters->set('end', $end);
 
         // make piggy bank groups:
@@ -96,7 +96,7 @@ class IndexController extends Controller
 
         /** @var PiggyBankTransformer $transformer */
         $transformer = app(PiggyBankTransformer::class);
-        $transformer->setParameters(new ParameterBag);
+        $transformer->setParameters(new ParameterBag());
 
         /** @var AccountTransformer $accountTransformer */
         $accountTransformer = app(AccountTransformer::class);

app/Http/Controllers/PiggyBank/ShowController.php

@@ -73,7 +73,7 @@ class ShowController extends Controller
         /** @var Carbon $end */
         $end = session('end', Carbon::now()->endOfMonth());
         // transform piggies using the transformer:
-        $parameters = new ParameterBag;
+        $parameters = new ParameterBag();
         $parameters->set('end', $end);
 
         /** @var PiggyBankTransformer $transformer */

app/Http/Controllers/Recurring/DeleteController.php

@@ -97,5 +97,4 @@ class DeleteController extends Controller
 
         return redirect($this->getPreviousUrl('recurrences.delete.url'));
     }
-
 }

app/Http/Controllers/Recurring/EditController.php

@@ -97,7 +97,7 @@ class EditController extends Controller
 
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
-        $transformer->setParameters(new ParameterBag);
+        $transformer->setParameters(new ParameterBag());
 
         $array   = $transformer->transform($recurrence);
         $budgets = app('expandedform')->makeSelectListWithEmpty($this->budgetRepos->getActiveBudgets());
@@ -151,8 +151,15 @@ class EditController extends Controller
         return view(
             'recurring.edit',
             compact(
-                'recurrence', 'array', 'bills',
+                'recurrence',
-                'weekendResponses', 'budgets', 'preFilled', 'currentRepType', 'repetitionEnd', 'repetitionEnds'
+                'array',
+                'bills',
+                'weekendResponses',
+                'budgets',
+                'preFilled',
+                'currentRepType',
+                'repetitionEnd',
+                'repetitionEnds'
             )
         );
     }

app/Http/Controllers/Recurring/IndexController.php

@@ -92,12 +92,11 @@ class IndexController extends Controller
 
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
-        $transformer->setParameters(new ParameterBag);
+        $transformer->setParameters(new ParameterBag());
 
         $recurring = [];
         /** @var Recurrence $recurrence */
         foreach ($recurrences as $recurrence) {
-
             $year->addYear();
             if ($recurrence->first_date > $today) {
                 $today = clone $recurrence->first_date;
@@ -128,5 +127,4 @@ class IndexController extends Controller
 
         return view('recurring.index', compact('paginator', 'today', 'page', 'pageSize', 'total'));
     }
-
 }

app/Http/Controllers/Recurring/ShowController.php

@@ -80,7 +80,7 @@ class ShowController extends Controller
     {
         /** @var RecurrenceTransformer $transformer */
         $transformer = app(RecurrenceTransformer::class);
-        $transformer->setParameters(new ParameterBag);
+        $transformer->setParameters(new ParameterBag());
 
         $array                 = $transformer->transform($recurrence);
         $groups                = $this->recurring->getTransactions($recurrence);

app/Http/Controllers/Report/AccountController.php

@@ -36,7 +36,6 @@ use Throwable;
  */
 class AccountController extends Controller
 {
-
     /**
      * Show partial overview for account balances.
      *
@@ -49,7 +48,7 @@ class AccountController extends Controller
     public function general(Collection $accounts, Carbon $start, Carbon $end)
     {
         // chart properties for cache:
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('account-report');
@@ -63,7 +62,6 @@ class AccountController extends Controller
         $accountReport = $accountTasker->getAccountReport($accounts, $start, $end);
         try {
             $result = view('reports.partials.accounts', compact('accountReport'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.accounts: %s', $e->getMessage()));
             $result = 'Could not render view.';

app/Http/Controllers/Report/BalanceController.php

@@ -137,7 +137,6 @@ class BalanceController extends Controller
         }
         try {
             $result = view('reports.partials.balance', compact('report'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.balance: %s', $e->getMessage()));
             $result = 'Could not render view.';

app/Http/Controllers/Report/BillController.php

@@ -46,7 +46,7 @@ class BillController extends Controller
      */
     public function overview(Collection $accounts, Carbon $start, Carbon $end)
     {   // chart properties for cache:
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('bill-report');
@@ -59,7 +59,6 @@ class BillController extends Controller
         $report = $helper->getBillReport($accounts, $start, $end);
         try {
             $result = view('reports.partials.bills', compact('report'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budgets: %s', $e->getMessage()));
             $result = 'Could not render view.';
@@ -68,6 +67,5 @@ class BillController extends Controller
         $cache->store($result);
 
         return $result;
-
     }
 }

app/Http/Controllers/Report/BudgetController.php

@@ -198,7 +198,6 @@ class BudgetController extends Controller
 
         try {
             $result = view('reports.budget.partials.avg-expenses', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
@@ -312,7 +311,7 @@ class BudgetController extends Controller
      */
     public function period(Collection $accounts, Carbon $start, Carbon $end)
     {
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('budget-period-report');
@@ -354,7 +353,6 @@ class BudgetController extends Controller
         }
         try {
             $result = view('reports.partials.budget-period', compact('report', 'periods'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = 'Could not render view.';
@@ -406,7 +404,6 @@ class BudgetController extends Controller
 
         try {
             $result = view('reports.budget.partials.top-expenses', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());

app/Http/Controllers/Report/CategoryController.php

@@ -312,7 +312,6 @@ class CategoryController extends Controller
 
         try {
             $result = view('reports.category.partials.avg-expenses', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
@@ -364,7 +363,6 @@ class CategoryController extends Controller
 
         try {
             $result = view('reports.category.partials.avg-income', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
@@ -493,7 +491,7 @@ class CategoryController extends Controller
      */
     public function expenses(Collection $accounts, Carbon $start, Carbon $end)
     {
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('category-period-expenses-report');
@@ -549,7 +547,6 @@ class CategoryController extends Controller
 
         try {
             $result = view('reports.partials.category-period', compact('report', 'periods'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
             $result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());
@@ -574,7 +571,7 @@ class CategoryController extends Controller
      */
     public function income(Collection $accounts, Carbon $start, Carbon $end): string
     {
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('category-period-income-report');
@@ -629,7 +626,6 @@ class CategoryController extends Controller
 
         try {
             $result = view('reports.partials.category-period', compact('report', 'periods'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
             $result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());
@@ -653,7 +649,7 @@ class CategoryController extends Controller
     public function operations(Collection $accounts, Carbon $start, Carbon $end): string
     {
         // chart properties for cache:
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('category-report');
@@ -723,7 +719,6 @@ class CategoryController extends Controller
 
         try {
             $result = view('reports.category.partials.top-expenses', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
@@ -773,7 +768,6 @@ class CategoryController extends Controller
 
         try {
             $result = view('reports.category.partials.top-income', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
@@ -781,5 +775,4 @@ class CategoryController extends Controller
 
         return $result;
     }
-
 }

app/Http/Controllers/Report/DoubleController.php

@@ -111,7 +111,6 @@ class DoubleController extends Controller
 
         try {
             $result = view('reports.double.partials.avg-expenses', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
@@ -163,7 +162,6 @@ class DoubleController extends Controller
 
         try {
             $result = view('reports.double.partials.avg-income', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
@@ -457,7 +455,6 @@ class DoubleController extends Controller
 
         try {
             $result = view('reports.double.partials.top-expenses', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
@@ -507,7 +504,6 @@ class DoubleController extends Controller
 
         try {
             $result = view('reports.double.partials.top-income', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());

app/Http/Controllers/Report/OperationsController.php

@@ -36,7 +36,6 @@ use Throwable;
  */
 class OperationsController extends Controller
 {
-
     /** @var AccountTaskerInterface Some specific account things. */
     private $tasker;
 
@@ -71,7 +70,7 @@ class OperationsController extends Controller
     public function expenses(Collection $accounts, Carbon $start, Carbon $end)
     {
         // chart properties for cache:
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('expense-report');
@@ -83,7 +82,6 @@ class OperationsController extends Controller
         $type   = 'expense-entry';
         try {
             $result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.income-expense: %s', $e->getMessage()));
             $result = 'Could not render view.';
@@ -106,7 +104,7 @@ class OperationsController extends Controller
     public function income(Collection $accounts, Carbon $start, Carbon $end): string
     {
         // chart properties for cache:
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('income-report');
@@ -118,7 +116,6 @@ class OperationsController extends Controller
         $type   = 'income-entry';
         try {
             $result = view('reports.partials.income-expenses', compact('report', 'type'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.income-expenses: %s', $e->getMessage()));
             $result = 'Could not render view.';
@@ -141,7 +138,7 @@ class OperationsController extends Controller
     public function operations(Collection $accounts, Carbon $start, Carbon $end)
     {
         // chart properties for cache:
-        $cache = new CacheProperties;
+        $cache = new CacheProperties();
         $cache->addProperty($start);
         $cache->addProperty($end);
         $cache->addProperty('inc-exp-report');

app/Http/Controllers/Report/TagController.php

@@ -305,7 +305,6 @@ class TagController extends Controller
 
         try {
             $result = view('reports.tag.partials.avg-expenses', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
@@ -357,7 +356,6 @@ class TagController extends Controller
 
         try {
             $result = view('reports.tag.partials.avg-income', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
@@ -515,7 +513,6 @@ class TagController extends Controller
 
         try {
             $result = view('reports.tag.partials.top-expenses', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
@@ -565,7 +562,6 @@ class TagController extends Controller
 
         try {
             $result = view('reports.tag.partials.top-income', compact('result'))->render();
-
         } catch (Throwable $e) { // @phpstan-ignore-line
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());

app/Http/Controllers/Rule/CreateController.php

@@ -45,7 +45,8 @@ use Illuminate\View\View;
  */
 class CreateController extends Controller
 {
-    use RuleManagement, ModelInformation;
+    use RuleManagement;
+    use ModelInformation;
 
     private RuleRepositoryInterface $ruleRepos;
 
@@ -279,10 +280,8 @@ class CreateController extends Controller
         $redirect = redirect($this->getPreviousUrl('rules.create.url'));
 
         if (1 === (int) $request->get('create_another')) {
-
             session()->put('rules.create.fromStore', true);
             $redirect = redirect(route('rules.create', [$data['rule_group_id']]))->withInput();
-
         }
 
         return $redirect;

app/Http/Controllers/Rule/DeleteController.php

@@ -93,5 +93,4 @@ class DeleteController extends Controller
 
         return redirect($this->getPreviousUrl('rules.delete.url'));
     }
-
 }

app/Http/Controllers/Rule/EditController.php

@@ -44,7 +44,8 @@ use Throwable;
  */
 class EditController extends Controller
 {
-    use RuleManagement, RenderPartialViews;
+    use RuleManagement;
+    use RenderPartialViews;
 
     private RuleRepositoryInterface $ruleRepos;
 
@@ -149,7 +150,6 @@ class EditController extends Controller
         $triggers        = [];
         foreach ($operators as $key => $operator) {
             if ('user_action' !== $key && false === $operator['alias']) {
-
                 $triggers[$key] = (string) trans(sprintf('firefly.rule_trigger_%s_choice', $key));
             }
         }
@@ -196,11 +196,9 @@ class EditController extends Controller
         app('preferences')->mark();
         $redirect = redirect($this->getPreviousUrl('rules.edit.url'));
         if (1 === (int) $request->get('return_to_edit')) {
-
             session()->put('rules.edit.fromUpdate', true);
 
             $redirect = redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]);
-
         }
 
         return $redirect;

app/Http/Controllers/Rule/IndexController.php

@@ -106,5 +106,4 @@ class IndexController extends Controller
 
         return redirect($route);
     }
-
 }

app/Http/Controllers/Rule/SelectController.php

@@ -136,8 +136,8 @@ class SelectController extends Controller
     public function testTriggers(TestRuleFormRequest $request): JsonResponse
     {
         // build fake rule
-        $rule         = new Rule;
+        $rule         = new Rule();
-        $triggers     = new Collection;
+        $triggers     = new Collection();
         $rule->strict = '1' === $request->get('strict');
 
         // build trigger array from response
@@ -149,7 +149,7 @@ class SelectController extends Controller
         }
 
         foreach ($textTriggers as $textTrigger) {
-            $trigger                = new RuleTrigger;
+            $trigger                = new RuleTrigger();
             $trigger->trigger_type  = $textTrigger['type'];
             $trigger->trigger_value = $textTrigger['value'];
             $triggers->push($trigger);
@@ -176,7 +176,6 @@ class SelectController extends Controller
         $view = 'ERROR, see logs.';
         try {
             $view = view('list.journals-array-tiny', ['groups' => $collection])->render();
-
         } catch (Throwable $exception) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));
             Log::error($exception->getTraceAsString());
@@ -219,7 +218,6 @@ class SelectController extends Controller
         $view = 'ERROR, see logs.';
         try {
             $view = view('list.journals-array-tiny', ['groups' => $collection])->render();
-
         } catch (Throwable $exception) { // @phpstan-ignore-line
             Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage()));
             Log::error($exception->getTraceAsString());

app/Http/Controllers/RuleGroup/CreateController.php

@@ -96,11 +96,9 @@ class CreateController extends Controller
 
         $redirect = redirect($this->getPreviousUrl('rule-groups.create.url'));
         if (1 === (int) $request->get('create_another')) {
-
             session()->put('rule-groups.create.fromStore', true);
 
             $redirect = redirect(route('rule-groups.create'))->withInput();
-
         }
 
         return $redirect;

app/Http/Controllers/RuleGroup/DeleteController.php

@@ -99,5 +99,4 @@ class DeleteController extends Controller
 
         return redirect($this->getPreviousUrl('rule-groups.delete.url'));
     }
-
 }

app/Http/Controllers/RuleGroup/EditController.php

@@ -142,15 +142,12 @@ class EditController extends Controller
         app('preferences')->mark();
         $redirect = redirect($this->getPreviousUrl('rule-groups.edit.url'));
         if (1 === (int) $request->get('return_to_edit')) {
-
             session()->put('rule-groups.edit.fromUpdate', true);
 
             $redirect = redirect(route('rule-groups.edit', [$ruleGroup->id]))->withInput(['return_to_edit' => 1]);
-
         }
 
         // redirect to previous URL.
         return $redirect;
     }
-
 }

app/Http/Controllers/System/HealthcheckController.php

@@ -39,6 +39,4 @@ class HealthcheckController extends Controller
     {
         return response('OK', 200);
     }
-
 }
-

app/Http/Controllers/System/InstallController.php

@@ -229,7 +229,7 @@ class InstallController extends Controller
         if (class_exists(LegacyRSA::class)) {
             // PHP 7
             Log::info('Will run PHP7 code.');
-            $keys = (new LegacyRSA)->createKey(4096);
+            $keys = (new LegacyRSA())->createKey(4096);
         }
 
         if (!class_exists(LegacyRSA::class)) {

app/Http/Controllers/Transaction/BulkController.php

@@ -104,7 +104,7 @@ class BulkController extends Controller
         $ignoreCategory = 1 === (int) $request->get('ignore_category');
         $ignoreBudget   = 1 === (int) $request->get('ignore_budget');
         $tagsAction     = $request->get('tags_action');
-        $collection     = new Collection;
+        $collection     = new Collection();
         $count          = 0;
 
         foreach ($journalIds as $journalId) {

app/Http/Controllers/Transaction/ConvertController.php

@@ -167,10 +167,8 @@ class ConvertController extends Controller
                 $role = 'l_' . $account->accountType->type;
             }
             if (AccountType::CASH === $account->accountType->type) {
-
                 $role = 'cash_account';
                 $name = sprintf('(%s)', trans('firefly.cash'));
-
             }
             if (AccountType::REVENUE === $account->accountType->type) {
                 $role = 'revenue_account';
@@ -208,10 +206,8 @@ class ConvertController extends Controller
                 $role = 'l_' . $account->accountType->type;
             }
             if (AccountType::CASH === $account->accountType->type) {
-
                 $role = 'cash_account';
                 $name = sprintf('(%s)', trans('firefly.cash'));
-
             }
             if (AccountType::EXPENSE === $account->accountType->type) {
                 $role = 'expense_account';

app/Http/Controllers/Transaction/DeleteController.php

@@ -83,7 +83,7 @@ class DeleteController extends Controller
 
         $journal = $group->transactionJournals->first();
         if (null === $journal) {
-            throw new NotFoundHttpException;
+            throw new NotFoundHttpException();
         }
         $objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
         $subTitle   = (string) trans('firefly.delete_' . $objectType, ['description' => $group->title ?? $journal->description]);
@@ -110,7 +110,7 @@ class DeleteController extends Controller
 
         $journal = $group->transactionJournals->first();
         if (null === $journal) {
-            throw new NotFoundHttpException;
+            throw new NotFoundHttpException();
         }
         $objectType = strtolower($journal->transaction_type_type ?? $journal->transactionType->type);
         session()->flash('success', (string) trans('firefly.deleted_' . strtolower($objectType), ['description' => $group->title ?? $journal->description]));
@@ -118,12 +118,12 @@ class DeleteController extends Controller
         // grab asset account(s) from group:
         $accounts = [];
         /** @var TransactionJournal $journal */
-        foreach($group->transactionJournals as $journal) {
+        foreach ($group->transactionJournals as $journal) {
             /** @var Transaction $transaction */
-            foreach($journal->transactions as $transaction) {
+            foreach ($journal->transactions as $transaction) {
                 $type = $transaction->account->accountType->type;
                 // if is valid liability, trigger event!
-                if(in_array($type, config('firefly.valid_liabilities'))) {
+                if (in_array($type, config('firefly.valid_liabilities'), true)) {
                     $accounts[] = $transaction->account;
                 }
             }
@@ -135,7 +135,7 @@ class DeleteController extends Controller
 
 
         /** @var Account $account */
-        foreach($accounts as $account) {
+        foreach ($accounts as $account) {
             Log::debug(sprintf('Now going to trigger updated account event for account #%d', $account->id));
             event(new UpdatedAccount($account));
         }

app/Http/Controllers/Transaction/EditController.php

@@ -48,7 +48,6 @@ class EditController extends Controller
         // some useful repositories:
         $this->middleware(
             static function ($request, $next) {
-
                 app('view')->share('title', (string) trans('firefly.transactions'));
                 app('view')->share('mainTitleIcon', 'fa-exchange');
 
@@ -88,10 +87,15 @@ class EditController extends Controller
         return view(
             'transactions.edit',
             compact(
-                'cash', 'allowedSourceDests', 'expectedSourceTypes', 'transactionGroup', 'allowedOpposingTypes', 'accountToTypes', 'defaultCurrency',
+                'cash',
+                'allowedSourceDests',
+                'expectedSourceTypes',
+                'transactionGroup',
+                'allowedOpposingTypes',
+                'accountToTypes',
+                'defaultCurrency',
                 'previousUrl'
             )
         );
     }
-
 }

app/Http/Controllers/Transaction/IndexController.php

@@ -104,7 +104,7 @@ class IndexController extends Controller
         $subTitle = (string) trans(sprintf('firefly.title_%s_between', $objectType), ['start' => $startStr, 'end' => $endStr]);
 
         $firstJournal = $this->repository->firstNull();
-        $startPeriod  = null === $firstJournal ? new Carbon : $firstJournal->date;
+        $startPeriod  = null === $firstJournal ? new Carbon() : $firstJournal->date;
         $endPeriod    = clone $end;
         $periods      = $this->getTransactionPeriodOverview($objectType, $startPeriod, $endPeriod);
 
@@ -144,7 +144,7 @@ class IndexController extends Controller
         $pageSize     = (int) app('preferences')->get('listPageSize', 50)->data;
         $path         = route('transactions.index.all', [$objectType]);
         $first        = $this->repository->firstNull();
-        $start        = null === $first ? new Carbon : $first->date;
+        $start        = null === $first ? new Carbon() : $first->date;
         $last         = $this->repository->getLast();
         $end          = $last ? $last->date : today(config('app.timezone'));
         $subTitle     = (string) trans('firefly.all_' . $objectType);

app/Http/Controllers/Transaction/MassController.php

@@ -102,7 +102,6 @@ class MassController extends Controller
         if (is_array($ids)) {
             /** @var string $journalId */
             foreach ($ids as $journalId) {
-
                 /** @var TransactionJournal $journal */
                 $journal = $this->repository->find((int) $journalId);
                 if (null !== $journal && (int) $journalId === $journal->id) {

app/Http/Controllers/Transaction/ShowController.php

@@ -36,7 +36,6 @@ use Illuminate\Http\Request;
 use Illuminate\View\View;
 use Symfony\Component\HttpFoundation\ParameterBag;
 
-
 /**
  * Class ShowController
  */
@@ -99,7 +98,7 @@ class ShowController extends Controller
 
         /** @var TransactionGroupTransformer $transformer */
         $transformer = app(TransactionGroupTransformer::class);
-        $transformer->setParameters(new ParameterBag);
+        $transformer->setParameters(new ParameterBag());
         $groupArray = $transformer->transformObject($transactionGroup);
 
         // do some calculations:
@@ -112,7 +111,7 @@ class ShowController extends Controller
 
         // get audit log entries:
         $logEntries = [];
-        foreach($transactionGroup->transactionJournals as $journal) {
+        foreach ($transactionGroup->transactionJournals as $journal) {
             $logEntries[$journal->id] = $this->ALERepository->getForObject($journal);
         }
 

app/Http/Controllers/Webhooks/CreateController.php

@@ -33,7 +33,6 @@ use Illuminate\View\View;
  */
 class CreateController extends Controller
 {
-
     /**
      *
      */
@@ -64,5 +63,4 @@ class CreateController extends Controller
         $previousUrl = $this->rememberPreviousUrl('webhooks.create.url');
         return view('webhooks.create', compact('previousUrl'));
     }
-
 }

app/Http/Controllers/Webhooks/DeleteController.php

@@ -72,5 +72,4 @@ class DeleteController extends Controller
 
         return view('webhooks.delete', compact('webhook', 'subTitle'));
     }
-
 }

app/Http/Controllers/Webhooks/EditController.php

@@ -73,5 +73,4 @@ class EditController extends Controller
 
         return view('webhooks.edit', compact('webhook', 'subTitle'));
     }
-
 }

app/Http/Controllers/Webhooks/IndexController.php

@@ -35,7 +35,6 @@ use Illuminate\View\View;
  */
 class IndexController extends Controller
 {
-
     /**
      *
      */
@@ -63,8 +62,6 @@ class IndexController extends Controller
      */
     public function index(Request $request)
     {
-
         return view('webhooks.index');
     }
-
 }

app/Http/Controllers/Webhooks/ShowController.php

@@ -72,5 +72,4 @@ class ShowController extends Controller
 
         return view('webhooks.show', compact('webhook', 'subTitle'));
     }
-
 }

app/Http/Middleware/Authenticate.php

@@ -87,12 +87,10 @@ class Authenticate
      */
     protected function authenticate($request, array $guards)
     {
-
         if (empty($guards)) {
             try {
                 // go for default guard:
                 if ($this->auth->check()) {
-
                     // do an extra check on user object.
                     /** @var User $user */
                     $user = $this->auth->authenticate();
@@ -108,14 +106,14 @@ class Authenticate
                     }
                 }
             } catch (QueryException $e) {
-
                 throw new FireflyException(
                     sprintf(
                         'It seems the database has not yet been initialized. Did you run the correct upgrade or installation commands? Error: %s',
                         $e->getMessage()
-                    ), 0, $e
+                    ),
+                    0,
+                    $e
                 );
-
             }
 
             return $this->auth->authenticate();
@@ -129,6 +127,5 @@ class Authenticate
         }
 
         throw new AuthenticationException('Unauthenticated.', $guards);
-
     }
 }

app/Http/Middleware/Installer.php

@@ -96,7 +96,9 @@ class Installer
             Log::error(sprintf('Error message trying to access users-table: %s', $message));
             if ($this->isAccessDenied($message)) {
                 throw new FireflyException(
-                    'It seems your database configuration is not correct. Please verify the username and password in your .env file.', 0, $e
+                    'It seems your database configuration is not correct. Please verify the username and password in your .env file.',
+                    0,
+                    $e
                 );
             }
             if ($this->noTablesExist($message)) {

app/Http/Middleware/InterestingMessage.php

@@ -100,7 +100,6 @@ class InterestingMessage
      */
     private function handleGroupMessage(Request $request): void
     {
-
         // get parameters from request.
         $transactionGroupId = $request->get('transaction_group_id');
         $message            = $request->get('message');
@@ -156,7 +155,6 @@ class InterestingMessage
      */
     private function handleAccountMessage(Request $request): void
     {
-
         // get parameters from request.
         $accountId = $request->get('account_id');
         $message   = $request->get('message');
@@ -210,7 +208,6 @@ class InterestingMessage
      */
     private function handleBillMessage(Request $request): void
     {
-
         // get parameters from request.
         $billId  = $request->get('bill_id');
         $message = $request->get('message');
@@ -234,7 +231,6 @@ class InterestingMessage
      */
     private function handleWebhookMessage(Request $request): void
     {
-
         // get parameters from request.
         $webhookId  = $request->get('webhook_id');
         $message = $request->get('message');

app/Http/Middleware/Range.php

@@ -56,7 +56,6 @@ class Range
 
             // set more view variables:
             $this->configureList();
-
         }
 
         return $next($request);

app/Http/Requests/AccountFormRequest.php

@@ -35,7 +35,9 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AccountFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, AppendsLocationData, ChecksLogin;
+    use ConvertsDataTypes;
+    use AppendsLocationData;
+    use ChecksLogin;
 
     /**
      * Get all data.

app/Http/Requests/AttachmentFormRequest.php

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class AttachmentFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Returns the data required by the controller.

app/Http/Requests/BillStoreRequest.php

@@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class BillStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Returns the data required by the controller.

app/Http/Requests/BillUpdateRequest.php

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class BillUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Returns the data required by the controller.

app/Http/Requests/BudgetFormStoreRequest.php

@@ -34,7 +34,9 @@ use Illuminate\Validation\Validator;
  */
 class BudgetFormStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin;
+    use ConvertsDataTypes;
+    use ValidatesAutoBudgetRequest;
+    use ChecksLogin;
 
     /**
      * Returns the data required by the controller.
@@ -86,5 +88,4 @@ class BudgetFormStoreRequest extends FormRequest
             }
         );
     }
-
 }

app/Http/Requests/BudgetFormUpdateRequest.php

@@ -35,7 +35,9 @@ use Illuminate\Validation\Validator;
  */
 class BudgetFormUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes, ValidatesAutoBudgetRequest, ChecksLogin;
+    use ConvertsDataTypes;
+    use ValidatesAutoBudgetRequest;
+    use ChecksLogin;
 
     /**
      * Returns the data required by the controller.

app/Http/Requests/BulkEditJournalRequest.php

@@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class BulkEditJournalRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Rules for this request.
@@ -40,7 +41,6 @@ class BulkEditJournalRequest extends FormRequest
      */
     public function rules(): array
     {
-
         // fixed
         return [
             'journals.*'  => 'required|belongsToUser:transaction_journals,id',

app/Http/Requests/CategoryFormRequest.php

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class CategoryFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Get information for the controller.

app/Http/Requests/CurrencyFormRequest.php

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class CurrencyFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Returns the data required by the controller.

app/Http/Requests/EmailFormRequest.php

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class EmailFormRequest extends FormRequest
 {
-    use ChecksLogin, ConvertsDataTypes;
+    use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Rules for this request.

app/Http/Requests/InviteUserFormRequest.php

@@ -30,7 +30,8 @@ use Illuminate\Foundation\Http\FormRequest;
 
 class InviteUserFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Rules for this request.

app/Http/Requests/JournalLinkRequest.php

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class JournalLinkRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Returns the data required by the controller.

app/Http/Requests/LinkTypeFormRequest.php

@@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class LinkTypeFormRequest extends FormRequest
 {
-    use ChecksLogin, ConvertsDataTypes;
+    use ChecksLogin;
+    use ConvertsDataTypes;
 
     /**
      * Rules for this request.

app/Http/Requests/NewUserFormRequest.php

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class NewUserFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Rules for this request.

app/Http/Requests/ObjectGroupFormRequest.php

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class ObjectGroupFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Returns the data required by the controller.

app/Http/Requests/PiggyBankStoreRequest.php

@@ -31,7 +31,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class PiggyBankStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Returns the data required by the controller.

app/Http/Requests/PiggyBankUpdateRequest.php

@@ -32,7 +32,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class PiggyBankUpdateRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Returns the data required by the controller.

app/Http/Requests/ReconciliationStoreRequest.php

@@ -34,7 +34,8 @@ use Log;
  */
 class ReconciliationStoreRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Returns the data required by the controller.
@@ -74,7 +75,7 @@ class ReconciliationStoreRequest extends FormRequest
             'startBalance' => 'numeric|max:1000000000',
             'endBalance'   => 'numeric|max:1000000000',
             'difference'   => 'required|numeric|max:1000000000',
-            'journals'     => [new ValidJournals],
+            'journals'     => [new ValidJournals()],
             'reconcile'    => 'required|in:create,nothing',
         ];
     }

app/Http/Requests/RecurrenceFormRequest.php

@@ -42,7 +42,8 @@ use Log;
  */
 class RecurrenceFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Get the data required by the controller.
@@ -160,7 +161,7 @@ class RecurrenceFormRequest extends FormRequest
         }
         //monthly,17
         //ndom,3,7
-        if (in_array(substr($value, 0, 6), ['yearly', 'weekly'])) {
+        if (in_array(substr($value, 0, 6), ['yearly', 'weekly'], true)) {
             $return['type']   = substr($value, 0, 6);
             $return['moment'] = substr($value, 7);
         }
@@ -191,7 +192,7 @@ class RecurrenceFormRequest extends FormRequest
             // mandatory info for recurrence.
             'title'                   => 'required|between:1,255|uniqueObjectForUser:recurrences,title',
             'first_date'              => 'required|date|after:' . $today->format('Y-m-d'),
-            'repetition_type'         => ['required', new ValidRecurrenceRepetitionValue, new ValidRecurrenceRepetitionType, 'between:1,20'],
+            'repetition_type'         => ['required', new ValidRecurrenceRepetitionValue(), new ValidRecurrenceRepetitionType(), 'between:1,20'],
             'skip'                    => 'required|numeric|integer|gte:0|lte:31',
 
             // optional for recurrence:

app/Http/Requests/ReportFormRequest.php

@@ -52,7 +52,7 @@ class ReportFormRequest extends FormRequest
         /** @var AccountRepositoryInterface $repository */
         $repository = app(AccountRepositoryInterface::class);
         $set        = $this->get('accounts');
-        $collection = new Collection;
+        $collection = new Collection();
         if (is_array($set)) {
             foreach ($set as $accountId) {
                 $account = $repository->find((int) $accountId);
@@ -75,7 +75,7 @@ class ReportFormRequest extends FormRequest
         /** @var BudgetRepositoryInterface $repository */
         $repository = app(BudgetRepositoryInterface::class);
         $set        = $this->get('budget');
-        $collection = new Collection;
+        $collection = new Collection();
         if (is_array($set)) {
             foreach ($set as $budgetId) {
                 $budget = $repository->find((int) $budgetId);
@@ -98,7 +98,7 @@ class ReportFormRequest extends FormRequest
         /** @var CategoryRepositoryInterface $repository */
         $repository = app(CategoryRepositoryInterface::class);
         $set        = $this->get('category');
-        $collection = new Collection;
+        $collection = new Collection();
         if (is_array($set)) {
             foreach ($set as $categoryId) {
                 $category = $repository->find((int) $categoryId);
@@ -121,7 +121,7 @@ class ReportFormRequest extends FormRequest
         /** @var AccountRepositoryInterface $repository */
         $repository = app(AccountRepositoryInterface::class);
         $set        = $this->get('double');
-        $collection = new Collection;
+        $collection = new Collection();
         if (is_array($set)) {
             foreach ($set as $accountId) {
                 $account = $repository->find((int) $accountId);
@@ -213,7 +213,7 @@ class ReportFormRequest extends FormRequest
         /** @var TagRepositoryInterface $repository */
         $repository = app(TagRepositoryInterface::class);
         $set        = $this->get('tag');
-        $collection = new Collection;
+        $collection = new Collection();
         Log::debug('Set is:', $set ?? []);
         if (is_array($set)) {
             foreach ($set as $tagTag) {

app/Http/Requests/RuleFormRequest.php

@@ -33,7 +33,9 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class RuleFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, GetRuleConfiguration, ChecksLogin;
+    use ConvertsDataTypes;
+    use GetRuleConfiguration;
+    use ChecksLogin;
 
     /**
      * Get all data for controller.

app/Http/Requests/RuleGroupFormRequest.php

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class RuleGroupFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Get all data for controller.
@@ -73,7 +74,7 @@ class RuleGroupFormRequest extends FormRequest
         return [
             'title'       => $titleRule,
             'description' => 'between:1,5000|nullable',
-            'active'      => [new IsBoolean],
+            'active'      => [new IsBoolean()],
         ];
     }
 }

app/Http/Requests/TagFormRequest.php

@@ -34,7 +34,9 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class TagFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, AppendsLocationData, ChecksLogin;
+    use ConvertsDataTypes;
+    use AppendsLocationData;
+    use ChecksLogin;
 
     /**
      * Get all data for controller.
@@ -50,7 +52,6 @@ class TagFormRequest extends FormRequest
         ];
 
         return $this->appendLocationData($data, 'location');
-
     }
 
     /**

app/Http/Requests/TestRuleFormRequest.php

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class TestRuleFormRequest extends FormRequest
 {
-    use GetRuleConfiguration, ChecksLogin;
+    use GetRuleConfiguration;
+    use ChecksLogin;
 
     /**
      * Rules for this request.

app/Http/Requests/UserFormRequest.php

@@ -33,7 +33,8 @@ use Illuminate\Foundation\Http\FormRequest;
  */
 class UserFormRequest extends FormRequest
 {
-    use ConvertsDataTypes, ChecksLogin;
+    use ConvertsDataTypes;
+    use ChecksLogin;
 
     /**
      * Get data for controller.

app/Jobs/CreateAutoBudgetLimits.php

@@ -43,7 +43,10 @@ use Log;
  */
 class CreateAutoBudgetLimits implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     private Carbon $date;
 
@@ -222,7 +225,7 @@ class CreateAutoBudgetLimits implements ShouldQueue
         if (null !== $amount) {
             Log::debug(sprintf('Amount is overruled and will be set to %s', $amount));
         }
-        $budgetLimit = new BudgetLimit;
+        $budgetLimit = new BudgetLimit();
         $budgetLimit->budget()->associate($autoBudget->budget);
         $budgetLimit->transactionCurrency()->associate($autoBudget->transactionCurrency);
         $budgetLimit->start_date = $start;

app/Jobs/CreateRecurringTransactions.php

@@ -50,7 +50,10 @@ use Log;
  */
 class CreateRecurringTransactions implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     public int                                  $created;
     public int                                  $executed;
@@ -76,7 +79,7 @@ class CreateRecurringTransactions implements ShouldQueue
             $this->date = $newDate;
         }
         if (null === $date) {
-            $newDate = new Carbon;
+            $newDate = new Carbon();
             $newDate->startOfDay();
             $this->date = $newDate;
         }
@@ -109,7 +112,7 @@ class CreateRecurringTransactions implements ShouldQueue
         /** @var Recurrence $recurrence */
         foreach ($filtered as $recurrence) {
             if (!array_key_exists($recurrence->user_id, $result)) {
-                $result[$recurrence->user_id] = new Collection;
+                $result[$recurrence->user_id] = new Collection();
             }
             $this->repository->setUser($recurrence->user);
             $this->journalRepository->setUser($recurrence->user);
@@ -296,7 +299,7 @@ class CreateRecurringTransactions implements ShouldQueue
      */
     private function handleRepetitions(Recurrence $recurrence): Collection
     {
-        $collection = new Collection;
+        $collection = new Collection();
         /** @var RecurrenceRepetition $repetition */
         foreach ($recurrence->recurrenceRepetitions as $repetition) {
             Log::debug(
@@ -336,7 +339,7 @@ class CreateRecurringTransactions implements ShouldQueue
      */
     private function handleOccurrences(Recurrence $recurrence, RecurrenceRepetition $repetition, array $occurrences): Collection
     {
-        $collection = new Collection;
+        $collection = new Collection();
         /** @var Carbon $date */
         foreach ($occurrences as $date) {
             $result = $this->handleOccurrence($recurrence, $repetition, $date);
@@ -361,7 +364,6 @@ class CreateRecurringTransactions implements ShouldQueue
     {
         $date->startOfDay();
         if ($date->ne($this->date)) {
-
             return null;
         }
         Log::debug(sprintf('%s IS today (%s)', $date->format('Y-m-d'), $this->date->format('Y-m-d')));
@@ -386,9 +388,8 @@ class CreateRecurringTransactions implements ShouldQueue
 
             $first      = $recurrence->recurrenceTransactions()->first();
             $groupTitle = $first->description;
-
         }
-        if(0 === $count) {
+        if (0 === $count) {
             Log::error('No transactions to be created in this recurrence. Cannot continue.');
 
             return null;

app/Jobs/DownloadExchangeRates.php

@@ -24,7 +24,6 @@ declare(strict_types=1);
 
 namespace FireflyIII\Jobs;
 
-
 use Carbon\Carbon;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
@@ -43,7 +42,10 @@ use Log;
  */
 class DownloadExchangeRates implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     private Carbon                      $date;
     private CurrencyRepositoryInterface $repository;
@@ -107,7 +109,7 @@ class DownloadExchangeRates implements ShouldQueue
     {
         Log::debug(sprintf('Now downloading new exchange rates for currency %s.', $currency->code));
         $base       = sprintf('%s/%s/%s', (string) config('cer.url'), $this->date->year, $this->date->isoWeek);
-        $client     = new Client;
+        $client     = new Client();
         $url        = sprintf('%s/%s.json', $base, $currency->code);
         $res        = $client->get($url);
         $statusCode = $res->getStatusCode();

app/Jobs/MailError.php

@@ -37,7 +37,8 @@ use Mail;
  */
 class MailError extends Job implements ShouldQueue
 {
-    use InteractsWithQueue, SerializesModels;
+    use InteractsWithQueue;
+    use SerializesModels;
 
     protected string $destination;
     protected array  $exception;

app/Jobs/SendWebhookMessage.php

@@ -38,7 +38,10 @@ use Log;
  */
 class SendWebhookMessage implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     private WebhookMessage $message;
 

app/Jobs/WarnAboutBills.php

@@ -39,7 +39,10 @@ use Log;
  */
 class WarnAboutBills implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
 
     private Carbon $date;
     private bool   $force;
@@ -53,7 +56,7 @@ class WarnAboutBills implements ShouldQueue
      */
     public function __construct(?Carbon $date)
     {
-        $newDate = new Carbon;
+        $newDate = new Carbon();
         $newDate->startOfDay();
         $this->date = $newDate;
 

app/Mail/AccessTokenCreatedMail.php

@@ -34,8 +34,8 @@ use Illuminate\Queue\SerializesModels;
  */
 class AccessTokenCreatedMail extends Mailable
 {
-
+    use Queueable;
-    use Queueable, SerializesModels;
+    use SerializesModels;
 
     /**
      * AccessTokenCreatedMail constructor.

app/Mail/AdminTestMail.php

@@ -35,7 +35,8 @@ use Illuminate\Queue\SerializesModels;
  */
 class AdminTestMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     public string $email;
 
@@ -44,7 +45,6 @@ class AdminTestMail extends Mailable
      */
     public function __construct()
     {
-
     }
 
     /**

app/Mail/BillWarningMail.php

@@ -31,7 +31,8 @@ use Illuminate\Queue\SerializesModels;
 
 class BillWarningMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     public Bill   $bill;
     public int    $diff;

app/Mail/ConfirmEmailChangeMail.php

@@ -35,7 +35,8 @@ use Illuminate\Queue\SerializesModels;
  */
 class ConfirmEmailChangeMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     public string $newEmail;
     public string $oldEmail;

app/Mail/InvitationMail.php

@@ -30,7 +30,8 @@ use Illuminate\Queue\SerializesModels;
 
 class InvitationMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     public string $invitee;
     public string $admin;

app/Mail/NewIPAddressWarningMail.php

@@ -34,7 +34,8 @@ use Illuminate\Queue\SerializesModels;
  */
 class NewIPAddressWarningMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     public string $host;
     public string $ipAddress;

app/Mail/OAuthTokenCreatedMail.php

@@ -35,7 +35,8 @@ use Laravel\Passport\Client;
  */
 class OAuthTokenCreatedMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     public Client $client;
 

app/Mail/RegisteredUser.php

@@ -36,7 +36,8 @@ use Illuminate\Queue\SerializesModels;
  */
 class RegisteredUser extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     public string $address;
 

app/Mail/ReportNewJournalsMail.php

@@ -38,7 +38,8 @@ use Illuminate\Support\Collection;
  */
 class ReportNewJournalsMail extends Mailable
 {
-    use Queueable, SerializesModels;
+    use Queueable;
+    use SerializesModels;
 
     public Collection $groups;
     public array      $transformed;