Merge pull request #579 from cboucaut/fix-php81-deprecated

php 8.1 : Fix deprecated

Author: dbu

src/EventListener/CacheControlListener.php

@@ -201,7 +201,7 @@ private function setCache(Response $response, array $directives, $overwrite)
             return;
         }
 
-        if (false !== strpos($response->headers->get('Cache-Control'), 'no-cache')) {
+        if (false !== strpos($response->headers->get('Cache-Control', ''), 'no-cache')) {
             // this single header is set by default. if its the only thing, we override it.
             $response->setCache($directives);
 

src/Http/RequestMatcher/QuerystringRequestMatcher.php

@@ -45,6 +45,6 @@ public function matches(Request $request): bool
             return true;
         }
 
-        return (bool) preg_match('{'.$this->queryString.'}', rawurldecode($request->getQueryString()));
+        return (bool) preg_match('{'.$this->queryString.'}', rawurldecode($request->getQueryString() ?: ''));
     }
 }

tests/Unit/Http/RequestMatcher/QuerystringRequestMatcherTest.php

@@ -50,4 +50,13 @@ public function testMatchesReturnsFalseIfQueryStringDoesntMatch()
 
         $this->assertFalse($requestMatcher->matches($request));
     }
+
+    public function testMatchesReturnsFalseIfQueryStringIsEmpty()
+    {
+        $requestMatcher = new QuerystringRequestMatcher();
+        $requestMatcher->setQueryString('(^|&)mytoken=');
+        $request = Request::create('http://localhost/bar');
+
+        $this->assertFalse($requestMatcher->matches($request));
+    }
 }