Combine qs on either request or rule

midweste · Jul 1, 2020 · 685ea2b · 685ea2b
1 parent 3f111f7
commit 685ea2b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/RedirectController.php b/src/RedirectController.php
@@ -290,19 +290,26 @@ protected function mergeRuleIntoUri(RedirectRule $rule, RedirectUri $uri): Redir
         $uri = $uri
             ->withPath($destination->getPath())
             ->withStatusCode($rule->getHttpStatus());
-        if (!empty($uri->getQuery())) {
+
+        // default is combined querystring with rule overridding request
+        if (!empty($uri->getQuery()) || !empty($destination->getQuery())) {
             parse_str($destination->getQuery(), $destinationQs);
             parse_str($uri->getQuery(), $sourceQs);
             $combinedQs = \array_replace_recursive($sourceQs, $destinationQs);
             ksort($combinedQs);
             $uri = $uri->withQuery(\http_build_query($combinedQs));
         }
-        if (!empty($uri->getFragment())) {
-            $uri = $uri->withFragment($uri->getFragment());
+
+        // rule fragment overrides request fragment
+        if (!empty($destination->getFragment())) {
+            $uri = $uri->withFragment($destination->getFragment());
         }
+
+        // rule user info overrides request user info
         if (!empty($uri->getUserInfo())) {
             $uri = $uri->withUserInfo($uri->getUserInfo());
         }
+
         return $uri;
     }
 

diff --git a/tests/ControllerTest.php b/tests/ControllerTest.php
@@ -349,6 +349,21 @@ public function testTrailingSlash()
         $this->assertEquals($result->location, 'https://localhost/root/?new=querystring&query=string');
     }
 
+    public function testOnlyDestinationHasQs()
+    {
+        $rule = [
+            "id" => "1",
+            "source" => "/",
+            "type" => "path",
+            "destination" => "/root/?key=newvalue",
+            "httpStatus" => 302,
+            "active" => 1
+        ];
+        $result = $this->slimRedirect('https://localhost', [$rule]);
+        $this->assertEquals($rule['httpStatus'], $result->responseStatus);
+        $this->assertEquals($result->location, 'https://localhost/root/?key=newvalue');
+    }
+
     public function testCombinedQsOverwrite()
     {
         $rule = [