📦 CacheAttributeListener is now resettable to prevent memory leaks

andrew-demb · andrew-demb · commit 5996644836e8 · 2025-06-28T02:51:28.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php
@@ -143,6 +143,7 @@
 
         ->set('controller.cache_attribute_listener', CacheAttributeListener::class)
             ->tag('kernel.event_subscriber')
+            ->tag('kernel.reset', ['method' => 'reset'])
 
     ;
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -26,7 +26,7 @@
         "symfony/error-handler": "^6.1|^7.0",
         "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
         "symfony/http-foundation": "^6.4|^7.0",
-        "symfony/http-kernel": "^6.4",
+        "symfony/http-kernel": "^6.4.23",
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "^5.4|^6.0|^7.0",
         "symfony/finder": "^5.4|^6.0|^7.0",
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 6.4
 ---
 
+* `Symfony\Component\HttpKernel\EventListener\CacheAttributeListener` is now resettable to prevent memory leaks
  * Support backed enums in #[MapQueryParameter]
  * `BundleInterface` no longer extends `ContainerAwareInterface`
  * Add optional `$className` parameter to `ControllerEvent::getAttributes()`
diff --git a/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php b/src/Symfony/Component/HttpKernel/EventListener/CacheAttributeListener.php
@@ -19,13 +19,14 @@
 use Symfony\Component\HttpKernel\Event\ControllerArgumentsEvent;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Handles HTTP cache headers configured via the Cache attribute.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class CacheAttributeListener implements EventSubscriberInterface
+class CacheAttributeListener implements EventSubscriberInterface, ResetInterface
 {
     /**
      * @var \SplObjectStorage<Request, \DateTimeInterface>
@@ -178,6 +179,12 @@ public static function getSubscribedEvents(): array
         ];
     }
 
+    public function reset(): void
+    {
+        $this->lastModified = new \SplObjectStorage();
+        $this->etags = new \SplObjectStorage();
+    }
+
     private function getExpressionLanguage(): ExpressionLanguage
     {
         return $this->expressionLanguage ??= class_exists(ExpressionLanguage::class)

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,7 @@`
`143`	`143`
`144`	`144`	`->set('controller.cache_attribute_listener', CacheAttributeListener::class)`
`145`	`145`	`->tag('kernel.event_subscriber')`
	`146`	`+ ->tag('kernel.reset', ['method' => 'reset'])`
`146`	`147`
`147`	`148`	`;`
`148`	`149`	`};`