Merge pull request #11 from sheridans/hotfix/reuse_query_params_default

hotfix/reuse_query_params_default
mezzio · Apr 21, 2021 · c9120ed · c9120ed
2 parents 3ceaaa5 + 92129ac
commit c9120ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/UrlHelper.php b/src/UrlHelper.php
@@ -108,7 +108,7 @@ public function __invoke(
             $routeParams = $this->mergeParams($routeName, $result, $routeParams);
         }
 
-        $reuseQueryParams = ! isset($options['reuse_query_params']) || (bool) $options['reuse_query_params'];
+        $reuseQueryParams = isset($options['reuse_query_params']) ? (bool) $options['reuse_query_params'] : false;
 
         if ($result && $reuseQueryParams) {
             // Merge current request params with passed query params

diff --git a/test/UrlHelperTest.php b/test/UrlHelperTest.php
@@ -443,7 +443,7 @@ public function testWillReuseQueryParamsIfReuseQueryParamsFlagIsTrueWhenGenerati
         $this->assertEquals('URL?foo=bar', $helper('resource', [], [], null, ['reuse_query_params' => true]));
     }
 
-    public function testWillReuseQueryParamsIfReuseQueryParamsFlagIsMissingGeneratingUri()
+    public function testWillNotReuseQueryParamsIfReuseQueryParamsFlagIsMissingGeneratingUri()
     {
         $result = $this->prophesize(RouteResult::class);
         $result->isFailure()->willReturn(false);
@@ -459,7 +459,7 @@ public function testWillReuseQueryParamsIfReuseQueryParamsFlagIsMissingGeneratin
         $helper->setRouteResult($result->reveal());
         $helper->setRequest($request->reveal());
 
-        $this->assertEquals('URL?foo=bar', $helper('resource'));
+        $this->assertEquals('URL', $helper('resource'));
     }
 
     public function testCanOverrideRequestQueryParams()