Merge pull request #11 from Laravel-Lang/1.x

Added helper for accessing parameter names

src/Concerns/KeyNames.php

@@ -5,12 +5,12 @@
 namespace LaravelLang\Routes\Concerns;
 
 use LaravelLang\Config\Data\Shared\RouteNameData;
-use LaravelLang\Config\Facades\Config;
+use LaravelLang\Routes\Helpers\Name;
 
 trait KeyNames
 {
     public function names(): RouteNameData
     {
-        return Config::shared()->routes->names;
+        return Name::all();
     }
 }

src/Helpers/Name.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace LaravelLang\Routes\Helpers;
+
+use LaravelLang\Config\Data\Shared\RouteNameData;
+use LaravelLang\Config\Facades\Config;
+
+class Name
+{
+    public static function all(): RouteNameData
+    {
+        return Config::shared()->routes->names;
+    }
+
+    public static function parameter(): string
+    {
+        return static::all()->parameter;
+    }
+
+    public static function header(): string
+    {
+        return static::all()->header;
+    }
+
+    public static function cookie(): string
+    {
+        return static::all()->cookie;
+    }
+
+    public static function session(): string
+    {
+        return static::all()->session;
+    }
+}

src/Middlewares/LocalizationByParameter.php

@@ -5,7 +5,6 @@
 namespace LaravelLang\Routes\Middlewares;
 
 use Illuminate\Http\Request;
-use LaravelLang\Config\Facades\Config;
 
 class LocalizationByParameter extends Middleware
 {
@@ -20,6 +19,6 @@ protected function detect(Request $request): bool|float|int|string|null
 
     protected function present(Request $request): bool
     {
-        return in_array(Config::shared()->routes->names->parameter, $request->route()->parameterNames(), true);
+        return in_array($this->names()->parameter, $request->route()->parameterNames(), true);
     }
 }

src/Middlewares/LocalizationByParameterWithRedirect.php

@@ -7,7 +7,6 @@
 use Closure;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use LaravelLang\Config\Facades\Config;
 use LaravelLang\Locales\Facades\Locales;
 use LaravelLang\Routes\Concerns\KeyNames;
 
@@ -47,7 +46,7 @@ protected function hasParameter(Request $request): bool
 
     protected function present(Request $request): bool
     {
-        return in_array(Config::shared()->routes->names->parameter, $request->route()->parameterNames(), true);
+        return in_array($this->names()->parameter, $request->route()->parameterNames(), true);
     }
 
     protected function parameters(Request $request): array

tests/Pest.php

@@ -4,4 +4,4 @@
 
 uses(Tests\TestCase::class)
     ->beforeEach(fn () => Event::fake())
-    ->in('Feature');
+    ->in('Feature', 'Unit');

tests/TestCase.php

@@ -30,7 +30,7 @@ protected function defineEnvironment($app): void
 
         $config->set('app.locale', LocaleValue::LocaleMain);
 
-        $config->set(Name::Shared->value . '.aliases', [
+        $config->set(Name::Shared() . '.aliases', [
             LocaleValue::LocaleAliasParent => LocaleValue::LocaleAlias,
         ]);
     }

tests/Unit/Helpers/NameTest.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+use LaravelLang\Config\Enums\Name as NameEnum;
+use LaravelLang\Routes\Helpers\Name;
+
+test('parameter', function () {
+    expect(Name::parameter())->toBe(
+        config(NameEnum::Shared() . '.routes.names.parameter')
+    );
+});
+
+test('header', function () {
+    expect(Name::header())->toBe(
+        config(NameEnum::Shared() . '.routes.names.header')
+    );
+});
+
+test('cookie', function () {
+    expect(Name::cookie())->toBe(
+        config(NameEnum::Shared() . '.routes.names.cookie')
+    );
+});
+
+test('session', function () {
+    expect(Name::session())->toBe(
+        config(NameEnum::Shared() . '.routes.names.session')
+    );
+});