Clean up code

Author: bramr94

src/FilamentDeveloperLoginsServiceProvider.php

@@ -4,8 +4,8 @@
 
 use DutchCodingCompany\FilamentDeveloperLogins\Livewire\MenuLogins;
 use DutchCodingCompany\FilamentDeveloperLogins\View\Components\DeveloperLogins;
-use Filament\Panel;
 use Filament\Facades\Filament;
+use Filament\Panel;
 use Filament\Support\Concerns\EvaluatesClosures;
 use Filament\Support\Facades\FilamentView;
 use Filament\View\PanelsRenderHook;
@@ -45,20 +45,17 @@ public function packageBooted(): void
 
     protected static function registerRenderHooks(): void
     {
-        $panel = Filament::getCurrentPanel();
-
-        if(! self::enabledForPanel($panel)) {
-            return;
-        }
-
-        /** @var FilamentDeveloperLoginsPlugin $plugin */
-        $plugin = $panel->getPlugin('filament-developer-logins');
-
         FilamentView::registerRenderHook(
             PanelsRenderHook::AUTH_LOGIN_FORM_AFTER,
-            static function () use ($plugin) : ?string {
+            static function (): ?string {
+                $panel = Filament::getCurrentPanel();
+                if (! self::panelHasPlugin($panel)) {
+                    return null;
+                }
 
-                if (! $plugin->getEnabled() || ! self::enabledForPanel(Filament::getCurrentPanel())) {
+                /** @var FilamentDeveloperLoginsPlugin $plugin */
+                $plugin = $panel->getPlugin('filament-developer-logins');
+                if (! $plugin->getEnabled()) {
                     return null;
                 }
 
@@ -68,8 +65,15 @@ static function () use ($plugin) : ?string {
 
         FilamentView::registerRenderHook(
             PanelsRenderHook::GLOBAL_SEARCH_AFTER,
-            static function () use ($plugin) : ?string {
-                if (! $plugin->getEnabled() || ! $plugin->getSwitchable() || ! self::enabledForPanel(Filament::getCurrentPanel())) {
+            static function (): ?string {
+                $panel = Filament::getCurrentPanel();
+                if (! self::panelHasPlugin($panel)) {
+                    return null;
+                }
+
+                /** @var FilamentDeveloperLoginsPlugin $plugin */
+                $plugin = $panel->getPlugin('filament-developer-logins');
+                if (! $plugin->getEnabled() || ! $plugin->getSwitchable()) {
                     return null;
                 }
 
@@ -78,7 +82,7 @@ static function () use ($plugin) : ?string {
         );
     }
 
-    protected static function enabledForPanel(?Panel $panel)
+    protected static function panelHasPlugin(?Panel $panel): bool
     {
         return ! is_null($panel) && $panel->hasPlugin('filament-developer-logins');
     }

tests/Feature/MenuLoginsTest.php

@@ -84,36 +84,16 @@ public function test_forbidden_is_returned_when_enabled_or_switchable_is_false()
 
     public function test_component_is_only_rendered_in_panel_with_plugin(): void
     {
-
         $user = TestUser::factory()->create();
 
         $this->actingAs($user)
             ->get(Dashboard::getUrl(panel: $this->panelName))
             ->assertSuccessful()
             ->assertSeeLivewire(MenuLogins::class);
 
-
         $this->actingAs($user)
-            ->get(Dashboard::getUrl(panel: $this->panelName . '-other' ))
+            ->get(Dashboard::getUrl(panel: $this->panelName.'-other'))
             ->assertSuccessful()
             ->assertDontSeeLivewire(MenuLogins::class);
     }
-
-    protected function registerTestPanel(): void
-    {
-        parent::registerTestPanel();
-        Filament::registerPanel(fn() => Panel::make()
-            ->darkMode(false)
-            ->id($this->panelName . '-other')
-            ->path($this->panelName  . '-other')
-            ->login()
-            ->pages([
-                Dashboard::class,
-            ])
-            ->plugins([
-            ]),
-        );
-    }
-
-
 }

tests/TestCase.php

@@ -36,7 +36,7 @@ protected function setUp(): void
         );
     }
 
-    protected function registerTestPanel(): void
+    protected function registerTestPanels(): void
     {
         Filament::registerPanel(
             fn (): Panel => Panel::make()
@@ -57,6 +57,18 @@ protected function registerTestPanel(): void
                         ->modelClass(TestUser::class),
                 ]),
         );
+
+        Filament::registerPanel(fn () => Panel::make()
+            ->darkMode(false)
+            ->id($this->panelName.'-other')
+            ->path($this->panelName.'-other')
+            ->login()
+            ->pages([
+                Dashboard::class,
+            ])
+            ->plugins([
+            ]),
+        );
     }
 
     protected function defineRoutes($router): void
@@ -80,7 +92,7 @@ protected function getEnvironmentSetUp($app): void
 
     protected function getPackageProviders($app): array
     {
-        $this->registerTestPanel();
+        $this->registerTestPanels();
 
         return [
             FilamentServiceProvider::class,