Check _cache type for compatibility with Symfony 6.2

sensiolabs · Oct 29, 2022 · 0fd5fdf · 0fd5fdf
1 parent 6bd976c
commit 0fd5fdf
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/EventListener/HttpCacheListener.php b/src/EventListener/HttpCacheListener.php
@@ -11,6 +11,7 @@
 
 namespace Sensio\Bundle\FrameworkExtraBundle\EventListener;
 
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\HttpFoundation\Response;
@@ -42,7 +43,8 @@ public function __construct()
     public function onKernelController(KernelEvent $event)
     {
         $request = $event->getRequest();
-        if (!$configuration = $request->attributes->get('_cache')) {
+        $configuration = $request->attributes->get('_cache');
+        if (!$configuration instanceof Cache) {
             return;
         }
 
@@ -81,8 +83,9 @@ public function onKernelController(KernelEvent $event)
     public function onKernelResponse(KernelEvent $event)
     {
         $request = $event->getRequest();
+        $configuration = $request->attributes->get('_cache');
 
-        if (!$configuration = $request->attributes->get('_cache')) {
+        if (!$configuration instanceof Cache) {
             return;
         }
 

diff --git a/tests/EventListener/HttpCacheListenerTest.php b/tests/EventListener/HttpCacheListenerTest.php
@@ -50,6 +50,16 @@ public function testWontReassignResponseWhenNoConfigurationIsPresent()
         $this->assertSame($response, $this->event->getResponse());
     }
 
+    public function testIgnoreUnknownCacheAttribute()
+    {
+        $response = $this->event->getResponse();
+
+        $this->request->attributes->set('_cache', new \stdClass());
+
+        $this->assertNull($this->listener->onKernelResponse($this->event));
+        $this->assertSame($response, $this->event->getResponse());
+    }
+
     public function testResponseIsPublicIfSharedMaxAgeSetAndPublicNotOverridden()
     {
         $request = $this->createRequest(new Cache([