Fix issue with generating localized URLs using custom domains

Author: ivanvermeyen

src/UrlGenerator.php

@@ -114,7 +114,7 @@ protected function stripLocaleFromRouteName($name)
             return $name;
         }
 
-        $locales = Config::get('localized-routes.supported-locales', []);
+        $locales = $this->getSupportedLocales();
 
         // If the first part of the route name is a valid
         // locale, then remove it from the array.
@@ -127,4 +127,21 @@ protected function stripLocaleFromRouteName($name)
 
         return $name;
     }
+
+    /**
+     * Get the supported locales and not the custom domains.
+     *
+     * @return array
+     */
+    protected function getSupportedLocales()
+    {
+        $locales = Config::get('localized-routes.supported-locales', []);
+        $keys = array_keys($locales);
+
+        if ( ! empty($locales) && is_numeric($keys[0])) {
+            return $locales;
+        }
+
+        return $keys;
+    }
 }

tests/Unit/UrlGeneratorTest.php

@@ -94,6 +94,23 @@ public function it_gets_the_url_of_a_route_in_the_given_locale()
         $this->assertEquals(url('nl/route'), route('nl.route.name', [], true, 'nl'));
     }
 
+    /** @test */
+    public function it_gets_the_url_of_a_route_in_the_given_locale_when_using_custom_domains()
+    {
+        $this->setSupportedLocales([
+            'en' => 'en.domain.test',
+            'nl' => 'nl.domain.test',
+        ]);
+        $this->setAppLocale('en');
+
+        $this->registerRoute('route', 'en.route.name')->domain('en.domain.test');
+        $this->registerRoute('route', 'nl.route.name')->domain('nl.domain.test');
+
+        $this->assertEquals('http://nl.domain.test/route', route('route.name', [], true, 'nl'));
+        $this->assertEquals('http://nl.domain.test/route', route('en.route.name', [], true, 'nl'));
+        $this->assertEquals('http://nl.domain.test/route', route('nl.route.name', [], true, 'nl'));
+    }
+
     /** @test */
     public function it_always_gets_the_url_of_a_localized_route_if_a_locale_is_specified()
     {
@@ -193,10 +210,10 @@ public function it_generates_a_signed_route_url_for_a_specific_locale()
      * @param string $name
      * @param \Closure|null $callback
      *
-     * @return void
+     * @return \Illuminate\Routing\Route
      */
     protected function registerRoute($url, $name, $callback = null)
     {
-        Route::name($name)->get($url, $callback ?: function () {});
+        return Route::name($name)->get($url, $callback ?: function () {});
     }
 }