Entities: Addressed phpstan errors

Author: ssddanbrown

app/Entities/Models/Entity.php

@@ -451,7 +451,7 @@ public function logDescriptor(): string
     }
 
     /**
-     * @return HasOne<EntityContainerData|EntityPageData, $this>
+     * @return HasOne<covariant (EntityContainerData|EntityPageData), $this>
      */
     abstract public function relatedData(): HasOne;
 

app/Entities/Models/HasCoverInterface.php

@@ -12,7 +12,7 @@ public function coverInfo(): EntityCover;
 
     /**
      * The cover image of this entity.
-     * @return BelongsTo<Image, $this>
+     * @return BelongsTo<Image, covariant Entity>
      */
     public function cover(): BelongsTo;
 }

app/Entities/Tools/EntityCover.php

@@ -37,7 +37,12 @@ public function getImage(): Image|null
             return null;
         }
 
-        return $this->imageQuery()->first();
+        $cover = $this->imageQuery()->first();
+        if ($cover instanceof Image) {
+            return $cover;
+        }
+
+        return null;
     }
 
     /**

app/Entities/Tools/EntityDefaultTemplate.php

@@ -47,8 +47,14 @@ public function get(): Page|null
         }
 
         $pageQueries = app()->make(PageQueries::class);
-        return $pageQueries->visibleTemplates(true)
+        $page = $pageQueries->visibleTemplates(true)
             ->where('id', '=', $this->entity->default_template_id)
             ->first();
+
+        if ($page instanceof Page) {
+            return $page;
+        }
+
+        return null;
     }
 }

app/References/ReferenceUpdater.php

@@ -69,7 +69,7 @@ protected function updateReferencesWithinEntity(Entity $entity, string $oldLink,
         }
     }
 
-    protected function updateReferencesWithinDescription(HasDescriptionInterface $entity, string $oldLink, string $newLink): void
+    protected function updateReferencesWithinDescription(Entity&HasDescriptionInterface $entity, string $oldLink, string $newLink): void
     {
         $description = $entity->descriptionInfo();
         $html = $this->updateLinksInHtml($description->getHtml(true) ?: '', $oldLink, $newLink);

app/Sorting/BookSorter.php

@@ -34,7 +34,7 @@ public function runBookAutoSortForAllWithSet(SortRule $set): void
     public function runBookAutoSort(Book $book): void
     {
         $rule = $book->sortRule()->first();
-        if (!$rule) {
+        if (!($rule instanceof SortRule)) {
             return;
         }