Ignore query string when passed as parameters to route()

Author: ivanvermeyen

src/LocalizedUrlGenerator.php

@@ -63,7 +63,12 @@ public function generateFromRequest($locale = null, $parameters = null, $absolut
             }
 
             if ($url = $this->generateFromNamedRoute($locale, $parameters, $absolute)) {
-                return empty($query) && $keepQuery ? $url . $urlBuilder->getQueryString() : $url;
+                $url = empty($query) ? $url . $urlBuilder->getQueryString() : $url;
+                $startQueryString = strpos($url, '?');
+
+                return ($keepQuery === false && $startQueryString !== false)
+                    ? substr($url, 0, $startQueryString)
+                    : $url;
             }
 
             $urlBuilder->setPath($this->replaceParameters($this->route->uri(), $slugs));

tests/Unit/Macros/LocalizedUrlMacroTest.php

@@ -820,6 +820,32 @@ public function it_returns_a_url_with_query_string_for_existing_localized_named_
         ], $response->original);
     }
 
+    /** @test */
+    public function it_returns_a_url_without_query_string_for_existing_localized_named_routes()
+    {
+        $this->withoutExceptionHandling();
+        $this->setSupportedLocales(['en', 'nl']);
+        $this->setAppLocale('en');
+
+        Route::localized(function () {
+            Route::get('route', function () {
+                return [
+                    'current' => Route::localizedUrl(null, null, true, $keepQuery = false),
+                    'en' => Route::localizedUrl('en', null, true, $keepQuery = false),
+                    'nl' => Route::localizedUrl('nl', null, true, $keepQuery = false),
+                ];
+            })->name('route');
+        });
+
+        $response = $this->call('GET', '/nl/route?another=one&param=value');
+        $response->assertOk();
+        $this->assertEquals([
+            'current' => url('/nl/route'),
+            'en' => url('/en/route'),
+            'nl' => url('/nl/route'),
+        ], $response->original);
+    }
+
     /** @test */
     public function it_accepts_query_string_parameters_using_named_routes()
     {
@@ -843,6 +869,29 @@ public function it_accepts_query_string_parameters_using_named_routes()
         ], $response->original);
     }
 
+    /** @test */
+    public function it_ignores_query_string_parameters_using_named_routes()
+    {
+        $this->withoutExceptionHandling();
+        $this->setSupportedLocales(['en', 'nl']);
+
+        Route::get('route/{slug}/{optional?}', function () {
+            return [
+                'current' => Route::localizedUrl(null, ['another-slug', 'optional-slug', 'new' => 'value'], true, $keepQuery = false),
+                'en' => Route::localizedUrl('en', ['another-slug', 'optional-slug', 'new' => 'value'], true, $keepQuery = false),
+                'nl' => Route::localizedUrl('nl', ['another-slug', 'optional-slug', 'new' => 'value'], true, $keepQuery = false),
+            ];
+        })->name('route');
+
+        $response = $this->call('GET', '/route/some-slug?param=value');
+        $response->assertOk();
+        $this->assertEquals([
+            'current' => url('/route/another-slug/optional-slug'),
+            'en' => url('/route/another-slug/optional-slug'),
+            'nl' => url('/route/another-slug/optional-slug'),
+        ], $response->original);
+    }
+
     /** @test */
     public function it_accepts_query_string_parameters_using_unnamed_routes()
     {
@@ -866,6 +915,29 @@ public function it_accepts_query_string_parameters_using_unnamed_routes()
         ], $response->original);
     }
 
+    /** @test */
+    public function it_ignores_query_string_parameters_using_unnamed_routes()
+    {
+        $this->withoutExceptionHandling();
+        $this->setSupportedLocales(['en', 'nl']);
+
+        Route::get('route/{slug}/{optional?}', function () {
+            return [
+                'current' => Route::localizedUrl(null, ['another-slug', 'optional-slug', 'new' => 'value'], true, $keepQuery = false),
+                'en' => Route::localizedUrl('en', ['another-slug', 'optional-slug', 'new' => 'value'], true, $keepQuery = false),
+                'nl' => Route::localizedUrl('nl', ['another-slug', 'optional-slug', 'new' => 'value'], true, $keepQuery = false),
+            ];
+        });
+
+        $response = $this->call('GET', '/route/some-slug?param=value');
+        $response->assertOk();
+        $this->assertEquals([
+            'current' => url('/route/another-slug/optional-slug'),
+            'en' => url('/route/another-slug/optional-slug'),
+            'nl' => url('/route/another-slug/optional-slug'),
+        ], $response->original);
+    }
+
     /** @test */
     public function it_allows_optional_parameters_with_named_routes()
     {