Maintenance: Updated larastan target level, fixed issues from tests

Author: ssddanbrown

app/Access/Guards/ExternalBaseSessionGuard.php

@@ -30,7 +30,7 @@ class ExternalBaseSessionGuard implements StatefulGuard
     /**
      * The user we last attempted to retrieve.
      */
-    protected Authenticatable $lastAttempted;
+    protected Authenticatable|null $lastAttempted;
 
     /**
      * The session used by the guard.

app/Console/Commands/UpdateUrlCommand.php

@@ -52,7 +52,7 @@ public function handle(Connection $db): int
             'page_revisions' => ['html', 'text', 'markdown'],
             'images'      => ['url'],
             'settings'    => ['value'],
-            'comments'    => ['html', 'text'],
+            'comments'    => ['html'],
         ];
 
         foreach ($columnsToUpdateByTable as $table => $columns) {

app/Entities/Controllers/RecycleBinApiController.php

@@ -9,6 +9,7 @@
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Repos\DeletionRepo;
 use BookStack\Http\ApiController;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class RecycleBinApiController extends ApiController
@@ -69,7 +70,7 @@ public function destroy(DeletionRepo $deletionRepo, string $deletionId)
     /**
      * Load some related details for the deletion listing.
      */
-    protected function listFormatter(Deletion $deletion)
+    protected function listFormatter(Deletion $deletion): void
     {
         $deletable = $deletion->deletable;
 
@@ -89,9 +90,9 @@ protected function listFormatter(Deletion $deletion)
     }
 
     /**
-     * @param HasMany<Chapter|Page, Book|Chapter> $query
+     * @param Builder<Chapter|Page> $query
      */
-    protected static function withTrashedQuery(HasMany $query): void
+    protected static function withTrashedQuery(Builder $query): void
     {
         $query->withTrashed();
     }

phpstan.neon.dist

@@ -7,7 +7,7 @@ parameters:
         - app
 
     # The level 8 is the highest level
-    level: 2
+    level: 3
 
     phpVersion:
         min: 80200

tests/Entity/CommentStoreTest.php

@@ -27,7 +27,6 @@ public function test_add_comment()
             'local_id'    => 1,
             'entity_id'   => $page->id,
             'entity_type' => Page::newModelInstance()->getMorphClass(),
-            'text'        => null,
             'parent_id'   => 2,
         ]);