Normalize query string parameters before hashing (#426)

* Normalize query string parameters * removes duplicate method * Update DefaultHasher.php Co-authored-by: Freek Van der Herten <[email protected]>
spatie · Jan 23, 2023 · 263761a · 263761a
1 parent eb1abe8
commit 263761a
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/Hasher/DefaultHasher.php b/src/Hasher/DefaultHasher.php
@@ -18,10 +18,19 @@ public function getHashFor(Request $request): string
         $cacheNameSuffix = $this->getCacheNameSuffix($request);
 
         return 'responsecache-' . md5(
-            "{$request->getHost()}-{$request->getRequestUri()}-{$request->getMethod()}/$cacheNameSuffix"
+            "{$request->getHost()}-{$this->getNormalizedRequestUri($request)}-{$request->getMethod()}/$cacheNameSuffix"
         );
     }
 
+    protected function getNormalizedRequestUri(Request $request): string
+    {
+        if ($queryString =  $request->getQueryString()) {
+            $queryString = '?'.$queryString;
+        }
+
+        return $request->getBaseUrl().$request->getPathInfo().$queryString;
+    }
+
     protected function getCacheNameSuffix(Request $request)
     {
         if ($request->attributes->has('responsecache.cacheNameSuffix')) {