composer.json

@@ -59,7 +59,8 @@
         "optimize-autoloader": true,
         "allow-plugins": {
             "0.0.0/composer-include-files": true,
-            "kylekatarnls/update-helper": true
+            "kylekatarnls/update-helper": true,
+            "codezero/composer-preload-files": true
         }
     },
     "minimum-stability": "dev",

src/UrlGenerator.php

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

tests/Unit/UrlGeneratorTest.php

@@ -256,6 +256,25 @@ public function it_generates_a_signed_route_url_for_a_specific_locale()
         $this->get($tamperedUrl)->assertSee('Invalid Signature');
     }
 
+    /** @test */
+    public function it_throws_a_route_not_found_exception_for_missing_route_names_when_generating_a_route_url()
+    {
+        $this->expectException(InvalidArgumentException::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 (InvalidArgumentException $exception) {}
+
+        $this->assertEquals('en', App::getLocale());
+    }
     /** @test */
     public function it_allows_routes_to_be_cached()
     {