chore: fix as many phpstan errors, put rest in baseline

daveroverts · Feb 25, 2025 · d00b37f · d00b37f
1 parent 6a34967
commit d00b37f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 30 deletions.
diff --git a/app/Http/Controllers/AirportLink/AirportLinkAdminController.php b/app/Http/Controllers/AirportLink/AirportLinkAdminController.php
@@ -30,7 +30,7 @@ public function index(): View
     public function create(): View
     {
         $airportLink = new AirportLink();
-        $airportLinkTypes = AirportLinkType::all(['id', 'name'])->pluck('name', 'id');
+        $airportLinkTypes = AirportLinkType::pluck('name', 'id');
         $airports = Airport::all(['id', 'icao', 'iata', 'name'])->keyBy('id')
             ->map(function ($airport) {
                 /** @var Airport $airport */
@@ -52,7 +52,7 @@ public function store(StoreAirportLink $request): RedirectResponse
 
     public function edit(AirportLink $airportLink): View
     {
-        $airportLinkTypes = AirportLinkType::all(['id', 'name'])->pluck('name', 'id');
+        $airportLinkTypes = AirportLinkType::pluck('name', 'id');
 
         return view('airportLink.admin.form', compact('airportLink', 'airportLinkTypes'));
     }

diff --git a/app/Http/Controllers/Event/EventAdminController.php b/app/Http/Controllers/Event/EventAdminController.php
@@ -43,7 +43,7 @@ public function create(): View
                 /** @var Airport $airport */
                 return "$airport->icao | $airport->name | $airport->iata";
             });
-        $eventTypes = EventType::all()->pluck('name', 'id');
+        $eventTypes = EventType::pluck('name', 'id');
         return view('event.admin.form', compact('event', 'airports', 'eventTypes'));
     }
 
@@ -87,7 +87,7 @@ public function edit(Event $event): View
                 /** @var Airport $airport */
                 return "$airport->icao | $airport->name | $airport->iata";
             });
-        $eventTypes = EventType::all()->pluck('name', 'id');
+        $eventTypes = EventType::pluck('name', 'id');
         return view('event.admin.form', compact('event', 'airports', 'eventTypes'));
     }
 

diff --git a/app/Http/Controllers/EventLink/EventLinkAdminController.php b/app/Http/Controllers/EventLink/EventLinkAdminController.php
@@ -27,10 +27,10 @@ public function index(): View
         return view('eventLink.admin.overview', compact('eventLinks'));
     }
 
-    public function create(Event $event): View
+    public function create(): View
     {
         $eventLink = new EventLink();
-        $eventLinkTypes = AirportLinkType::all(['id', 'name'])->pluck('name', 'id');
+        $eventLinkTypes = AirportLinkType::pluck('name', 'id');
         $events = Event::where('endEvent', '>', now())
             ->orderBy('startEvent')
             ->get(['id', 'name', 'startEvent'])
@@ -39,6 +39,7 @@ public function create(Event $event): View
                 /** @var Event $event */
                 return "$event->name [{$event->startEvent->format('d-m-Y')}]";
             });
+
         return view('eventLink.admin.form', compact('eventLink', 'eventLinkTypes', 'events'));
     }
 
@@ -55,7 +56,7 @@ public function store(StoreEventLink $request): RedirectResponse
 
     public function edit(EventLink $eventLink): View
     {
-        $eventLinkTypes = AirportLinkType::all(['id', 'name'])->pluck('name', 'id');
+        $eventLinkTypes = AirportLinkType::pluck('name', 'id');
         return view('eventLink.admin.form', compact('eventLink', 'eventLinkTypes'));
     }
 

diff --git a/app/View/Components/Forms/Inputs/Input.php b/app/View/Components/Forms/Inputs/Input.php
@@ -6,7 +6,7 @@
 
 class Input extends OriginalInput
 {
-    public function __construct(string $name, string $id = null, string $type = 'text', ?string $value = '')
+    public function __construct(string $name, ?string $id = null, string $type = 'text', ?string $value = '')
     {
         $this->name = $name;
         $this->id = $id ?? $name;

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,25 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Variable \\$events might not be defined\\.$#"
-			count: 1
-			path: app/Http/Controllers/EventLink/EventLinkAdminController.php
-
-		-
-			message: "#^Parameter \\#1 \\$key of function old expects string\\|null, false given\\.$#"
-			count: 4
-			path: app/Http/Controllers/Faq/FaqAdminController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between 'is_online' and 0 will always evaluate to false\\.$#"
-			count: 2
-			path: app/Http/Controllers/Faq/FaqAdminController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between 'is_online' and 1 will always evaluate to false\\.$#"
-			count: 2
-			path: app/Http/Controllers/Faq/FaqAdminController.php
-
 		-
 			message: "#^Method App\\\\Http\\\\Controllers\\\\OAuthController\\:\\:updateToken\\(\\) should return League\\\\OAuth2\\\\Client\\\\Token\\\\AccessToken\\|null but returns League\\\\OAuth2\\\\Client\\\\Token\\\\AccessTokenInterface\\.$#"
 			count: 1

diff --git a/resources/views/faq/admin/form.blade.php b/resources/views/faq/admin/form.blade.php
@@ -32,8 +32,8 @@
 
                             <x-forms.form-group name="is_online" :label="__('Is online')" inline>
 
-                                <x-forms.radio inline name="is_online" value="0" :label="__('No')" required :should-be-checked="old('is_online' === 0, !$faq->is_online )" />
-                                <x-forms.radio inline name="is_online" value="1" :label="__('Yes')" required :should-be-checked="old('is_online' === 1, $faq->is_online )" />
+                                <x-forms.radio inline name="is_online" value="0" :label="__('No')" required :should-be-checked="old('is_online' === false, !$faq->is_online )" />
+                                <x-forms.radio inline name="is_online" value="1" :label="__('Yes')" required :should-be-checked="old('is_online' === true, $faq->is_online )" />
 
                             </x-forms.form-group>