Clean up some code

app/Helpers/Attachments/AttachmentHelper.php

@@ -235,7 +235,7 @@ class AttachmentHelper implements AttachmentHelperInterface
             $user  = $model->user; // @phpstan-ignore-line
             // ignore lines about polymorphic calls.
             if ($model instanceof PiggyBank) {
-                $user = $model->account->user; // @phpstan-ignore-line
+                $user = $model->account->user;
             }
 
             $attachment = new Attachment(); // create Attachment object.
@@ -374,7 +374,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $count = 0;
         // ignore lines about polymorphic calls.
         if ($model instanceof PiggyBank) {
-            $count = $model->account->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count(); // @phpstan-ignore-line
+            $count = $model->account->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count();
         }
         if ($model instanceof PiggyBank) {
             $count = $model->user->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count(); // @phpstan-ignore-line

app/Http/Controllers/Account/ReconcileController.php

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

app/Http/Controllers/Account/ShowController.php

@@ -91,7 +91,7 @@ class ShowController extends Controller
      * @throws ContainerExceptionInterface
      * @throws 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)
     {
         $objectType = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type));
 

app/Http/Controllers/Auth/ResetPasswordController.php

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

app/Http/Controllers/Budget/IndexController.php

@@ -99,7 +99,7 @@ class IndexController extends Controller
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
      */
-    public function index(Request $request, Carbon $start = null, Carbon $end = null) 
+    public function index(Request $request, Carbon $start = null, Carbon $end = null)
     {
         Log::debug('Start of IndexController::index()');
 

app/Http/Controllers/Category/ShowController.php

@@ -85,7 +85,7 @@ class ShowController extends Controller
      * @throws ContainerExceptionInterface
      * @throws 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)
     {
         /** @var Carbon $start */
         $start = $start ?? session('start', Carbon::now()->startOfMonth());

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
     {
         /** @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
     {
         /** @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
     {
         /** @var GroupCollectorInterface $collector */
         $collector     = app(GroupCollectorInterface::class);

app/Http/Controllers/Json/IntroController.php

@@ -44,7 +44,7 @@ class IntroController extends Controller
      *
      * @return JsonResponse
      */
-    public function getIntroSteps(string $route, string $specificPage = null): JsonResponse 
+    public function getIntroSteps(string $route, string $specificPage = null): JsonResponse
     {
         Log::debug(sprintf('getIntroSteps for route "%s" and page "%s"', $route, $specificPage));
         $specificPage  = $specificPage ?? '';
@@ -105,7 +105,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
     {
         $specialPage = $specialPage ?? '';
         $route       = str_replace('.', '_', $route);
@@ -129,7 +129,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
     {
         $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
     {
         $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)
     {
         if (null === $start || null === $end) {
             throw new FireflyException('Invalid dates submitted.');

app/Providers/AccountServiceProvider.php

@@ -65,7 +65,8 @@ class AccountServiceProvider extends ServiceProvider
                 /** @var AccountRepositoryInterface $repository */
                 $repository = app(AccountRepository::class);
 
-                if ($app->auth->check()) {
+                // phpstan thinks auth does not exist.
+                if ($app->auth->check()) { // @phpstan-ignore-line
                     $repository->setUser(auth()->user());
                 }
 
@@ -79,7 +80,8 @@ class AccountServiceProvider extends ServiceProvider
                 /** @var OperationsRepository $repository */
                 $repository = app(OperationsRepository::class);
 
-                if ($app->auth->check()) {
+                // phpstan thinks auth does not exist.
+                if ($app->auth->check()) { // @phpstan-ignore-line
                     $repository->setUser(auth()->user());
                 }
 
@@ -99,7 +101,8 @@ class AccountServiceProvider extends ServiceProvider
                 /** @var AccountTaskerInterface $tasker */
                 $tasker = app(AccountTasker::class);
 
-                if ($app->auth->check()) {
+                // phpstan thinks auth does not exist.
+                if ($app->auth->check()) { // @phpstan-ignore-line
                     $tasker->setUser(auth()->user());
                 }
 

resources/assets/js/components/form/Checkbox.vue

@@ -30,7 +30,7 @@
           <input v-model=active :name="name" @change="handleInput" type="checkbox" value="1">
         </label>
       </div>
-      <p class="help-block" v-html="$t('firefly.webhook_active_form_help')"></p>
+      <p class="help-block" v-text="$t('firefly.webhook_active_form_help')"></p>
     </div>
   </div>
 </template>

resources/assets/js/components/form/WebhookDelivery.vue

@@ -37,7 +37,7 @@
                 :value="delivery.id">{{ delivery.name }}
         </option>
       </select>
-      <p class="help-block" v-html="$t('firefly.webhook_delivery_form_help')"></p>
+      <p class="help-block" v-text="$t('firefly.webhook_delivery_form_help')"></p>
       <ul v-for="error in this.error" class="list-unstyled">
         <li class="text-danger">{{ error }}</li>
       </ul>

resources/assets/js/components/form/WebhookResponse.vue

@@ -37,7 +37,7 @@
                 :value="response.id">{{ response.name }}
         </option>
       </select>
-      <p class="help-block" v-html="$t('firefly.webhook_response_form_help')"></p>
+      <p class="help-block" v-text="$t('firefly.webhook_response_form_help')"></p>
       <ul v-for="error in this.error" class="list-unstyled">
         <li class="text-danger">{{ error }}</li>
       </ul>

resources/assets/js/components/form/WebhookTrigger.vue

@@ -37,7 +37,7 @@
                 :value="trigger.id">{{ trigger.name }}
         </option>
       </select>
-      <p class="help-block" v-html="$t('firefly.webhook_trigger_form_help')"></p>
+      <p class="help-block" v-text="$t('firefly.webhook_trigger_form_help')"></p>
       <ul v-for="error in this.error" class="list-unstyled">
         <li class="text-danger">{{ error }}</li>
       </ul>

resources/assets/js/components/transactions/Bill.vue

@@ -40,7 +40,7 @@
                 :value="cBill.id">{{ cBill.name }}
         </option>
       </select>
-      <p v-if="this.bills.length === 1" class="help-block" v-html="$t('firefly.no_bill_pointer')"></p>
+      <p v-if="this.bills.length === 1" class="help-block" v-text="$t('firefly.no_bill_pointer')"></p>
       <ul v-for="error in this.error" class="list-unstyled">
         <li class="text-danger">{{ error }}</li>
       </ul>

resources/assets/js/components/transactions/Budget.vue

@@ -40,7 +40,7 @@
                 :value="cBudget.id">{{ cBudget.name }}
         </option>
       </select>
-      <p v-if="this.budgets.length === 1" class="help-block" v-html="$t('firefly.no_budget_pointer')"></p>
+      <p v-if="this.budgets.length === 1" class="help-block" v-text="$t('firefly.no_budget_pointer')"></p>
       <ul v-for="error in this.error" class="list-unstyled">
         <li class="text-danger">{{ error }}</li>
       </ul>

resources/assets/js/components/transactions/CustomTransactionFields.vue

@@ -20,7 +20,7 @@
 
 <template>
   <div>
-    <p class="help-block" v-html="$t('firefly.hidden_fields_preferences')"></p>
+    <p class="help-block" v-text="$t('firefly.hidden_fields_preferences')"></p>
     <component
         v-bind:is="dateComponent"
         v-if="this.fields.interest_date" v-model="value.interest_date" :error="error.interest_date"

resources/assets/js/components/webhooks/Show.vue

@@ -85,7 +85,7 @@
             <table class="table table-hover" aria-label="A table">
               <tbody>
               <tr>
-                <th style="width:40%;">{{ $t('list.url') }}</th>
+                <th  scope="row" style="width:40%;">{{ $t('list.url') }}</th>
                 <td><input type="text" readonly class="form-control" :value=url></td>
               </tr>
               <tr>