Fix types on level 8

vormkracht10 · Aug 23, 2024 · 7dc3aab · 7dc3aab
1 parent 462854d
commit 7dc3aab
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 17 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,7 +2,7 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 7
+    level: 8
     paths:
         - src
         - config

diff --git a/src/Enums/TwoFactorType.php b/src/Enums/TwoFactorType.php
@@ -16,7 +16,7 @@ enum TwoFactorType: string implements HasLabel
     /**
      * Get the values of the enum.
      *
-     * @return array<string>
+     * @return array<int, string|null>
      */
     public static function values(): array
     {

diff --git a/src/Http/Livewire/Auth/Login.php b/src/Http/Livewire/Auth/Login.php
@@ -76,7 +76,7 @@ protected function getFormSchema(): array
 
     public function loginWithFortify(): LoginResponse|Redirector|null
     {
-        session()->put('panel', Filament::getCurrentPanel()->getId());
+        session()->put('panel', Filament::getCurrentPanel()?->getId() ?? null);
 
         try {
             $this->rateLimit(5);
@@ -110,6 +110,12 @@ public function loginWithFortify(): LoginResponse|Redirector|null
 
             $user = Filament::auth()->user();
 
+            if (! Filament::getCurrentPanel()) {
+                Filament::auth()->logout();
+
+                throw new \Exception('Current panel is not set.');
+            }
+
             if (
                 ($user instanceof FilamentUser) &&
                 (! $user->canAccessPanel(Filament::getCurrentPanel()))

diff --git a/src/Http/Livewire/Auth/PasswordReset.php b/src/Http/Livewire/Auth/PasswordReset.php
@@ -26,7 +26,7 @@ class PasswordReset extends Page implements HasForms
     public function mount(): void
     {
         if (Filament::auth()->check()) {
-            redirect()->intended(Filament::getCurrentPanel()->getUrl());
+            redirect()->intended(Filament::getCurrentPanel()?->getUrl() ?? config('fortify.home'));
         }
 
         if (session('status')) {
@@ -66,10 +66,10 @@ protected function getFormSchema(): array
                 ->required(),
             Hidden::make('email')
                 ->extraAttributes(['name' => 'email'])
-                ->afterStateHydrated(fn ($component) => $component->state(request()->get('email'))),
+                ->afterStateHydrated(fn($component) => $component->state(request()->get('email'))),
             Hidden::make('token')
                 ->extraAttributes(['name' => 'token'])
-                ->afterStateHydrated(fn ($component) => $component->state(request()->route('token'))),
+                ->afterStateHydrated(fn($component) => $component->state(request()->route('token'))),
         ];
     }
 
@@ -82,4 +82,4 @@ public function render(): View
                 ...$this->getLayoutData(),
             ]);
     }
-}
+}
diff --git a/src/Http/Livewire/Auth/RequestPasswordReset.php b/src/Http/Livewire/Auth/RequestPasswordReset.php
@@ -21,7 +21,7 @@ class RequestPasswordReset extends Page implements HasForms
     public function mount(): void
     {
         if (Filament::auth()->check()) {
-            redirect()->intended(Filament::getCurrentPanel()->getUrl());
+            redirect()->intended(Filament::getCurrentPanel()?->getUrl() ?? config('fortify.home'));
         }
 
         if (session('status')) {
@@ -60,4 +60,4 @@ public function render(): View
                 ...$this->getLayoutData(),
             ]);
     }
-}
+}
diff --git a/src/Http/Responses/LoginResponse.php b/src/Http/Responses/LoginResponse.php
@@ -17,6 +17,6 @@ public function toResponse($request)
     {
         return $request->wantsJson()
             ? response()->json(['two_factor' => false])
-            : redirect()->intended(Filament::getCurrentPanel()->getUrl());
+            : redirect()->intended(Filament::getCurrentPanel()?->getUrl() ?? config('fortify.home'));
     }
-}
+}
diff --git a/src/Http/Responses/TwoFactorChallengeViewResponse.php b/src/Http/Responses/TwoFactorChallengeViewResponse.php
@@ -15,6 +15,6 @@ class TwoFactorChallengeViewResponse implements LoginResponseContract
      */
     public function toResponse($request)
     {
-        return redirect()->intended(Filament::getCurrentPanel()->getUrl());
+        return redirect()->intended(Filament::getCurrentPanel()?->getUrl() ?? config('fortify.home'));
     }
-}
+}
diff --git a/src/Traits/EnumArraySerializableTrait.php b/src/Traits/EnumArraySerializableTrait.php
@@ -14,6 +14,10 @@ trait EnumArraySerializableTrait
      */
     public static function array(): array
     {
-        return array_combine(static::names(), static::values());
+        $names = static::names();
+
+        $values = array_filter(static::values(), fn($value) => $value !== null);
+
+        return array_combine($names, $values);
     }
 }
diff --git a/src/TwoFactorAuthServiceProvider.php b/src/TwoFactorAuthServiceProvider.php
@@ -128,7 +128,7 @@ public function packageBooted(): void
                  * This route name is used multiple places in filament.
                  */
                 Route::prefix(config('filament.path'))->group(function () {
-                    Route::get('/filament-login', fn () => Redirect::route('login'))
+                    Route::get('/filament-login', fn() => Redirect::route('login'))
                         ->name('auth.login');
                 });
             });
@@ -214,7 +214,7 @@ protected function registerContractsAndComponents(): void
         $this->app->singleton(TwoFactorChallengeViewResponse::class, TwoFactorChallengeViewResponse::class);
     }
 
-    protected function getAssetPackageName(): ?string
+    protected function getAssetPackageName(): string
     {
         return 'vormkracht10/filament-two-factor-auth';
     }
@@ -274,4 +274,4 @@ protected function getMigrations(): array
             'add_two_factor_type_column_to_users_table',
         ];
     }
-}
+}