Properly restore locale after catching RouteNotFoundException (#88)

Partially fixes (#58)

Author: ivanvermeyen

src/Illuminate/Routing/UrlGenerator.php

@@ -32,11 +32,13 @@ public function route($name, $parameters = [], $absolute = true, $locale = null)
             App::setLocale($locale);
         }
 
-        $url = parent::route($resolvedName, $parameters, $absolute);
-
-        // Restore the current locale if needed.
-        if ($locale !== null && $locale !== $currentLocale) {
-            App::setLocale($currentLocale);
+        try {
+            $url = parent::route($resolvedName, $parameters, $absolute);
+        } finally {
+            // Restore the current locale if needed.
+            if ($locale !== null && $locale !== $currentLocale) {
+                App::setLocale($currentLocale);
+            }
         }
 
         return $url;
@@ -66,11 +68,13 @@ public function signedRoute($name, $parameters = [], $expiration = null, $absolu
             App::setLocale($locale);
         }
 
-        $url = parent::signedRoute($resolvedName, $parameters, $expiration, $absolute);
-
-        // Restore the current locale if needed.
-        if ($locale !== null && $locale !== $currentLocale) {
-            App::setLocale($currentLocale);
+        try {
+            $url = parent::signedRoute($resolvedName, $parameters, $expiration, $absolute);
+        } finally {
+            // Restore the current locale if needed.
+            if ($locale !== null && $locale !== $currentLocale) {
+                App::setLocale($currentLocale);
+            }
         }
 
         return $url;

src/LocalizedUrlGenerator.php

@@ -5,12 +5,12 @@
 use CodeZero\LocalizedRoutes\Facades\LocaleConfig;
 use CodeZero\UrlBuilder\UrlBuilder;
 use Illuminate\Support\Facades\URL;
-use InvalidArgumentException;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Contracts\Routing\UrlRoutable;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
 class LocalizedUrlGenerator
 {
@@ -118,7 +118,7 @@ protected function generateNamedRouteURL(string $locale, array $parameters = [],
     {
         try {
             return URL::route($this->route->getName(), $parameters, $absolute, $locale);
-        } catch (InvalidArgumentException $e) {
+        } catch (RouteNotFoundException $e) {
             return '';
         }
     }

tests/Unit/Illuminate/Routing/UrlGeneratorTest.php

@@ -340,6 +340,66 @@ public function it_generates_a_temporary_signed_route_url_for_a_specific_locale(
         $this->get($expiredUrl)->assertSee('Expired Signature');
     }
 
+    /** @test */
+    public function it_throws_a_route_not_found_exception_for_missing_route_names_when_generating_a_route_url()
+    {
+        $this->expectException(RouteNotFoundException::class);
+
+        URL::route('missing.route');
+    }
+
+    /** @test */
+    public function the_app_locale_is_correctly_restored_when_catching_a_route_not_found_exception_when_generating_a_route_url()
+    {
+        $this->setAppLocale('en');
+
+        try {
+            URL::route('missing.route', [], true, 'nl');
+        } catch (RouteNotFoundException $exception) {}
+
+        $this->assertEquals('en', App::getLocale());
+    }
+
+    /** @test */
+    public function it_throws_a_route_not_found_exception_for_missing_route_names_when_generating_a_signed_route_url()
+    {
+        $this->expectException(RouteNotFoundException::class);
+
+        URL::signedRoute('missing.route');
+    }
+
+    /** @test */
+    public function the_app_locale_is_correctly_restored_when_catching_a_route_not_found_exception_when_generating_a_signed_route_url()
+    {
+        $this->setAppLocale('en');
+
+        try {
+            URL::signedRoute('missing.route', [], null, true, 'nl');
+        } catch (RouteNotFoundException $exception) {}
+
+        $this->assertEquals('en', App::getLocale());
+    }
+
+    /** @test */
+    public function it_throws_a_route_not_found_exception_for_missing_route_names_when_generating_a_temporary_signed_route_url()
+    {
+        $this->expectException(RouteNotFoundException::class);
+
+        URL::temporarySignedRoute('missing.route', now()->addMinutes(30));
+    }
+
+    /** @test */
+    public function the_app_locale_is_correctly_restored_when_catching_a_route_not_found_exception_when_generating_a_temporary_signed_route_url()
+    {
+        $this->setAppLocale('en');
+
+        try {
+            URL::temporarySignedRoute('missing.route', now()->addMinutes(30), [], true, 'nl');
+        } catch (RouteNotFoundException $exception) {}
+
+        $this->assertEquals('en', App::getLocale());
+    }
+
     /** @test */
     public function it_allows_routes_to_be_cached()
     {