Fix PHPStan issues

owlchester · Feb 21, 2024 · 028b1ca · 028b1ca
1 parent c0af6ca
commit 028b1ca
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php
@@ -70,7 +70,6 @@ class CrudController extends Controller
 
     /**
      * A sorter object for subviews
-     * @var null|DatagridSorter
      */
     protected DatagridSorter $datagridSorter;
 

diff --git a/app/Http/Controllers/Search/GameSystemSearchController.php b/app/Http/Controllers/Search/GameSystemSearchController.php
@@ -43,7 +43,7 @@ public function index(): JsonResponse
         }
 
         return response()->json(
-            $formatted ?? []
+            $formatted
         );
     }
 }
diff --git a/app/Jobs/Emails/Subscriptions/EmailValidationJob.php b/app/Jobs/Emails/Subscriptions/EmailValidationJob.php
@@ -20,7 +20,7 @@ class EmailValidationJob implements ShouldQueue
     use SerializesModels;
 
     protected int $user;
-    protected string $token;
+    protected int $token;
 
     /**
      */

diff --git a/app/Models/Tag.php b/app/Models/Tag.php
@@ -184,7 +184,6 @@ public function allChildren(bool $withTags = false)
         foreach ($this->entities->pluck('id')->toArray() as $entity) {
             $children[] = $entity;
         }
-        // @phpstan-ignore-next-line
         foreach ($this->descendants as $desc) {
             foreach ($desc->entities()->pluck('entities.id')->toArray() as $entity) {
                 $children[] = $entity;

diff --git a/app/Services/Entity/EntityRelationService.php b/app/Services/Entity/EntityRelationService.php
@@ -649,10 +649,12 @@ protected function addLocation(): self
             return $this;
         }
 
-        $this->addEntity($this->entity->child->location->entity);
+        /** @var Character|mixed $child */
+        $child = $this->entity->child;
+        $this->addEntity($child->location->entity);
         $this->relations[] = [
             'source' => $this->entity->id,
-            'target' => $this->entity->child->location->entity->id,
+            'target' => $child->location->entity->id,
             'text' => Module::singular(config('entities.ids.location'), __('entities.location')),
             'colour' => '#ccc',
             'attitude' => null,
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,7 +70,6 @@ class CrudController extends Controller @@
         /**
          * A sorter object for subviews
-         * @var null|DatagridSorter
          */
         protected DatagridSorter $datagridSorter;
@@ Expand Down @@