Code cleaning

sdebacker · sdebacker · commit 3872b6a11782 · 2025-09-29T14:35:27.000+02:00
diff --git a/src/Composers/SidebarViewComposer.php b/src/Composers/SidebarViewComposer.php
@@ -14,10 +14,10 @@ public function compose(View $view): void
         if (Gate::denies('read events')) {
             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(__('Events'), function (SidebarItem $item) {
+            $group->addItem(__('Events'), function (SidebarItem $item): void {
                 $item->id = 'events';
                 $item->icon = config('typicms.modules.events.sidebar.icon');
                 $item->weight = config('typicms.modules.events.sidebar.weight');
diff --git a/src/Exports/RegistrationsExport.php b/src/Exports/RegistrationsExport.php
@@ -28,7 +28,7 @@ public function __construct(Request $request)
             ->selectFields()
             ->where('event_id', $request->route()->originalParameter('event'))
             ->addSelect([
-                'event_name' => Event::select(column('title'))
+                'event_name' => Event::query()->select(column('title'))
                     ->whereColumn('event_id', 'events.id')
                     ->limit(1),
             ]);
diff --git a/src/Filters/FilterRegistrations.php b/src/Filters/FilterRegistrations.php
@@ -20,10 +20,10 @@ public function __invoke(Builder $query, mixed $value, string $property): Builde
 
         $columns = explode(',', $property);
 
-        return $query->where(function (Builder $query) use ($columns, $value) {
+        return $query->where(function (Builder $query) use ($columns, $value): void {
             foreach ($columns as $column) {
                 if ($column === 'event_name') {
-                    $query->orWhereHas('event', function ($query) use ($value) {
+                    $query->orWhereHas('event', function ($query) use ($value): void {
                         $query->where('title', 'like', '%' . $value . '%');
                     });
                 } else {
diff --git a/src/Http/Controllers/AdminController.php b/src/Http/Controllers/AdminController.php
@@ -31,7 +31,7 @@ public function create(): View
         $model = new Event();
 
         return view('events::admin.create')
-            ->with(compact('model'));
+            ->with(['model' => $model]);
     }
 
     public function edit(Event $event): View
diff --git a/src/Http/Controllers/ApiController.php b/src/Http/Controllers/ApiController.php
@@ -23,15 +23,13 @@ public function index(Request $request): LengthAwarePaginator
                 'registration_count' => DB::table('registrations')->selectRaw('COUNT(*)')->whereColumn('events.id', 'registrations.event_id'),
             ]);
 
-        $data = QueryBuilder::for($query)
+        return QueryBuilder::for($query)
             ->allowedSorts(['status_translated', 'start_date', 'end_date', 'title_translated'])
             ->allowedFilters([
                 AllowedFilter::custom('title', new FilterOr()),
             ])
             ->allowedIncludes(['image'])
             ->paginate($request->integer('per_page'));
-
-        return $data;
     }
 
     protected function updatePartial(Event $event, Request $request): void
diff --git a/src/Http/Controllers/PublicController.php b/src/Http/Controllers/PublicController.php
@@ -28,7 +28,7 @@ public function index(): View
             ->paginate(config('typicms.modules.events.per_page'));
 
         return view('events::public.index')
-            ->with(compact('models'));
+            ->with(['models' => $models]);
     }
 
     public function past(): View
@@ -41,7 +41,7 @@ public function past(): View
             ->paginate(config('typicms.modules.events.per_page'));
 
         return view('events::public.past')
-            ->with(compact('models'));
+            ->with(['models' => $models]);
     }
 
     public function show(string $slug): View
@@ -57,7 +57,7 @@ public function show(string $slug): View
             ->firstOrFail();
 
         return view('events::public.show')
-            ->with(compact('model'));
+            ->with(['model' => $model]);
     }
 
     public function showRegistrationForm(string $slug): View
@@ -66,12 +66,10 @@ public function showRegistrationForm(string $slug): View
             ->published()
             ->whereSlugIs($slug)
             ->firstOrFail();
-        if (!$event->registration_form || $event->end_date < date('Y-m-d')) {
-            abort(404);
-        }
+        abort_if(!$event->registration_form || $event->end_date < date('Y-m-d'), 404);
 
         return view('events::public.registration')
-            ->with(compact('event'));
+            ->with(['event' => $event]);
     }
 
     public function register(string $slug, RegistrationFormRequest $request): RedirectResponse
@@ -80,9 +78,7 @@ public function register(string $slug, RegistrationFormRequest $request): Redire
             ->published()
             ->whereSlugIs($slug)
             ->firstOrFail();
-        if (!$event->registration_form || $event->end_date < date('Y-m-d')) {
-            abort(404);
-        }
+        abort_if(!$event->registration_form || $event->end_date < date('Y-m-d'), 404);
         $user = auth()->user();
         $data = $request->validated();
         $data['user_id'] = $user->id;
@@ -112,7 +108,7 @@ public function registered(string $slug): RedirectResponse|View
             ->whereSlugIs($slug)
             ->firstOrFail();
         if (session('success')) {
-            return view('events::public.registered')->with(compact('event'));
+            return view('events::public.registered')->with(['event' => $event]);
         }
 
         return redirect(url('/'));
diff --git a/src/Http/Controllers/RegistrationsAdminController.php b/src/Http/Controllers/RegistrationsAdminController.php
@@ -18,7 +18,7 @@ class RegistrationsAdminController extends BaseAdminController
 {
     public function index(Event $event): View
     {
-        return view('events::admin.registrations')->with(compact('event'));
+        return view('events::admin.registrations')->with(['event' => $event]);
     }
 
     public function export(Request $request, Event $event): BinaryFileResponse
diff --git a/src/Http/Controllers/RegistrationsApiController.php b/src/Http/Controllers/RegistrationsApiController.php
@@ -19,14 +19,13 @@ public function index(Request $request, Event $event): LengthAwarePaginator
     {
         $query = Registration::query()->selectFields()
             ->where('event_id', $event->id);
-        $data = QueryBuilder::for($query)
+
+        return QueryBuilder::for($query)
             ->allowedSorts(['created_at', 'first_name', 'last_name', 'email', 'locale', 'number_of_people', 'message'])
             ->allowedFilters([
                 AllowedFilter::custom('created_at,first_name,last_name,email,locale,number_of_people,message', new FilterRegistrations()),
             ])
             ->paginate($request->integer('per_page'));
-
-        return $data;
     }
 
     public function destroy(Event $event, Registration $registration): JsonResponse
diff --git a/src/Models/Event.php b/src/Models/Event.php
@@ -88,7 +88,7 @@ protected function casts(): array
 
     public function url(?string $locale = null): string
     {
-        $locale = $locale ?: app()->getLocale();
+        $locale ??= app()->getLocale();
         $route = $locale . '::event';
         $slug = $this->translate('slug', $locale) ?: null;
 
@@ -102,7 +102,7 @@ public function upcoming(?int $number = null): Collection
             ->published()
             ->where('end_date', '>=', date('Y-m-d'))
             ->orderBy('start_date');
-        if ($number) {
+        if ($number !== null && $number !== 0) {
             $query->take($number);
         }
 
@@ -116,7 +116,7 @@ public function past(?int $number = null): Collection
             ->published()
             ->where('end_date', '<', date('Y-m-d'))
             ->order();
-        if ($number) {
+        if ($number !== null && $number !== 0) {
             $query->take($number);
         }
 
@@ -126,11 +126,7 @@ public function past(?int $number = null): Collection
     public function adjacent(int $direction, mixed $model, ?int $category_id = null): ?Model
     {
         $currentModel = $model;
-        if ($currentModel->end_date < date('Y-m-d')) {
-            $models = $this->past();
-        } else {
-            $models = $this->upcoming();
-        }
+        $models = $currentModel->end_date < date('Y-m-d') ? $this->past() : $this->upcoming();
         foreach ($models as $key => $model) {
             if ($currentModel->id === $model->id) {
                 $adjacentKey = $key + $direction;
diff --git a/src/Providers/ModuleServiceProvider.php b/src/Providers/ModuleServiceProvider.php
@@ -37,7 +37,7 @@ public function boot(): void
         /*
          * Add the page in the view.
          */
-        View::composer('events::public.*', function ($view) {
+        View::composer('events::public.*', function ($view): void {
             $view->page = getPageLinkedToModule('events');
         });
     }
diff --git a/src/routes/events.php b/src/routes/events.php
@@ -1,5 +1,6 @@
 <?php
 
+use TypiCMS\Modules\Core\Models\Page;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Route;
 use TypiCMS\Modules\Events\Http\Controllers\AdminController;
@@ -11,16 +12,16 @@
 /*
  * Front office routes
  */
-if ($page = getPageLinkedToModule('events')) {
+if (($page = getPageLinkedToModule('events')) 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-events');
                 $router->get('past', [PublicController::class, 'past'])->name('past-events');
                 $router->get('{slug}', [PublicController::class, 'show'])->name('event');
                 $router->get('{slug}/ics', [PublicController::class, 'ics'])->name('event-ics');
-                $router->middleware('auth')->group(function (Router $router) {
+                $router->middleware('auth')->group(function (Router $router): void {
                     $router->get('{slug}/registration', [PublicController::class, 'showRegistrationForm'])->name('event-registration');
                     $router->post('{slug}/register', [PublicController::class, 'register'])->name('event-register');
                     $router->get('{slug}/registered', [PublicController::class, 'registered'])->name('event-registered');
@@ -33,7 +34,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('events', [AdminController::class, 'index'])->name('index-events')->middleware('can:read events');
     $router->get('events/export', [AdminController::class, 'export'])->name('export-events')->middleware('can:read events');
     $router->get('events/create', [AdminController::class, 'create'])->name('create-event')->middleware('can:create events');
@@ -51,7 +52,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('events', [ApiController::class, 'index'])->middleware('can:read events');
     $router->patch('events/{event}', [ApiController::class, 'updatePartial'])->middleware('can:update events');
     $router->post('events/{event}/duplicate', [ApiController::class, 'duplicate'])->middleware('can:create events');

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function create(): View`
`31`	`31`	`$model = new Event();`
`32`	`32`
`33`	`33`	`return view('events::admin.create')`
`34`		`- ->with(compact('model'));`
	`34`	`+ ->with(['model' => $model]);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public function edit(Event $event): View`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class RegistrationsAdminController extends BaseAdminController`
`18`	`18`	`{`
`19`	`19`	`public function index(Event $event): View`
`20`	`20`	`{`
`21`		`- return view('events::admin.registrations')->with(compact('event'));`
	`21`	`+ return view('events::admin.registrations')->with(['event' => $event]);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public function export(Request $request, Event $event): BinaryFileResponse`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function boot(): void`
`37`	`37`	`/*`
`38`	`38`	`* Add the page in the view.`
`39`	`39`	`*/`
`40`		`- View::composer('events::public.*', function ($view) {`
	`40`	`+ View::composer('events::public.*', function ($view): void {`
`41`	`41`	`$view->page = getPageLinkedToModule('events');`
`42`	`42`	`});`
`43`	`43`	`}`