Merge pull request #14 from medeiroz/fix/register-middleware

fix register-middleware
bezhanSalleh · Nov 26, 2022 · 8ed1c5d · 8ed1c5d
2 parents 4e651a8 + 84b2126
commit 8ed1c5d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/FilamentLanguageSwitch.php b/src/FilamentLanguageSwitch.php
@@ -17,7 +17,6 @@ public static function boot(): void
         $self = new static();
         $self->configure();
         $self->injectComponent();
-        $self->registerSwitchLanguageMiddleware();
     }
 
     public function injectComponent(): void
@@ -28,15 +27,4 @@ public function injectComponent(): void
             fn (): string => Blade::render("@livewire('switch-filament-language')")
         );
     }
-
-    public function registerSwitchLanguageMiddleware(): void
-    {
-        if (! array_key_exists(
-            $key = SwitchLanguageLocale::class,
-            $filamentMiddlewares = config('filament.middleware.base')
-        )) {
-            $filamentMiddlewares[] = $key;
-            config(['filament.middleware.base' => $filamentMiddlewares]);
-        }
-    }
 }
diff --git a/src/FilamentLanguageSwitchServiceProvider.php b/src/FilamentLanguageSwitchServiceProvider.php
@@ -2,6 +2,7 @@
 
 namespace BezhanSalleh\FilamentLanguageSwitch;
 
+use BezhanSalleh\FilamentLanguageSwitch\Http\Middleware\SwitchLanguageLocale;
 use Filament\Facades\Filament;
 use Filament\PluginServiceProvider;
 use Spatie\LaravelPackageTools\Package;
@@ -24,6 +25,18 @@ public function configurePackage(Package $package): void
 
     public function packageBooted(): void
     {
+        $this->registerSwitchLanguageMiddleware();
         Filament::serving(fn () => FilamentLanguageSwitch::boot());
     }
+
+    public function registerSwitchLanguageMiddleware(): void
+    {
+        if (! array_key_exists(
+            $key = SwitchLanguageLocale::class,
+            $filamentMiddlewares = config('filament.middleware.base')
+        )) {
+            $filamentMiddlewares[] = $key;
+            config(['filament.middleware.base' => $filamentMiddlewares]);
+        }
+    }
 }