Code cleaning

Author: sdebacker

src/Composers/SidebarViewComposer.php

@@ -14,10 +14,10 @@ public function compose(View $view): void
         if (Gate::denies('read projects')) {
             return;
         }
-        $view->offsetGet('sidebar')->group(__('Content'), function (SidebarGroup $group) {
+        $view->offsetGet('sidebar')->group(__('Content'), function (SidebarGroup $group): void {
             $group->id = 'content';
             $group->weight = 30;
-            $group->addItem(__('Projects'), function (SidebarItem $item) {
+            $group->addItem(__('Projects'), function (SidebarItem $item): void {
                 $item->id = 'projects';
                 $item->icon = config('typicms.modules.projects.sidebar.icon');
                 $item->weight = config('typicms.modules.projects.sidebar.weight');

src/Http/Controllers/AdminController.php

@@ -32,7 +32,7 @@ public function create(): View
         $model = new Project();
 
         return view('projects::admin.create')
-            ->with(compact('model'));
+            ->with(['model' => $model]);
     }
 
     public function edit(Project $project): View

src/Http/Controllers/ApiController.php

@@ -19,16 +19,15 @@ public function index(Request $request): LengthAwarePaginator
     {
         $query = Project::query()
             ->selectFields()
-            ->selectSub(ProjectCategory::select(column('title'))->whereColumn('category_id', 'project_categories.id'), 'category_name');
-        $data = QueryBuilder::for($query)
+            ->selectSub(ProjectCategory::query()->select(column('title'))->whereColumn('category_id', 'project_categories.id'), 'category_name');
+
+        return QueryBuilder::for($query)
             ->allowedSorts(['status_translated', 'date', 'title_translated', 'category_name'])
             ->allowedFilters([
                 AllowedFilter::custom('title', new FilterOr()),
             ])
             ->allowedIncludes(['image'])
             ->paginate($request->integer('per_page'));
-
-        return $data;
     }
 
     protected function updatePartial(Project $project, Request $request): void

src/Http/Controllers/CategoriesAdminController.php

@@ -21,7 +21,7 @@ public function create(): View
         $model = new ProjectCategory();
 
         return view('projects::admin.create-category')
-            ->with(compact('model'));
+            ->with(['model' => $model]);
     }
 
     public function edit(ProjectCategory $category): View

src/Http/Controllers/CategoriesApiController.php

@@ -18,15 +18,14 @@ class CategoriesApiController extends BaseApiController
     public function index(Request $request): LengthAwarePaginator
     {
         $query = ProjectCategory::query()->selectFields();
-        $data = QueryBuilder::for($query)
+
+        return QueryBuilder::for($query)
             ->allowedSorts(['status_translated', 'position', 'title_translated'])
             ->allowedFilters([
                 AllowedFilter::custom('title', new FilterOr()),
             ])
             ->allowedIncludes(['image'])
             ->paginate($request->integer('per_page'));
-
-        return $data;
     }
 
     protected function updatePartial(ProjectCategory $category, Request $request): void

src/Http/Controllers/PublicController.php

@@ -18,7 +18,7 @@ public function index(): View
             ->get();
 
         return view('projects::public.index')
-            ->with(compact('categories'));
+            ->with(['categories' => $categories]);
     }
 
     public function indexOfCategory(?string $categorySlug = null): View
@@ -35,7 +35,7 @@ public function indexOfCategory(?string $categorySlug = null): View
             ->get();
 
         return view('projects::public.index-of-category')
-            ->with(compact('models', 'category'));
+            ->with(['models' => $models, 'category' => $category]);
     }
 
     public function show(?string $categorySlug = null, ?string $slug = null): View
@@ -53,11 +53,9 @@ public function show(?string $categorySlug = null, ?string $slug = null): View
             ])
             ->whereSlugIs($slug)
             ->firstOrFail();
-        if ($category->id !== $model->category_id) {
-            abort(404);
-        }
+        abort_if($category->id !== $model->category_id, 404);
 
         return view('projects::public.show')
-            ->with(compact('model'));
+            ->with(['model' => $model]);
     }
 }

src/Models/Project.php

@@ -96,7 +96,7 @@ protected function casts(): array
 
     public function url(?string $locale = null): string
     {
-        $locale = $locale ?: app()->getLocale();
+        $locale ??= app()->getLocale();
         $route = $locale . '::project';
         $slug = $this->translate('slug', $locale);
         $categorySlug = $this->category->translate('slug', $locale);

src/Models/ProjectCategory.php

@@ -76,7 +76,7 @@ public function allForSelect(): array
 
     public function url(?string $locale = null): string
     {
-        $locale = $locale ?: app()->getLocale();
+        $locale ??= app()->getLocale();
         $route = $locale . '::projects-category';
         $slug = $this->translate('slug', $locale);
 

src/Providers/ModuleServiceProvider.php

@@ -43,12 +43,10 @@ public function boot(): void
         View::composer('core::admin._sidebar', SidebarViewComposer::class);
 
         // A project have tags.
-        Tag::resolveRelationUsing('projects', function ($tag) {
-            return $tag->morphedByMany(Project::class, 'taggable');
-        });
+        Tag::resolveRelationUsing('projects', fn($tag) => $tag->morphedByMany(Project::class, 'taggable'));
 
         // Add the page in the view.
-        View::composer('projects::public.*', function ($view) {
+        View::composer('projects::public.*', function ($view): void {
             $view->page = getPageLinkedToModule('projects');
         });
     }

src/routes/projects.php

@@ -1,5 +1,6 @@
 <?php
 
+use TypiCMS\Modules\Core\Models\Page;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Route;
 use TypiCMS\Modules\Projects\Http\Controllers\AdminController;
@@ -11,11 +12,11 @@
 /*
  * Front office routes
  */
-if ($page = getPageLinkedToModule('projects')) {
+if (($page = getPageLinkedToModule('projects')) instanceof Page) {
     $middleware = $page->private ? ['public', 'auth'] : ['public'];
     foreach (locales() as $lang) {
         if ($page->isPublished($lang) && $path = $page->path($lang)) {
-            Route::middleware($middleware)->prefix($path)->name($lang . '::')->group(function (Router $router) {
+            Route::middleware($middleware)->prefix($path)->name($lang . '::')->group(function (Router $router): void {
                 $router->get('/', [PublicController::class, 'index'])->name('index-projects');
                 $router->get('{category}', [PublicController::class, 'indexOfCategory'])->name('projects-category');
                 $router->get('{category}/{slug}', [PublicController::class, 'show'])->name('project');
@@ -27,7 +28,7 @@
 /*
  * Admin routes
  */
-Route::middleware('admin')->prefix('admin')->name('admin::')->group(function (Router $router) {
+Route::middleware('admin')->prefix('admin')->name('admin::')->group(function (Router $router): void {
     $router->get('projects', [AdminController::class, 'index'])->name('index-projects')->middleware('can:read projects');
     $router->get('projects/export', [AdminController::class, 'export'])->name('export-projects')->middleware('can:read projects');
     $router->get('projects/create', [AdminController::class, 'create'])->name('create-project')->middleware('can:create projects');
@@ -46,7 +47,7 @@
 /*
  * API routes
  */
-Route::middleware(['api', 'auth:api'])->prefix('api')->group(function (Router $router) {
+Route::middleware(['api', 'auth:api'])->prefix('api')->group(function (Router $router): void {
     $router->get('projects', [ApiController::class, 'index'])->middleware('can:read projects');
     $router->patch('projects/{project}', [ApiController::class, 'updatePartial'])->middleware('can:update projects');
     $router->delete('projects/{project}', [ApiController::class, 'destroy'])->middleware('can:delete projects');