Merge pull request #26 from Laravel-Lang/andrey-helldar-patch-1

The list of middlewares of the route group is moved to config

Author: andrey-helldar

composer.json

@@ -33,7 +33,7 @@
         "illuminate/http": "^10.0 || ^11.0 || ^12.0",
         "illuminate/routing": "^10.0 || ^11.0 || ^12.0",
         "illuminate/support": "^10.0 || ^11.0 || ^12.0",
-        "laravel-lang/config": "^1.12",
+        "laravel-lang/config": "^1.13",
         "laravel-lang/locales": "^2.10"
     },
     "require-dev": {

src/Events/LocaleHasBeenSetEvent.php

@@ -16,6 +16,5 @@ class LocaleHasBeenSetEvent
 
     public function __construct(
         public LocaleData $locale
-    ) {
-    }
+    ) {}
 }

src/Middlewares/LocalizationByModel.php

@@ -11,8 +11,7 @@ class LocalizationByModel extends Middleware
 {
     public function __construct(
         protected ?string $guard = null,
-    ) {
-    }
+    ) {}
 
     protected function detect(Request $request): bool|float|int|string|null
     {

src/Services/Route.php

@@ -6,35 +6,33 @@
 
 use Closure;
 use Illuminate\Support\Facades\Route as BaseRoute;
+use LaravelLang\Config\Facades\Config;
 use LaravelLang\Routes\Concerns\RouteParameters;
 use LaravelLang\Routes\Helpers\Route as RouteName;
-use LaravelLang\Routes\Middlewares\LocalizationByCookie;
-use LaravelLang\Routes\Middlewares\LocalizationByHeader;
-use LaravelLang\Routes\Middlewares\LocalizationByModel;
-use LaravelLang\Routes\Middlewares\LocalizationByParameterPrefix;
-use LaravelLang\Routes\Middlewares\LocalizationBySession;
 
 class Route
 {
     use RouteParameters;
 
     public function group(Closure $callback): void
     {
-        BaseRoute::middleware([
-            LocalizationByCookie::class,
-            LocalizationByHeader::class,
-            LocalizationBySession::class,
-            LocalizationByModel::class,
-        ])->group($callback);
+        $this->defaultGroup($callback);
+        $this->prefixedGroup($callback);
+    }
 
+    protected function defaultGroup(Closure $callback): void
+    {
+        BaseRoute::middleware(
+            Config::shared()->routes->group->middleware->default
+        )->group($callback);
+    }
+
+    protected function prefixedGroup(Closure $callback): void
+    {
         BaseRoute::prefix('{' . $this->names()->parameter . '}')
             ->name(RouteName::prefix())
-            ->middleware([
-                LocalizationByParameterPrefix::class,
-                LocalizationByCookie::class,
-                LocalizationByHeader::class,
-                LocalizationBySession::class,
-                LocalizationByModel::class,
-            ])->group($callback);
+            ->middleware(
+                Config::shared()->routes->group->middleware->prefix
+            )->group($callback);
     }
 }

tests/Constants/LocaleValue.php

@@ -6,10 +6,10 @@
 
 class LocaleValue
 {
-    public const LocaleAlias = 'de-DE';
+    public const LocaleAlias       = 'de-DE';
     public const LocaleAliasParent = 'de';
-    public const LocaleMain = 'fr';
+    public const LocaleMain        = 'fr';
     public const TranslationFrench = 'Toutes les données ont été chargées.';
     public const TranslationGerman = 'Alle Ressourcen geladen.';
-    public const TranslationKey = 'Foo';
+    public const TranslationKey    = 'Foo';
 }

tests/Pest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Illuminate\Support\Facades\Event;
 

tests/TestCase.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Tests;
 
 use Closure;

tests/Unit/Helpers/LocalizedRouteTest.php

@@ -6,8 +6,8 @@
 use Tests\Constants\LocaleValue;
 
 test('route groups', function () {
-    $name = Config::shared()->routes->namePrefix;
-    $locale = LocaleValue::LocaleMain;
+    $name     = Config::shared()->routes->namePrefix;
+    $locale   = LocaleValue::LocaleMain;
     $fallback = LocaleValue::LocaleAliasParent;
 
     expect(localizedRoute($name . 'via.group.facade', ['foo' => 'bar']))

tests/database/migrations/2024_06_20_000000_create_users_table.php

@@ -6,8 +6,7 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class extends Migration {
     public function up(): void
     {
         Schema::create('users', function (Blueprint $table) {