Merge pull request #551 from FriendsOfSymfony/sf7

compatibility with symfony 7

Author: dbu

composer.json

@@ -40,8 +40,7 @@
         "symfony/phpunit-bridge": "^5.0 || ^6.0"
     },
     "conflict": {
-        "toflar/psr6-symfony-http-cache-store": "<2.2.1",
-        "symfony/http-foundation": ">=7"
+        "toflar/psr6-symfony-http-cache-store": "<2.2.1"
     },
     "suggest": {
         "friendsofsymfony/http-cache-bundle": "For integration with the Symfony framework",

src/SymfonyCache/AccessControlledListener.php

@@ -14,6 +14,7 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher\IpsRequestMatcher;
 use Symfony\Component\HttpFoundation\RequestMatcherInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -26,7 +27,7 @@
 abstract class AccessControlledListener implements EventSubscriberInterface
 {
     /**
-     * @var RequestMatcher
+     * @var RequestMatcherInterface
      */
     private $clientMatcher;
 
@@ -54,7 +55,10 @@ public function __construct(array $options = [])
             throw new \InvalidArgumentException('You may not set both a request matcher and an IP.');
         }
         if (!$clientMatcher) {
-            $clientMatcher = new RequestMatcher(null, null, null, $options['client_ips'] ?: '127.0.0.1');
+            $clientMatcher = class_exists(IpsRequestMatcher::class)
+                ? new IpsRequestMatcher($options['client_ips'] ?: '127.0.0.1')
+                : new RequestMatcher(null, null, null, $options['client_ips'] ?: '127.0.0.1')
+            ;
         }
 
         $this->clientMatcher = $clientMatcher;

tests/Unit/SymfonyCache/PurgeListenerTest.php

@@ -19,6 +19,8 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher\PathRequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcherInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\HttpCache\StoreInterface;
 use Toflar\Psr6HttpCacheStore\Psr6Store;
@@ -35,7 +37,7 @@ public function testConstructorOverspecified()
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionMessage('You may not set both a request matcher and an IP');
         new PurgeListener([
-            'client_matcher' => new RequestMatcher('/forbidden'),
+            'client_matcher' => $this->createRequestMatcher('/forbidden'),
             'client_ips' => ['1.2.3.4'],
         ]);
     }
@@ -129,7 +131,7 @@ public function testPurgeForbiddenMatcher()
     {
         $kernel = $this->getUnusedKernelMock();
 
-        $matcher = new RequestMatcher('/forbidden');
+        $matcher = $this->createRequestMatcher('/forbidden');
         $purgeListener = new PurgeListener(['client_matcher' => $matcher]);
         $request = Request::create('http://example.com/foo', 'PURGE');
         $event = new CacheEvent($kernel, $request);
@@ -162,7 +164,7 @@ public function testPurgeForbiddenIp()
     public function testOtherMethod()
     {
         $kernel = $this->getUnusedKernelMock();
-        $matcher = \Mockery::mock(RequestMatcher::class)
+        $matcher = \Mockery::mock(RequestMatcherInterface::class)
             ->shouldNotReceive('isRequestAllowed')
             ->getMock();
 
@@ -184,6 +186,14 @@ public function testInvalidConfiguration()
         new PurgeListener(['stuff' => '1.2.3.4']);
     }
 
+    private function createRequestMatcher(string $path): RequestMatcherInterface
+    {
+        return class_exists(PathRequestMatcher::class)
+            ? new PathRequestMatcher($path)
+            : new RequestMatcher($path)
+        ;
+    }
+
     /**
      * @return CacheInvalidation|MockInterface
      */

tests/Unit/SymfonyCache/RefreshListenerTest.php

@@ -18,6 +18,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestMatcher;
+use Symfony\Component\HttpFoundation\RequestMatcher\PathRequestMatcher;
 use Symfony\Component\HttpFoundation\Response;
 
 class RefreshListenerTest extends TestCase
@@ -42,7 +43,7 @@ public function testRefreshAllowed()
         $this->kernel->expects($this->once())
             ->method('fetch')
             ->with($request)
-            ->will($this->returnValue($response))
+            ->willReturn($response)
         ;
 
         $refreshListener = new RefreshListener();
@@ -57,7 +58,10 @@ public function testRefreshForbiddenMatcher()
             ->method('fetch')
         ;
 
-        $matcher = new RequestMatcher('/forbidden');
+        $matcher = class_exists(PathRequestMatcher::class)
+            ? new PathRequestMatcher('/forbidden')
+            : new RequestMatcher('/forbidden')
+        ;
         $refreshListener = new RefreshListener(['client_matcher' => $matcher]);
         $request = Request::create('http://example.com/foo');
         $request->headers->addCacheControlDirective('no-cache');