Improve unregistered route handling in the UrlGenerator

Author: ivanvermeyen

src/UrlGenerator.php

@@ -41,10 +41,6 @@ public function route($name, $parameters = [], $absolute = true, $locale = null)
             return parent::route($name, $parameters, $absolute);
         }
 
-        // Normalize the route name by removing any locale prefix.
-        // We will prepend the applicable locale manually.
-        $name = $this->stripLocaleFromRouteName($name);
-
         // Cache the current locale so we can change it
         // to automatically resolve any translatable
         // route parameters such as slugs.
@@ -54,12 +50,27 @@ public function route($name, $parameters = [], $absolute = true, $locale = null)
         // as a prefix for the route name.
         $locale = $locale ?: $currentLocale;
 
+        // Normalize the route name by removing any locale prefix.
+        // We will prepend the applicable locale manually.
+        $baseName = $this->stripLocaleFromRouteName($name);
+
+        // If the route has a name (not just the locale prefix)
+        // add the requested locale prefix.
+        $newName = $baseName ? "{$locale}.{$baseName}" : '';
+
+        // If the new localized name does not exist, but the unprefixed route name does,
+        // someone might be calling "route($name, [], true, $locale)" on a non localized route.
+        // In that case, resolve the unprefixed route name.
+        if (Route::has($baseName) && ! Route::has($newName)) {
+            $newName = $baseName;
+        }
+
         // Update the current locale if needed.
         if ($locale !== $currentLocale) {
             App::setLocale($locale);
         }
 
-        $url = parent::route("{$locale}.{$name}", $parameters, $absolute);
+        $url = parent::route($newName, $parameters, $absolute);
 
         // Restore the current locale if needed.
         if ($locale !== $currentLocale) {

tests/Unit/UrlGeneratorTest.php

@@ -123,6 +123,18 @@ public function it_always_gets_the_url_of_a_localized_route_if_a_locale_is_speci
         $this->assertEquals(url('nl/route'), route('route.name', [], true, 'nl'));
     }
 
+    /** @test */
+    public function it_returns_a_registered_non_localized_url_if_a_localized_version_does_not_exist()
+    {
+        $this->setSupportedLocales(['en', 'nl']);
+        $this->setAppLocale('en');
+
+        $this->registerRoute('route', 'route.name');
+        $this->registerRoute('nl/route', 'nl.route.name');
+
+        $this->assertEquals(url('route'), route('route.name', [], true, 'en'));
+    }
+
     /** @test */
     public function it_throws_if_no_valid_route_can_be_found_for_the_given_locale()
     {
@@ -136,6 +148,19 @@ public function it_throws_if_no_valid_route_can_be_found_for_the_given_locale()
         route('en.route.name', [], true, 'nl');
     }
 
+    /** @test */
+    public function it_throws_if_you_do_not_specify_a_name_for_a_localized_route()
+    {
+        $this->setSupportedLocales(['en', 'nl']);
+        $this->setAppLocale('en');
+
+        $this->registerRoute('en/route', 'en.');
+
+        $this->expectException(InvalidArgumentException::class);
+
+        route('en.', [], true, 'en');
+    }
+
     /** @test */
     public function it_temporarily_changes_the_app_locale_when_generating_a_route_url()
     {