Applied StyleCi changes, updated php deps

app/Auth/Access/Oidc/OidcOAuthProvider.php

@@ -31,7 +31,7 @@ class OidcOAuthProvider extends AbstractProvider
     protected $tokenEndpoint;
 
     /**
-     * Scopes to use for the OIDC authorization call
+     * Scopes to use for the OIDC authorization call.
      */
     protected array $scopes = ['openid', 'profile', 'email'];
 

app/Auth/Access/Oidc/OidcService.php

@@ -2,9 +2,8 @@
 
 namespace BookStack\Auth\Access\Oidc;
 
-use BookStack\Auth\Access\GroupSyncService;
-use Illuminate\Support\Arr;
 use function auth;
+use BookStack\Auth\Access\GroupSyncService;
 use BookStack\Auth\Access\LoginService;
 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\User;
@@ -12,6 +11,7 @@ use BookStack\Exceptions\JsonDebugException;
 use BookStack\Exceptions\StoppedAuthenticationException;
 use BookStack\Exceptions\UserRegistrationException;
 use function config;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
 use League\OAuth2\Client\OptionProvider\HttpBasicAuthOptionProvider;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
@@ -35,11 +35,10 @@ class OidcService
      */
     public function __construct(
         RegistrationService $registrationService,
-        LoginService        $loginService,
+        LoginService $loginService,
-        HttpClient          $httpClient,
+        HttpClient $httpClient,
-        GroupSyncService    $groupService
+        GroupSyncService $groupService
-    )
+    ) {
-    {
         $this->registrationService = $registrationService;
         $this->loginService = $loginService;
         $this->httpClient = $httpClient;
@@ -148,7 +147,7 @@ class OidcService
         $scopeConfig = $this->config()['additional_scopes'] ?: '';
 
         $scopeArr = explode(',', $scopeConfig);
-        $scopeArr = array_map(fn(string $scope) => trim($scope), $scopeArr);
+        $scopeArr = array_map(fn (string $scope) => trim($scope), $scopeArr);
 
         return array_filter($scopeArr);
     }
@@ -192,7 +191,7 @@ class OidcService
             return [];
         }
 
-        return array_values(array_filter($groupsList, function($val) {
+        return array_values(array_filter($groupsList, function ($val) {
             return is_string($val);
         }));
     }

app/Config/app.php

@@ -22,7 +22,7 @@ return [
     // The number of revisions to keep in the database.
     // Once this limit is reached older revisions will be deleted.
     // If set to false then a limit will not be enforced.
-    'revision_limit' => env('REVISION_LIMIT',  100),
+    'revision_limit' => env('REVISION_LIMIT', 100),
 
     // The number of days that content will remain in the recycle bin before
     // being considered for auto-removal. It is not a guarantee that content will

app/Console/Commands/RegenerateCommentContent.php

@@ -58,6 +58,7 @@ class RegenerateCommentContent extends Command
 
         DB::setDefaultConnection($connection);
         $this->comment('Comment HTML content has been regenerated');
+
         return 0;
     }
 }

app/Console/Commands/RegeneratePermissions.php

@@ -50,6 +50,7 @@ class RegeneratePermissions extends Command
 
         DB::setDefaultConnection($connection);
         $this->comment('Permissions regenerated');
+
         return 0;
     }
 }

app/Console/Commands/RegenerateReferences.php

@@ -53,6 +53,7 @@ class RegenerateReferences extends Command
         DB::setDefaultConnection($connection);
 
         $this->comment('References have been regenerated');
+
         return 0;
     }
 }

app/Entities/Repos/PageRepo.php

@@ -32,12 +32,11 @@ class PageRepo
      * PageRepo constructor.
      */
     public function __construct(
-        BaseRepo         $baseRepo,
+        BaseRepo $baseRepo,
-        RevisionRepo     $revisionRepo,
+        RevisionRepo $revisionRepo,
-        ReferenceStore   $referenceStore,
+        ReferenceStore $referenceStore,
         ReferenceUpdater $referenceUpdater
-    )
+    ) {
-    {
         $this->baseRepo = $baseRepo;
         $this->revisionRepo = $revisionRepo;
         $this->referenceStore = $referenceStore;
@@ -135,11 +134,11 @@ class PageRepo
     public function getNewDraftPage(Entity $parent)
     {
         $page = (new Page())->forceFill([
-            'name' => trans('entities.pages_initial_name'),
+            'name'       => trans('entities.pages_initial_name'),
             'created_by' => user()->id,
-            'owned_by' => user()->id,
+            'owned_by'   => user()->id,
             'updated_by' => user()->id,
-            'draft' => true,
+            'draft'      => true,
         ]);
 
         if ($parent instanceof Chapter) {

app/Entities/Repos/RevisionRepo.php

@@ -128,4 +128,4 @@ class RevisionRepo
             ->where('page_id', '=', $pageId)
             ->orderBy('created_at', 'desc');
     }
-}
+}

app/Http/Controllers/ChapterController.php

@@ -23,7 +23,6 @@ class ChapterController extends Controller
     protected ChapterRepo $chapterRepo;
     protected ReferenceFetcher $referenceFetcher;
 
-
     public function __construct(ChapterRepo $chapterRepo, ReferenceFetcher $referenceFetcher)
     {
         $this->chapterRepo = $chapterRepo;

app/Http/Controllers/ReferenceController.php

@@ -27,7 +27,7 @@ class ReferenceController extends Controller
         $references = $this->referenceFetcher->getPageReferencesToEntity($page);
 
         return view('pages.references', [
-            'page' => $page,
+            'page'       => $page,
             'references' => $references,
         ]);
     }
@@ -42,7 +42,7 @@ class ReferenceController extends Controller
         $references = $this->referenceFetcher->getPageReferencesToEntity($chapter);
 
         return view('chapters.references', [
-            'chapter' => $chapter,
+            'chapter'    => $chapter,
             'references' => $references,
         ]);
     }
@@ -56,7 +56,7 @@ class ReferenceController extends Controller
         $references = $this->referenceFetcher->getPageReferencesToEntity($book);
 
         return view('books.references', [
-            'book' => $book,
+            'book'       => $book,
             'references' => $references,
         ]);
     }
@@ -70,7 +70,7 @@ class ReferenceController extends Controller
         $references = $this->referenceFetcher->getPageReferencesToEntity($shelf);
 
         return view('shelves.references', [
-            'shelf' => $shelf,
+            'shelf'      => $shelf,
             'references' => $references,
         ]);
     }

app/References/CrossLinkParser.php

@@ -99,5 +99,4 @@ class CrossLinkParser
             new BookshelfLinkModelResolver(),
         ]);
     }
-
+}
-}

app/References/ModelResolvers/BookLinkModelResolver.php

@@ -19,8 +19,8 @@ class BookLinkModelResolver implements CrossLinkModelResolver
         $bookSlug = $matches[1];
 
         /** @var ?Book $model */
-        $model = Book::query()->where('slug', '=',  $bookSlug)->first(['id']);
+        $model = Book::query()->where('slug', '=', $bookSlug)->first(['id']);
 
         return $model;
     }
-}
+}

app/References/ModelResolvers/BookshelfLinkModelResolver.php

@@ -19,8 +19,8 @@ class BookshelfLinkModelResolver implements CrossLinkModelResolver
         $shelfSlug = $matches[1];
 
         /** @var ?Bookshelf $model */
-        $model = Bookshelf::query()->where('slug', '=',  $shelfSlug)->first(['id']);
+        $model = Bookshelf::query()->where('slug', '=', $shelfSlug)->first(['id']);
 
         return $model;
     }
-}
+}

app/References/ModelResolvers/ChapterLinkModelResolver.php

@@ -24,4 +24,4 @@ class ChapterLinkModelResolver implements CrossLinkModelResolver
 
         return $model;
     }
-}
+}

app/References/ModelResolvers/CrossLinkModelResolver.php

@@ -10,4 +10,4 @@ interface CrossLinkModelResolver
      * Resolve the given href link value to a model.
      */
     public function resolve(string $link): ?Model;
-}
+}

app/References/ModelResolvers/PageLinkModelResolver.php

@@ -24,4 +24,4 @@ class PageLinkModelResolver implements CrossLinkModelResolver
 
         return $model;
     }
-}
+}

app/References/ModelResolvers/PagePermalinkModelResolver.php

@@ -22,4 +22,4 @@ class PagePermalinkModelResolver implements CrossLinkModelResolver
 
         return $model;
     }
-}
+}

app/References/Reference.php

@@ -2,14 +2,13 @@
 
 namespace BookStack\References;
 
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 /**
- * @property int $from_id
+ * @property int    $from_id
  * @property string $from_type
- * @property int $to_id
+ * @property int    $to_id
  * @property string $to_type
  */
 class Reference extends Model

app/References/ReferenceFetcher.php

@@ -26,9 +26,9 @@ class ReferenceFetcher
         $baseQuery = $entity->referencesTo()
             ->where('from_type', '=', (new Page())->getMorphClass())
             ->with([
-                'from' => fn(Relation $query) => $query->select(Page::$listAttributes),
+                'from'         => fn (Relation $query) => $query->select(Page::$listAttributes),
-                'from.book' => fn(Relation $query) => $query->scopes('visible'),
+                'from.book'    => fn (Relation $query) => $query->scopes('visible'),
-                'from.chapter' => fn(Relation $query) => $query->scopes('visible')
+                'from.chapter' => fn (Relation $query) => $query->scopes('visible'),
             ]);
 
         $references = $this->permissions->restrictEntityRelationQuery(
@@ -59,4 +59,4 @@ class ReferenceFetcher
 
         return $count;
     }
-}
+}

app/References/ReferenceStore.php

@@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Collection;
 
 class ReferenceStore
 {
-
     /**
      * Update the outgoing references for the given page.
      */
@@ -25,7 +24,7 @@ class ReferenceStore
             ->where('from_type', '=', (new Page())->getMorphClass())
             ->delete();
 
-        Page::query()->select(['id', 'html'])->chunk(100, function(Collection $pages) {
+        Page::query()->select(['id', 'html'])->chunk(100, function (Collection $pages) {
             $this->updateForPages($pages->all());
         });
     }
@@ -44,7 +43,7 @@ class ReferenceStore
         $parser = CrossLinkParser::createWithEntityResolvers();
         $references = [];
 
-        $pageIds = array_map(fn(Page $page) => $page->id, $pages);
+        $pageIds = array_map(fn (Page $page) => $page->id, $pages);
         Reference::query()
             ->where('from_type', '=', $pages[0]->getMorphClass())
             ->whereIn('from_id', $pageIds)
@@ -55,10 +54,10 @@ class ReferenceStore
 
             foreach ($models as $model) {
                 $references[] = [
-                    'from_id' => $page->id,
+                    'from_id'   => $page->id,
                     'from_type' => $page->getMorphClass(),
-                    'to_id' => $model->id,
+                    'to_id'     => $model->id,
-                    'to_type' => $model->getMorphClass(),
+                    'to_type'   => $model->getMorphClass(),
                 ];
             }
         }
@@ -67,5 +66,4 @@ class ReferenceStore
             Reference::query()->insert($referenceDataChunk);
         }
     }
-
+}
-}

app/References/ReferenceUpdater.php

@@ -91,4 +91,4 @@ class ReferenceUpdater
 
         return $html;
     }
-}
+}

tests/Auth/OidcTest.php

@@ -374,7 +374,7 @@ class OidcTest extends TestCase
         $resp = $this->runLogin([
             'email'  => 'benny@example.com',
             'sub'    => 'benny1010101',
-            'groups' => ['Wizards', 'Zookeepers']
+            'groups' => ['Wizards', 'Zookeepers'],
         ]);
         $resp->assertRedirect('/');
 
@@ -398,13 +398,13 @@ class OidcTest extends TestCase
         $resp = $this->runLogin([
             'email'  => 'benny@example.com',
             'sub'    => 'benny1010101',
-            'my' => [
+            'my'     => [
                 'custom' => [
                     'groups' => [
-                        'attr' => ['Wizards']
+                        'attr' => ['Wizards'],
-                    ]
+                    ],
-                ]
+                ],
-            ]
+            ],
         ]);
         $resp->assertRedirect('/');
 

tests/Commands/RegenerateReferencesCommandTest.php

@@ -23,10 +23,10 @@ class RegenerateReferencesCommandTest extends TestCase
             ->assertExitCode(0);
 
         $this->assertDatabaseHas('references', [
-            'from_id' => $page->id,
+            'from_id'   => $page->id,
             'from_type' => $page->getMorphClass(),
-            'to_id' => $book->id,
+            'to_id'     => $book->id,
-            'to_type' => $book->getMorphClass(),
+            'to_type'   => $book->getMorphClass(),
         ]);
     }
 }

tests/References/CrossLinkParserTest.php

@@ -2,14 +2,12 @@
 
 namespace Tests\References;
 
-use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Page;
 use BookStack\References\CrossLinkParser;
 use Tests\TestCase;
 
 class CrossLinkParserTest extends TestCase
 {
-
     public function test_instance_with_entity_resolvers_matches_entity_links()
     {
         $entities = $this->getEachEntityType();
@@ -17,7 +15,7 @@ class CrossLinkParserTest extends TestCase
 
         $html = '
 <a href="' . url('/link/' . $otherPage->id) . '#cat">Page Permalink</a>
-<a href="' . $entities['page'] ->getUrl(). '?a=b">Page Link</a>
+<a href="' . $entities['page']->getUrl() . '?a=b">Page Link</a>
 <a href="' . $entities['chapter']->getUrl() . '?cat=mouse#donkey">Chapter Link</a>
 <a href="' . $entities['book']->getUrl() . '/edit">Book Link</a>
 <a href="' . $entities['bookshelf']->getUrl() . '/edit?cat=happy#hello">Shelf Link</a>

tests/References/ReferencesTest.php

@@ -12,7 +12,6 @@ use Tests\TestCase;
 
 class ReferencesTest extends TestCase
 {
-
     public function test_references_created_on_page_update()
     {
         /** @var Page $pageA */
@@ -24,14 +23,14 @@ class ReferencesTest extends TestCase
 
         $this->asEditor()->put($pageA->getUrl(), [
             'name' => 'Reference test',
-            'html' => '<a href="' . $pageB->getUrl() . '">Testing</a>'
+            'html' => '<a href="' . $pageB->getUrl() . '">Testing</a>',
         ]);
 
         $this->assertDatabaseHas('references', [
-            'from_id' => $pageA->id,
+            'from_id'   => $pageA->id,
             'from_type' => $pageA->getMorphClass(),
-            'to_id' => $pageB->id,
+            'to_id'     => $pageB->id,
-            'to_type' => $pageB->getMorphClass(),
+            'to_type'   => $pageB->getMorphClass(),
         ]);
     }
 
@@ -141,7 +140,7 @@ class ReferencesTest extends TestCase
             $this->assertStringContainsString('href="http://localhost/books/my-updated-book-slugaroo"', $page->html);
             $this->assertDatabaseHas('page_revisions', [
                 'page_id' => $page->id,
-                'summary' => 'System auto-update of internal links'
+                'summary' => 'System auto-update of internal links',
             ]);
         }
     }
@@ -179,10 +178,9 @@ class ReferencesTest extends TestCase
     {
         (new Reference())->forceFill([
             'from_type' => $from->getMorphClass(),
-            'from_id' => $from->id,
+            'from_id'   => $from->id,
-            'to_type' => $to->getMorphClass(),
+            'to_type'   => $to->getMorphClass(),
-            'to_id' => $to->id,
+            'to_id'     => $to->id,
         ])->save();
     }
-
+}
-}