Return the correct URL when not passing a locale to Route::localizedUrl()

Author: ivanvermeyen

src/LocalizedUrlGenerator.php

@@ -105,8 +105,16 @@ protected function routeExists()
      */
     protected function generateFromUrl($locale = null, $parameters = null, $absolute = true)
     {
-        $locale = $locale ?: App::getLocale();
         $currentUrl = Request::fullUrl();
+
+        // If its a default 404 (no route exists)
+        // and there is no specific locale requested
+        // return the current URL.
+        if ( ! $this->routeExists() && $locale === null) {
+            return $currentUrl;
+        }
+
+        $locale = $locale ?: App::getLocale();
         $urlParts = parse_url($currentUrl);
         $domains = $this->getCustomDomains();
 

tests/Stubs/views/errors/404.blade.php

@@ -1 +1 @@
-{{ App::getLocale() }}
+{{ $response ?? App::getLocale() }}

tests/Unit/Macros/LocalizedUrlMacroTest.php

@@ -298,6 +298,23 @@ public function the_macro_does_not_blow_up_on_a_default_404_error()
         $response->assertResponseHasNoView();
     }
 
+    /** @test */
+    public function a_404_receives_the_correct_localized_url_from_a_view_composer()
+    {
+        $this->setSupportedLocales(['en', 'nl']);
+        $this->setAppLocale('en');
+        $this->setCustomErrorViewPath();
+
+        View::composer('*', function ($view) {
+            $view->with('response', Route::localizedUrl());
+        });
+
+        $response = $this->get('/nl/route/does/not/exist');
+        $response->assertNotFound();
+        $response->assertResponseHasNoView();
+        $this->assertEquals(url('/nl/route/does/not/exist'), trim($response->original));
+    }
+
     /** @test */
     public function a_404_is_not_localized_when_triggered_by_a_non_existing_route()
     {