Add option to exclude query string from Route::localizedUrl()

Author: ivanvermeyen

src/LocalizedUrlGenerator.php

@@ -44,7 +44,7 @@ public function __construct()
      *
      * @return string
      */
-    public function generateFromRequest($locale = null, $parameters = null, $absolute = true)
+    public function generateFromRequest($locale = null, $parameters = null, $absolute = true, $keepQuery = true)
     {
         $urlBuilder = UrlBuilder::make(Request::fullUrl());
         $locale = $locale ?: $this->detectLocale($urlBuilder);
@@ -63,7 +63,7 @@ public function generateFromRequest($locale = null, $parameters = null, $absolut
             }
 
             if ($url = $this->generateFromNamedRoute($locale, $parameters, $absolute)) {
-                return empty($query) ? $url . $urlBuilder->getQueryString() : $url;
+                return empty($query) && $keepQuery ? $url . $urlBuilder->getQueryString() : $url;
             }
 
             $urlBuilder->setPath($this->replaceParameters($this->route->uri(), $slugs));
@@ -82,6 +82,10 @@ public function generateFromRequest($locale = null, $parameters = null, $absolut
             $urlBuilder->setHost($domain);
         }
 
+        if ($keepQuery === false) {
+            $urlBuilder->setQuery([]);
+        }
+
         return $urlBuilder->build($absolute);
     }
 

src/Macros/LocalizedUrlMacro.php

@@ -15,8 +15,8 @@ class LocalizedUrlMacro
      */
     public static function register()
     {
-        Route::macro('localizedUrl', function ($locale = null, $parameters = null, $absolute = true) {
-            return App::make(LocalizedUrlGenerator::class)->generateFromRequest($locale, $parameters, $absolute);
+        Route::macro('localizedUrl', function ($locale = null, $parameters = null, $absolute = true, $keepQuery = true) {
+            return App::make(LocalizedUrlGenerator::class)->generateFromRequest($locale, $parameters, $absolute, $keepQuery);
         });
     }
 }