Various code fixes.

.ci/phpstan.neon

@@ -17,6 +17,7 @@ parameters:
             - ../app/Console/Commands/Correction/FixAccountTypes.php
             - ../app/Console/Commands/Upgrade/OtherCurrenciesCorrections.php
             - ../app/Exceptions/GracefulNotFoundHandler.php
+            - ../app/Generator/Webhook/StandardMessageGenerator.php
     -
         message: '#Function compact\(\) should not be used#'
         paths:
@@ -28,6 +29,9 @@ parameters:
             - ../app/Generator/Report/Standard/MultiYearReportGenerator.php
             - ../app/Generator/Report/Standard/YearReportGenerator.php
             - ../app/Generator/Report/Tag/MonthReportGenerator.php
+            - ../app/Http/Controllers/Account/*.php
+            - ../app/Http/Controllers/Admin/*.php
+            - ../app/Http/Controllers/*.php
 
   paths:
     - ../app

app/Generator/Report/Audit/MonthReportGenerator.php

@@ -156,7 +156,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
                       return [
                           'journals'         => $journals,
                           'currency'         => $currency,
-                          'exists'           => !empty($journals),
+                          'exists'           => 0 !== count($journals),
                           'end'              => $this->end->isoFormat((string) trans('config.month_and_day_moment_js', [], $locale)),
                           'endBalance'       => app('steam')->balance($account, $this->end),
                           'dayBefore'        => $date->isoFormat((string) trans('config.month_and_day_moment_js', [], $locale)),

app/Generator/Report/Budget/MonthReportGenerator.php

@@ -180,7 +180,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
      */
     protected function getExpenses(): array
     {
-        if (!empty($this->expenses)) {
+        if (0 !== count($this->expenses)) {
             Log::debug('Return previous set of expenses.');
 
             return $this->expenses;

app/Generator/Report/Category/MonthReportGenerator.php

@@ -188,7 +188,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
      */
     protected function getExpenses(): array
     {
-        if (!empty($this->expenses)) {
+        if (0 !== count($this->expenses)) {
             Log::debug('Return previous set of expenses.');
 
             return $this->expenses;
@@ -213,7 +213,7 @@ class MonthReportGenerator implements ReportGeneratorInterface
      */
     protected function getIncome(): array
     {
-        if (!empty($this->income)) {
+        if (0 !== count($this->income)) {
             return $this->income;
         }
 

app/Handlers/Events/UserEventHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * UserEventHandler.php
  * Copyright (c) 2019 james@firefly-iii.org
@@ -149,6 +150,8 @@ class UserEventHandler
         $groupExists = true;
         $groupTitle  = $user->email;
         $index       = 1;
+        /** @var UserGroup $group */
+        $group = null;
 
         // create a new group.
         while (true === $groupExists) {
@@ -163,6 +166,7 @@ class UserEventHandler
                 throw new FireflyException('Email address can no longer be used for registrations.');
             }
         }
+        /** @var UserRole $role */
         $role = UserRole::where('title', UserRole::OWNER)->first();
         if (null === $role) {
             throw new FireflyException('The user role is unexpectedly empty. Did you run all migrations?');

app/Helpers/Collector/GroupCollector.php

@@ -372,7 +372,7 @@ class GroupCollector implements GroupCollectorInterface
      */
     public function excludeJournalIds(array $journalIds): GroupCollectorInterface
     {
-        if (!empty($journalIds)) {
+        if (0 !== count($journalIds)) {
             // make all integers.
             $integerIDs = array_map('intval', $journalIds);
 
@@ -894,7 +894,7 @@ class GroupCollector implements GroupCollectorInterface
      */
     public function setJournalIds(array $journalIds): GroupCollectorInterface
     {
-        if (!empty($journalIds)) {
+        if (0 !== count($journalIds)) {
             // make all integers.
             $integerIDs = array_map('intval', $journalIds);
 

app/Http/Controllers/Account/CreateController.php

@@ -75,13 +75,12 @@ class CreateController extends Controller
      * Create a new account.
      *
      * @param  Request  $request
-     * @param string|null $objectType
+     * @param  string  $objectType
      *
      * @return Factory|View
      */
-    public function create(Request $request, string $objectType = null)
+    public function create(Request $request, string $objectType)
     {
-        $objectType          = $objectType ?? 'asset';
         $defaultCurrency     = app('amount')->getDefaultCurrency();
         $subTitleIcon        = config(sprintf('firefly.subIconsByIdentifier.%s', $objectType));
         $subTitle            = (string)trans(sprintf('firefly.make_new_%s_account', $objectType));

app/Http/Controllers/Account/IndexController.php

@@ -79,7 +79,6 @@ class IndexController extends Controller
      */
     public function inactive(Request $request, string $objectType)
     {
-        $objectType   = $objectType ?? 'asset';
         $inactivePage = true;
         $subTitle     = (string) trans(sprintf('firefly.%s_accounts_inactive', $objectType));
         $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $objectType));
@@ -137,7 +136,6 @@ class IndexController extends Controller
     public function index(Request $request, string $objectType)
     {
         Log::debug(sprintf('Now at %s', __METHOD__));
-        $objectType   = $objectType ?? 'asset';
         $subTitle     = (string) trans(sprintf('firefly.%s_accounts', $objectType));
         $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $objectType));
         $types        = config(sprintf('firefly.accountTypesByIdentifier.%s', $objectType));

app/Http/Controllers/Account/ReconcileController.php

@@ -90,7 +90,7 @@ class ReconcileController extends Controller
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
-    public function reconcile(Account $account, Carbon $start = null, Carbon $end = null)
+    public function reconcile(Account $account, Carbon $start = null, Carbon $end = null) // @phpstan-ignore-line
     {
         if (!$this->isEditableAccount($account)) {
             return $this->redirectAccountToAccount($account);

app/Http/Controllers/Account/ShowController.php

@@ -88,7 +88,7 @@ class ShowController extends Controller
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
-    public function show(Request $request, Account $account, Carbon $start = null, Carbon $end = null)
+    public function show(Request $request, Account $account, Carbon $start = null, Carbon $end = null) // @phpstan-ignore-line
     {
         $objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
 

app/Http/Controllers/Auth/LoginController.php

@@ -81,8 +81,6 @@ class LoginController extends Controller
      *
      * @param Request $request
      *
-     * @return JsonResponse|RedirectResponse
-     *
      * @throws ValidationException
      */
     public function login(Request $request)

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -126,7 +126,7 @@ class ResetPasswordController extends Controller
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
-    public function showResetForm(Request $request, $token = null)
+    public function showResetForm(Request $request, $token = null) // @phpstan-ignore-line
     {
         $loginProvider = config('firefly.login_provider');
         if ('eloquent' !== $loginProvider) {

app/Http/Controllers/Budget/IndexController.php

@@ -96,7 +96,7 @@ class IndexController extends Controller
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
-    public function index(Request $request, Carbon $start = null, Carbon $end = null)
+    public function index(Request $request, Carbon $start = null, Carbon $end = null) // @phpstan-ignore-line
     {
         Log::debug('Start of IndexController::index()');
 
@@ -122,7 +122,7 @@ class IndexController extends Controller
         $sums    = $this->getSums($budgets);
 
         // get budgeted for default currency:
-        if (empty($availableBudgets)) {
+        if (0 === count($availableBudgets)) {
             $budgeted = $this->blRepository->budgeted($start, $end, $defaultCurrency, );
             $spentArr = $this->opsRepository->sumExpenses($start, $end, null, null, $defaultCurrency);
             $spent    = $spentArr[$defaultCurrency->id]['sum'] ?? '0';

app/Http/Controllers/Budget/ShowController.php

@@ -84,7 +84,7 @@ class ShowController extends Controller
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
-    public function noBudget(Request $request, Carbon $start = null, Carbon $end = null)
+    public function noBudget(Request $request, Carbon $start = null, Carbon $end = null)// @phpstan-ignore-line
     {
         /** @var Carbon $start */
         $start = $start ?? session('start');

app/Http/Controllers/Category/NoCategoryController.php

@@ -80,7 +80,7 @@ class NoCategoryController extends Controller
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
-    public function show(Request $request, Carbon $start = null, Carbon $end = null)
+    public function show(Request $request, Carbon $start = null, Carbon $end = null)// @phpstan-ignore-line
     {
         Log::debug('Start of noCategory()');
         /** @var Carbon $start */

app/Http/Controllers/Category/ShowController.php

@@ -82,7 +82,7 @@ class ShowController extends Controller
      * @throws \Psr\Container\ContainerExceptionInterface
      * @throws \Psr\Container\NotFoundExceptionInterface
      */
-    public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null)
+    public function show(Request $request, Category $category, Carbon $start = null, Carbon $end = null) // @phpstan-ignore-line
     {
         /** @var Carbon $start */
         $start = $start ?? session('start', Carbon::now()->startOfMonth());

app/Http/Controllers/Chart/AccountController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * AccountController.php
  * Copyright (c) 2019 james@firefly-iii.org
@@ -337,7 +338,7 @@ class AccountController extends Controller
         Log::debug('Default set is ', $defaultSet);
         $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet);
         Log::debug('Frontpage preference set is ', $frontPage->data);
-        if (empty($frontPage->data)) {
+        if (0 === count($frontPage->data)) {
             app('preferences')->set('frontPageAccounts', $defaultSet);
             Log::debug('frontpage set is empty!');
         }
@@ -478,14 +479,11 @@ class AccountController extends Controller
             'label'           => sprintf('%s (%s)', $account->name, $currency->symbol),
             'currency_symbol' => $currency->symbol,
             'currency_code'   => $currency->code,
-            'entries'         => [],
         ];
         $entries = [];
         $current = clone $start;
-        switch ($step) {
+
-            default:
+        if ('1D' === $step) {
-                break;
-            case '1D':
             // per day the entire period, balance for every day.
             $format   = (string)trans('config.month_and_day_js', [], $locale);
             $range    = app('steam')->balanceInRange($account, $start, $end, $currency);
@@ -498,18 +496,14 @@ class AccountController extends Controller
                 $previous        = $balance;
                 $current->addDay();
             }
-                break;
+        }
-
+        if ('1W' === $step || '1M' === $step || '1Y' === $step) {
-            case '1W':
-            case '1M':
-            case '1Y':
             while ($end >= $current) {
                 $balance         = (float)app('steam')->balance($account, $current, $currency);
                 $label           = app('navigation')->periodShow($current, $step);
                 $entries[$label] = $balance;
                 $current         = app('navigation')->addPeriod($current, $step, 0);
             }
-                break;
         }
         $result['entries'] = $entries;
 

app/Http/Controllers/Chart/BudgetController.php

@@ -205,7 +205,7 @@ class BudgetController extends Controller
      *
      * @return JsonResponse
      */
-    public function expenseAsset(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
+    public function expenseAsset(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse // @phpstan-ignore-line
     {
         /** @var GroupCollectorInterface $collector */
         $collector     = app(GroupCollectorInterface::class);
@@ -273,7 +273,7 @@ class BudgetController extends Controller
      *
      * @return JsonResponse
      */
-    public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
+    public function expenseCategory(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse // @phpstan-ignore-line
     {
         /** @var GroupCollectorInterface $collector */
         $collector     = app(GroupCollectorInterface::class);
@@ -337,7 +337,7 @@ class BudgetController extends Controller
      *
      * @return JsonResponse
      */
-    public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse
+    public function expenseExpense(Budget $budget, ?BudgetLimit $budgetLimit = null): JsonResponse // @phpstan-ignore-line
     {
         /** @var GroupCollectorInterface $collector */
         $collector     = app(GroupCollectorInterface::class);

app/Http/Controllers/Chart/CategoryController.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * CategoryController.php
  * Copyright (c) 2019 james@firefly-iii.org
@@ -23,7 +24,6 @@ declare(strict_types=1);
 namespace FireflyIII\Http\Controllers\Chart;
 
 use Carbon\Carbon;
-use Exception;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Generator\Chart\Basic\GeneratorInterface;
 use FireflyIII\Http\Controllers\Controller;
@@ -39,7 +39,6 @@ use FireflyIII\Support\Http\Controllers\ChartGeneration;
 use FireflyIII\Support\Http\Controllers\DateCalculation;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Collection;
-use JsonException;
 
 /**
  * Class CategoryController.
@@ -106,14 +105,7 @@ class CategoryController extends Controller
      */
     private function getDate(): Carbon
     {
-        $carbon = null;
+        return today(config('app.timezone'));
-        try {
-            $carbon = today(config('app.timezone'));
-        } catch (Exception $e) {
-            // @ignoreException
-        }
-
-        return $carbon;
     }
 
     /**

app/Http/Controllers/Chart/DoubleReportController.php

@@ -318,7 +318,7 @@ class DoubleReportController extends Controller
                 $journalId = $journal['transaction_journal_id'];
 
                 // no tags? also deserves a sport
-                if (empty($journal['tags'])) {
+                if (0 === count($journal['tags'])) {
                     $includedJournals[] = $journalId;
                     // do something
                     $tagName                  = trans('firefly.no_tags');
@@ -378,7 +378,7 @@ class DoubleReportController extends Controller
                 $journalId = $journal['transaction_journal_id'];
 
                 // no tags? also deserves a sport
-                if (empty($journal['tags'])) {
+                if (0 === count($journal['tags'])) {
                     $includedJournals[] = $journalId;
                     // do something
                     $tagName                  = trans('firefly.no_tags');

app/Http/Controllers/Chart/ExpenseReportController.php

@@ -189,7 +189,7 @@ class ExpenseReportController extends Controller
                 $newSet[$key] = $entry;
             }
         }
-        if (empty($newSet)) {
+        if (0 === count($newSet)) {
             $newSet = $chartData;
         }
         $data = $this->generator->multiSet($newSet);

app/Http/Controllers/Chart/TransactionController.php

@@ -115,20 +115,17 @@ class TransactionController extends Controller
         $collector = app(GroupCollectorInterface::class);
         $collector->setRange($start, $end);
         $collector->withCategoryInformation();
-        switch ($objectType) {
+
-            default:
+        if ('withdrawal' === $objectType) {
-                throw new FireflyException(sprintf('Cant handle "%s"', $objectType));
-            case 'withdrawal':
             $collector->setTypes([TransactionType::WITHDRAWAL]);
-                break;
-            case 'deposit':
-                $collector->setTypes([TransactionType::DEPOSIT]);
-                break;
-            case 'transfers':
-            case 'transfer':
-                $collector->setTypes([TransactionType::TRANSFER]);
-                break;
         }
+        if ('deposit' === $objectType) {
+            $collector->setTypes([TransactionType::DEPOSIT]);
+        }
+        if ('transfer' === $objectType || 'transfers' === $objectType) {
+            $collector->setTypes([TransactionType::TRANSFER]);
+        }
+
         $result = $collector->getExtractedJournals();
         $data   = [];
 
@@ -172,20 +169,17 @@ class TransactionController extends Controller
         $collector = app(GroupCollectorInterface::class);
         $collector->setRange($start, $end);
         $collector->withAccountInformation();
-        switch ($objectType) {
+
-            default:
+        if ('withdrawal' === $objectType) {
-                throw new FireflyException(sprintf('Cant handle "%s"', $objectType));
-            case 'withdrawal':
             $collector->setTypes([TransactionType::WITHDRAWAL]);
-                break;
-            case 'deposit':
-                $collector->setTypes([TransactionType::DEPOSIT]);
-                break;
-            case 'transfers':
-            case 'transfer':
-                $collector->setTypes([TransactionType::TRANSFER]);
-                break;
         }
+        if ('deposit' === $objectType) {
+            $collector->setTypes([TransactionType::DEPOSIT]);
+        }
+        if ('transfer' === $objectType || 'transfers' === $objectType) {
+            $collector->setTypes([TransactionType::TRANSFER]);
+        }
+
         $result = $collector->getExtractedJournals();
         $data   = [];
 
@@ -229,20 +223,17 @@ class TransactionController extends Controller
         $collector = app(GroupCollectorInterface::class);
         $collector->setRange($start, $end);
         $collector->withAccountInformation();
-        switch ($objectType) {
+
-            default:
+        if ('withdrawal' === $objectType) {
-                throw new FireflyException(sprintf('Cant handle "%s"', $objectType));
-            case 'withdrawal':
             $collector->setTypes([TransactionType::WITHDRAWAL]);
-                break;
-            case 'deposit':
-                $collector->setTypes([TransactionType::DEPOSIT]);
-                break;
-            case 'transfers':
-            case 'transfer':
-                $collector->setTypes([TransactionType::TRANSFER]);
-                break;
         }
+        if ('deposit' === $objectType) {
+            $collector->setTypes([TransactionType::DEPOSIT]);
+        }
+        if ('transfer' === $objectType || 'transfers' === $objectType) {
+            $collector->setTypes([TransactionType::TRANSFER]);
+        }
+
         $result = $collector->getExtractedJournals();
         $data   = [];
 

app/Http/Controllers/DebugController.php

@@ -98,7 +98,7 @@ class DebugController extends Controller
         Log::debug('Call twig:clean...');
         try {
             Artisan::call('twig:clean');
-        } catch (Exception $e) {
+        } catch (Exception $e) { // @phpstan-ignore-line
             // @ignoreException
         }
 
@@ -188,7 +188,7 @@ class DebugController extends Controller
                 if (null !== $logFile) {
                     try {
                         $logContent = file_get_contents($logFile);
-                    } catch (Exception $e) {
+                    } catch (Exception $e) { // @phpstan-ignore-line
                         // @ignoreException
                     }
                 }

app/Http/Controllers/Json/BoxController.php

@@ -190,7 +190,7 @@ class BoxController extends Controller
             $incomes[$currencyId]  = app('amount')->formatAnything($currency, $incomes[$currencyId] ?? '0', false);
             $expenses[$currencyId] = app('amount')->formatAnything($currency, $expenses[$currencyId] ?? '0', false);
         }
-        if (empty($sums)) {
+        if (0 === count($sums)) {
             $currency                = app('amount')->getDefaultCurrency();
             $sums[$currency->id]     = app('amount')->formatAnything($currency, '0', false);
             $incomes[$currency->id]  = app('amount')->formatAnything($currency, '0', false);

app/Http/Controllers/Json/FrontpageController.php

@@ -68,7 +68,7 @@ class FrontpageController extends Controller
             }
         }
         $html = '';
-        if (!empty($info)) {
+        if (0 !== count($info)) {
             try {
                 $html = view('json.piggy-banks', compact('info'))->render();
             } catch (Throwable $e) {

app/Http/Controllers/Json/IntroController.php

@@ -43,13 +43,13 @@ class IntroController extends Controller
      *
      * @return JsonResponse
      */
-    public function getIntroSteps(string $route, string $specificPage = null): JsonResponse
+    public function getIntroSteps(string $route, string $specificPage = null): JsonResponse // @phpstan-ignore-line
     {
         Log::debug(sprintf('getIntroSteps for route "%s" and page "%s"', $route, $specificPage));
         $specificPage  = $specificPage ?? '';
         $steps         = $this->getBasicSteps($route);
         $specificSteps = $this->getSpecificSteps($route, $specificPage);
-        if (empty($specificSteps)) {
+        if (0 === count($specificSteps)) {
             Log::debug(sprintf('No specific steps for route "%s" and page "%s"', $route, $specificPage));
 
             return response()->json($steps);
@@ -104,7 +104,7 @@ class IntroController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      */
-    public function postEnable(string $route, string $specialPage = null): JsonResponse
+    public function postEnable(string $route, string $specialPage = null): JsonResponse // @phpstan-ignore-line
     {
         $specialPage = $specialPage ?? '';
         $route       = str_replace('.', '_', $route);
@@ -128,7 +128,7 @@ class IntroController extends Controller
      * @return JsonResponse
      * @throws FireflyException
      */
-    public function postFinished(string $route, string $specialPage = null): JsonResponse
+    public function postFinished(string $route, string $specialPage = null): JsonResponse // @phpstan-ignore-line
     {
         $specialPage = $specialPage ?? '';
         $key         = 'shown_demo_' . $route;

app/Http/Controllers/Json/ReconcileController.php

@@ -85,7 +85,7 @@ class ReconcileController extends Controller
      * @throws FireflyException
      * @throws JsonException
      */
-    public function overview(Request $request, Account $account = null, Carbon $start = null, Carbon $end = null): JsonResponse
+    public function overview(Request $request, Account $account = null, Carbon $start = null, Carbon $end = null): JsonResponse // @phpstan-ignore-line
     {
         $startBalance    = $request->get('startBalance');
         $endBalance      = $request->get('endBalance');
@@ -226,7 +226,7 @@ class ReconcileController extends Controller
      * @throws FireflyException
      * @throws JsonException
      */
-    public function transactions(Account $account, Carbon $start = null, Carbon $end = null)
+    public function transactions(Account $account, Carbon $start = null, Carbon $end = null) // @phpstan-ignore-line
     {
         if (null === $start || null === $end) {
             throw new FireflyException('Invalid dates submitted.');

app/Http/Controllers/PreferencesController.php

@@ -127,7 +127,7 @@ class PreferencesController extends Controller
         $locales = ['equal' => (string) trans('firefly.equal_to_language')] + $locales;
         // an important fallback is that the frontPageAccount array gets refilled automatically
         // when it turns up empty.
-        if (empty($frontPageAccounts->data)) {
+        if (0 === count($frontPageAccounts->data)) {
             $frontPageAccounts = $accountIds;
         }
 

app/Http/Controllers/Report/CategoryController.php

@@ -728,7 +728,7 @@ class CategoryController extends Controller
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
-            throw new FireflyException($result, 0, $e);
+            throw new FireflyException($e->getMessage(), 0, $e);
         }
 
         return $result;
@@ -778,7 +778,7 @@ class CategoryController extends Controller
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
-            throw new FireflyException($result, 0, $e);
+            throw new FireflyException($e->getMessage(), 0, $e);
         }
 
         return $result;

app/Http/Controllers/Report/DoubleController.php

@@ -115,7 +115,7 @@ class DoubleController extends Controller
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
-            throw new FireflyException($result, 0, $e);
+            throw new FireflyException($e->getMessage(), 0, $e);
         }
 
         return $result;
@@ -167,7 +167,7 @@ class DoubleController extends Controller
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
-            throw new FireflyException($result, 0, $e);
+            throw new FireflyException($e->getMessage(), 0, $e);
         }
 
         return $result;
@@ -461,7 +461,7 @@ class DoubleController extends Controller
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
-            throw new FireflyException($result, 0, $e);
+            throw new FireflyException($e->getMessage(), 0, $e);
         }
 
         return $result;
@@ -511,7 +511,7 @@ class DoubleController extends Controller
         } catch (Throwable $e) {
             Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
             $result = sprintf('Could not render view: %s', $e->getMessage());
-            throw new FireflyException($result, 0, $e);
+            throw new FireflyException($e->getMessage(), 0, $e);
         }
 
         return $result;

app/Http/Controllers/Rule/SelectController.php

@@ -145,7 +145,7 @@ class SelectController extends Controller
         $textTriggers = $this->getValidTriggerList($request);
 
         // warn if nothing.
-        if (empty($textTriggers)) {
+        if (0 === count($textTriggers)) {
             return response()->json(['html' => '', 'warning' => (string) trans('firefly.warning_no_valid_triggers')]);
         }
 
@@ -169,7 +169,7 @@ class SelectController extends Controller
 
         // Warn the user if only a subset of transactions is returned
         $warning = '';
-        if (empty($collection)) {
+        if (0 === count($collection)) {
             $warning = (string) trans('firefly.warning_no_matching_transactions');
         }
 
@@ -200,7 +200,7 @@ class SelectController extends Controller
     {
         $triggers = $rule->ruleTriggers;
 
-        if (empty($triggers)) {
+        if (0 === count($triggers)) {
             return response()->json(['html' => '', 'warning' => (string) trans('firefly.warning_no_valid_triggers')]);
         }
         // create new rule engine:
@@ -212,7 +212,7 @@ class SelectController extends Controller
         $collection = $collection->slice(0, 20);
 
         $warning = '';
-        if (empty($collection)) {
+        if (0 === count($collection)) {
             $warning = (string) trans('firefly.warning_no_matching_transactions');
         }
 

app/Http/Middleware/Authenticate.php

@@ -87,7 +87,7 @@ class Authenticate
      */
     protected function authenticate($request, array $guards)
     {
-        if (empty($guards)) {
+        if (0 === count($guards)) {
             try {
                 // go for default guard:
                 if ($this->auth->check()) {

app/Models/TransactionJournal.php

@@ -296,7 +296,7 @@ class TransactionJournal extends Model
         if (!self::isJoined($query, 'transaction_types')) {
             $query->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id');
         }
-        if (!empty($types)) {
+        if (0 !== count($types)) {
             $query->whereIn('transaction_types.type', $types);
         }
     }

app/Repositories/Account/AccountRepository.php

@@ -142,7 +142,7 @@ class AccountRepository implements AccountRepositoryInterface
                 }
             );
 
-        if (!empty($types)) {
+        if (0 !== count($types)) {
             $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $dbQuery->whereIn('account_types.type', $types);
         }
@@ -160,7 +160,7 @@ class AccountRepository implements AccountRepositoryInterface
     {
         $query = $this->user->accounts()->where('iban', '!=', '')->whereNotNull('iban');
 
-        if (!empty($types)) {
+        if (0 !== count($types)) {
             $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $query->whereIn('account_types.type', $types);
         }
@@ -178,7 +178,7 @@ class AccountRepository implements AccountRepositoryInterface
     {
         $query = $this->user->accounts();
 
-        if (!empty($types)) {
+        if (0 !== count($types)) {
             $query->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $query->whereIn('account_types.type', $types);
         }
@@ -218,7 +218,7 @@ class AccountRepository implements AccountRepositoryInterface
     {
         $query = $this->user->accounts();
 
-        if (!empty($accountIds)) {
+        if (0 !== count($accountIds)) {
             $query->whereIn('accounts.id', $accountIds);
         }
         $query->orderBy('accounts.order', 'ASC');
@@ -240,7 +240,7 @@ class AccountRepository implements AccountRepositoryInterface
                 $query->where('name', 'account_role');
             }, 'attachments']
         );
-        if (!empty($types)) {
+        if (0 !== count($types)) {
             $query->accountTypeIn($types);
         }
         $query->where('active', true);
@@ -316,7 +316,7 @@ class AccountRepository implements AccountRepositoryInterface
                 $query->where('name', 'account_role');
             }]
         );
-        if (!empty($types)) {
+        if (0 !== count($types)) {
             $query->accountTypeIn($types);
         }
         $query->where('active', 0);
@@ -585,19 +585,19 @@ class AccountRepository implements AccountRepositoryInterface
     {
         $res   = array_intersect([AccountType::ASSET, AccountType::MORTGAGE, AccountType::LOAN, AccountType::DEBT], $types);
         $query = $this->user->accounts();
-        if (!empty($types)) {
+        if (0 !== count($types)) {
             $query->accountTypeIn($types);
         }
 
         // add sort parameters. At this point they're filtered to allowed fields to sort by:
-        if (!empty($sort)) {
+        if (0 !== count($sort)) {
             foreach ($sort as $param) {
                 $query->orderBy($param[0], $param[1]);
             }
         }
 
-        if (empty($sort)) {
+        if (0 === count($sort)) {
-            if (!empty($res)) {
+            if (0 !== count($res)) {
                 $query->orderBy('accounts.order', 'ASC');
             }
             $query->orderBy('accounts.active', 'DESC');
@@ -698,7 +698,7 @@ class AccountRepository implements AccountRepositoryInterface
                 $dbQuery->where('name', 'LIKE', $search);
             }
         }
-        if (!empty($types)) {
+        if (0 !== count($types)) {
             $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $dbQuery->whereIn('account_types.type', $types);
         }
@@ -736,7 +736,7 @@ class AccountRepository implements AccountRepositoryInterface
                 );
             }
         }
-        if (!empty($types)) {
+        if (0 !== count($types)) {
             $dbQuery->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id');
             $dbQuery->whereIn('account_types.type', $types);
         }

app/Repositories/Recurring/RecurringRepository.php

@@ -332,7 +332,7 @@ class RecurringRepository implements RecurringRepositoryInterface
         foreach ($journalMeta as $journalId) {
             $search[] = (int) $journalId;
         }
-        if (empty($search)) {
+        if (0 === count($search)) {
             return new Collection();
         }
 

app/Services/Internal/Support/CreditRecalculateService.php

@@ -68,7 +68,7 @@ class CreditRecalculateService
             // work based on account.
             $this->processAccount();
         }
-        if (empty($this->work)) {
+        if (0 === count($this->work)) {
             Log::debug('No work accounts, do not do CreditRecalculationService');
 
             return;
@@ -84,7 +84,7 @@ class CreditRecalculateService
     {
         /** @var TransactionJournal $journal */
         foreach ($this->group->transactionJournals as $journal) {
-            if (empty($this->work)) {
+            if (0 === count($this->work)) {
                 try {
                     $this->findByJournal($journal);
                 } catch (FireflyException $e) {

app/Services/Internal/Support/RecurringTransactionTrait.php

@@ -339,7 +339,7 @@ trait RecurringTransactionTrait
      */
     protected function updateTags(RecurrenceTransaction $transaction, array $tags): void
     {
-        if (!empty($tags)) {
+        if (0 !== count($tags)) {
             /** @var RecurrenceMeta|null $entry */
             $entry = $transaction->recurrenceTransactionMeta()->where('name', 'tags')->first();
             if (null === $entry) {
@@ -348,7 +348,7 @@ trait RecurringTransactionTrait
             $entry->value = json_encode($tags);
             $entry->save();
         }
-        if (empty($tags)) {
+        if (0 === count($tags)) {
             // delete if present
             $transaction->recurrenceTransactionMeta()->where('name', 'tags')->delete();
         }

app/Services/Internal/Update/GroupUpdateService.php

@@ -60,7 +60,7 @@ class GroupUpdateService
         }
 
 
-        if (empty($transactions)) {
+        if (0 === count($transactions)) {
             Log::debug('No transactions submitted, do nothing.');
 
             return $transactionGroup;
@@ -119,7 +119,7 @@ class GroupUpdateService
     private function updateTransactionJournal(TransactionGroup $transactionGroup, TransactionJournal $journal, array $data): void
     {
         Log::debug(sprintf('Now in %s', __METHOD__));
-        if (empty($data)) {
+        if (0 === count($data)) {
             return;
         }
         if (1 === count($data) && array_key_exists('transaction_journal_id', $data)) {

app/Services/Internal/Update/RecurrenceUpdateService.php

@@ -150,7 +150,7 @@ class RecurrenceUpdateService
     private function updateRepetitions(Recurrence $recurrence, array $repetitions): void
     {
         $originalCount = $recurrence->recurrenceRepetitions()->count();
-        if (empty($repetitions)) {
+        if (0 === count($repetitions)) {
             // wont drop repetition, rather avoid.
             return;
         }
@@ -228,7 +228,7 @@ class RecurrenceUpdateService
     private function updateTransactions(Recurrence $recurrence, array $transactions): void
     {
         $originalCount = $recurrence->recurrenceTransactions()->count();
-        if (empty($transactions)) {
+        if (0 === count($transactions)) {
             // wont drop transactions, rather avoid.
             return;
         }

app/Support/Binder/BudgetList.php

@@ -54,7 +54,7 @@ class BudgetList implements BinderInterface
             $list = array_unique(array_map('\intval', explode(',', $value)));
 
 
-            if (empty($list)) {
+            if (0 === count($list)) {
                 app('log')->warning('Budget list count is zero, return 404.');
                 throw new NotFoundHttpException();
             }

app/Support/Binder/CategoryList.php

@@ -50,7 +50,7 @@ class CategoryList implements BinderInterface
             }
 
             $list = array_unique(array_map('\intval', explode(',', $value)));
-            if (empty($list)) {
+            if (0 === count($list)) {
                 throw new NotFoundHttpException();
             }
 

app/Support/Binder/JournalList.php

@@ -52,7 +52,7 @@ class JournalList implements BinderInterface
             $collector->withCategoryInformation()->withBudgetInformation()->withTagInformation()->withAccountInformation();
             $collector->setJournalIds($list);
             $result = $collector->getExtractedJournals();
-            if (empty($result)) {
+            if (0 === count($result)) {
                 throw new NotFoundHttpException();
             }
 
@@ -69,7 +69,7 @@ class JournalList implements BinderInterface
     protected static function parseList(string $value): array
     {
         $list = array_unique(array_map('\intval', explode(',', $value)));
-        if (empty($list)) {
+        if (0 === count($list)) {
             throw new NotFoundHttpException();
         }
 

app/Support/Binder/TagList.php

@@ -52,7 +52,7 @@ class TagList implements BinderInterface
             $list = array_unique(array_map('\strtolower', explode(',', $value)));
             Log::debug('List of tags is', $list);
 
-            if (empty($list)) {
+            if (0 === count($list)) {
                 Log::error('Tag list is empty.');
                 throw new NotFoundHttpException();
             }

app/Support/Export/ExportDataGenerator.php

@@ -767,7 +767,7 @@ class ExportDataGenerator
      */
     private function mergeTags(array $tags): string
     {
-        if (empty($tags)) {
+        if (0 === count($tags)) {
             return '';
         }
         $smol = [];

app/Support/Search/OperatorQuerySearch.php

@@ -1993,7 +1993,7 @@ class OperatorQuerySearch implements SearchInterface
      */
     public function searchTransactions(): LengthAwarePaginator
     {
-        if (empty($this->getWords()) && empty($this->getOperators())) {
+        if (0 === count($this->getWords()) && 0 === count($this->getOperators())) {
             return new LengthAwarePaginator([], 0, 5, 1);
         }
 

app/TransactionRules/Factory/ActionFactory.php

@@ -92,7 +92,7 @@ class ActionFactory
      */
     protected static function getActionTypes(): array
     {
-        if (empty(self::$actionTypes)) {
+        if (0 === count(self::$actionTypes)) {
             self::$actionTypes = Domain::getRuleActions();
         }
 

app/Validation/RecurrenceValidation.php

@@ -126,7 +126,7 @@ trait RecurrenceValidation
         $data        = $validator->getData();
         $repetitions = $data['repetitions'] ?? [];
         // need at least one transaction
-        if (!is_countable($repetitions) || empty($repetitions)) {
+        if (!is_countable($repetitions) || 0 === count($repetitions)) {
             $validator->errors()->add('repetitions', (string) trans('validation.at_least_one_repetition'));
         }
     }
@@ -144,7 +144,7 @@ trait RecurrenceValidation
             return;
         }
         // need at least one transaction
-        if (empty($repetitions)) {
+        if (0 === count($repetitions)) {
             $validator->errors()->add('repetitions', (string) trans('validation.at_least_one_repetition'));
         }
     }

app/Validation/TransactionValidation.php

@@ -312,7 +312,7 @@ trait TransactionValidation
         $transactions = $this->getTransactionsArray($validator);
 
         // need at least one transaction
-        if (empty($transactions)) {
+        if (0 === count($transactions)) {
             $validator->errors()->add('transactions', (string) trans('validation.at_least_one_transaction'));
         }
     }
@@ -327,7 +327,7 @@ trait TransactionValidation
         Log::debug('Now in validateOneTransaction()');
         $transactions = $this->getTransactionsArray($validator);
         // need at least one transaction
-        if (empty($transactions)) {
+        if (0 === count($transactions)) {
             $validator->errors()->add('transactions.0.description', (string) trans('validation.at_least_one_transaction'));
             Log::debug('Added error: at_least_one_transaction.');