Code cleaning

Author: sdebacker

src/Composers/SidebarViewComposer.php

@@ -14,10 +14,10 @@ public function compose(View $view): void
         if (Gate::denies('read places')) {
             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(__('Places'), function (SidebarItem $item) {
+            $group->addItem(__('Places'), function (SidebarItem $item): void {
                 $item->id = 'places';
                 $item->icon = config('typicms.modules.places.sidebar.icon');
                 $item->weight = config('typicms.modules.places.sidebar.weight');

src/Http/Controllers/AdminController.php

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

src/Http/Controllers/ApiController.php

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

src/Http/Controllers/PublicController.php

@@ -17,7 +17,7 @@ public function index(): View
             ->get();
 
         return view('places::public.index')
-            ->with(compact('models'));
+            ->with(['models' => $models]);
     }
 
     public function show(string $slug): View
@@ -28,6 +28,6 @@ public function show(string $slug): View
             ->firstOrFail();
 
         return view('places::public.show')
-            ->with(compact('model'));
+            ->with(['model' => $model]);
     }
 }

src/Models/Place.php

@@ -80,7 +80,7 @@ class Place extends Base
 
     public function url(?string $locale = null): string
     {
-        $locale = $locale ?: app()->getLocale();
+        $locale ??= app()->getLocale();
         $route = $locale . '::place';
         $slug = $this->translate('slug', $locale) ?: null;
 

src/Providers/ModuleServiceProvider.php

@@ -37,7 +37,7 @@ public function boot(): void
         /*
          * Add the page in the view.
          */
-        View::composer('places::public.*', function ($view) {
+        View::composer('places::public.*', function ($view): void {
             $view->page = getPageLinkedToModule('places');
         });
     }

src/routes/places.php

@@ -1,5 +1,6 @@
 <?php
 
+use TypiCMS\Modules\Core\Models\Page;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Route;
 use TypiCMS\Modules\Places\Http\Controllers\AdminController;
@@ -10,11 +11,11 @@
 /*
  * Front office routes
  */
-if ($page = getPageLinkedToModule('places')) {
+if (($page = getPageLinkedToModule('places')) 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-places');
                 $router->get('places-json', [JsonController::class, 'index'])->name('places-json');
                 $router->get('{place}', [PublicController::class, 'show'])->name('place');
@@ -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('places', [AdminController::class, 'index'])->name('index-places')->middleware('can:read places');
     $router->get('places/export', [AdminController::class, 'export'])->name('export-places')->middleware('can:read places');
     $router->get('places/create', [AdminController::class, 'create'])->name('create-place')->middleware('can:create places');
@@ -39,7 +40,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('places', [ApiController::class, 'index'])->middleware('can:read places');
     $router->patch('places/{place}', [ApiController::class, 'updatePartial'])->middleware('can:update places');
     $router->delete('places/{place}', [ApiController::class, 'destroy'])->middleware('can:delete places');