prevent duplicate keys in destination's query parameters (#202)

Author: faltjo

src/Http/Middleware/HandleNotFound.php

@@ -154,11 +154,13 @@ public function mergeQuery(Request $request, string $destination): string
         if (isset($destination_parsed['query'])) {
             parse_str($destination_parsed['query'], $destination_query);
         }
+        // in case of duplicate keys, the destination ones take precedence
+        $query = array_merge($request->query(), $destination_query);
 
-        $query = array_merge($destination_query, $request->query());
+        ksort($query);
 
         if (count($query)) {
-            $destination .= '?' . http_build_query($query);
+            $destination = $destination_parsed['path'] . '?' . http_build_query($query);
         }
 
         return $destination;

tests/Feature/Middleware/HandleNotFoundTest.php

@@ -148,7 +148,7 @@ public function it_redirects_and_sets_handled_if_a_redirect_is_found_with_eloque
         $this->assertTrue($response->isRedirect(url($result)));
     }
 
-    public function provideRedirects(): array
+    public static function provideRedirects(): array
     {
         return [
             ['/abc', '/def', '/abc', '/def'],
@@ -211,6 +211,9 @@ public function it_handles_query_parameters()
         $this->assertTrue($response->isRedirect(url('/fr')));
     }
 
+    /**
+     * @test
+     */
     public function it_can_preserve_query_strings()
     {
         config()->set('statamic.redirect.preserve_query_strings', true);
@@ -238,27 +241,27 @@ public function it_can_preserve_query_strings()
         $this->assertTrue($response->isRedirect(url('/fr?lang=fr')));
     }
 
+    /**
+     * @test
+     */
     public function it_merges_query_strings()
     {
         config()->set('statamic.redirect.preserve_query_strings', true);
 
-        Redirect::make()
-            ->source('/abc')
-            ->destination('/nl')
-            ->save();
-
         Redirect::make()
             ->source('/abc?another=value')
-            ->destination('/fr')
+            ->destination('/fr?lang=fr')
             ->save();
 
-        $response = $this->middleware->handle(Request::create('/abc', 'GET', ['lang' => 'nl']), function () {
+        $response = $this->middleware->handle(Request::create('/abc', 'GET', ['another' => 'value']), function () {
             return (new Response('', 404));
         });
 
-        $this->assertTrue($response->isRedirect(url('/nl?lang=nl&another=value')));
+        $this->assertTrue($response->isRedirect(url('/fr?another=value&lang=fr')));
     }
 
+
+
     /**
      * @test
      */