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

Replaced the UrlGenerator override with the `localizedRoute` method

Author: andrey-helldar

composer.json

@@ -47,7 +47,10 @@
     "autoload": {
         "psr-4": {
             "LaravelLang\\Routes\\": "src/"
-        }
+        },
+        "files": [
+            "helpers/functions.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {

helpers/functions.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Str;
+use LaravelLang\Config\Facades\Config;
+
+if (! function_exists('localizedRoute')) {
+    function localizedRoute(string $route, array $parameters = [], bool $absolute = true): string
+    {
+        $locale = Config::shared()->routes->names->parameter;
+        $prefix = Config::shared()->routes->namePrefix;
+
+        $name = Str::start($route, $prefix);
+
+        if (! Route::has($name)) {
+            return route($route, $parameters, $absolute);
+        }
+
+        return route($name, array_merge([
+            $locale => app()->getLocale(),
+        ], $parameters), $absolute);
+    }
+}

ide.json

@@ -0,0 +1,18 @@
+{
+    "$schema": "https://laravel-ide.com/schema/laravel-ide-v2.json",
+    "completions": [
+        {
+            "complete": "routeName",
+            "condition": [
+                {
+                    "functionNames": [
+                        "localizedRoute"
+                    ],
+                    "parameters": [
+                        1
+                    ]
+                }
+            ]
+        }
+    ]
+}

src/ServiceProvider.php

@@ -5,43 +5,19 @@
 namespace LaravelLang\Routes;
 
 use Closure;
-use Illuminate\Foundation\Application;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
 use LaravelLang\Routes\Facades\LocalizationRoute;
-use LaravelLang\Routes\Services\UrlGenerator;
 
 class ServiceProvider extends BaseServiceProvider
 {
     public function boot(): void
     {
         $this->registerGroup();
-        $this->urlGenerator();
     }
 
     protected function registerGroup(): void
     {
         Route::macro('localizedGroup', fn (Closure $callback) => LocalizationRoute::group($callback));
     }
-
-    protected function urlGenerator(): void
-    {
-        $this->app->singleton('url', function ($app) {
-            $routes = $app['router']->getRoutes();
-
-            $app->instance('routes', $routes);
-
-            return new UrlGenerator(
-                $routes,
-                $app->rebinding('request', $this->requestRebinder()),
-                $app['config']['app.asset_url']
-            );
-        });
-    }
-
-    protected function requestRebinder(): Closure
-    {
-        return fn (Application $app, Request $request) => $app['url']->setRequest($request);
-    }
 }

src/Services/UrlGenerator.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+use LaravelLang\Config\Facades\Config;
+use Tests\Constants\LocaleValue;
+
+test('route groups', function () {
+    $name     = Config::shared()->routes->namePrefix;
+    $locale   = LocaleValue::LocaleMain;
+    $fallback = LocaleValue::LocaleAliasParent;
+
+    expect(localizedRoute($name . 'via.group.facade', ['foo' => 'bar']))
+        ->toEndWith("localhost/$locale/group/facade/bar");
+
+    expect(localizedRoute($name . 'via.group.macro', ['foo' => 'bar', 'locale' => $fallback]))
+        ->toEndWith("localhost/$fallback/group/macro/bar");
+
+    expect(localizedRoute('via.group.facade', ['foo' => 'bar']))
+        ->toEndWith("localhost/$locale/group/facade/bar");
+
+    expect(localizedRoute('via.group.macro', ['foo' => 'bar', 'locale' => $fallback]))
+        ->toEndWith("localhost/$fallback/group/macro/bar");
+});
+
+test('routes without groups', function () {
+    expect(localizedRoute('via.model.default', ['foo' => 'bar']))
+        ->toEndWith('localhost/model/default/bar');
+});