Add fallbackToSmaxage flag to CustomTtlListener and check for isCacheable before calling store

CHANGELOG.md

@@ -3,6 +3,12 @@ Changelog
 
 See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpCache/releases).
 
+2.15.4
+------
+
+* Fix always use defined `CustomTtlListener` header even if not set.
+* Fix not calling store if Response object is not longer cachable after event listeners.
+
 2.15.3
 ------
 

src/SymfonyCache/CustomTtlListener.php

@@ -59,15 +59,16 @@ public function __construct($ttlHeader = 'X-Reverse-Proxy-TTL', $keepTtlHeader =
     public function useCustomTtl(CacheEvent $e)
     {
         $response = $e->getResponse();
-        if (!$response->headers->has($this->ttlHeader)) {
-            return;
-        }
         $backup = $response->headers->hasCacheControlDirective('s-maxage')
             ? $response->headers->getCacheControlDirective('s-maxage')
             : 'false'
         ;
         $response->headers->set(static::SMAXAGE_BACKUP, $backup);
-        $response->setTtl($response->headers->get($this->ttlHeader));
+        $response->setTtl(
+            $response->headers->has($this->ttlHeader)
+                ? $response->headers->get($this->ttlHeader)
+                : 0
+        );
     }
 
     /**

src/SymfonyCache/EventDispatchingHttpCache.php

@@ -109,7 +109,11 @@ protected function store(Request $request, Response $response)
     {
         $response = $this->dispatch(Events::PRE_STORE, $request, $response);
 
-        parent::store($request, $response);
+        // CustomTtlListener or other Listener or Subscribers might have set a non-cacheable response so we need revalidate this
+        // So store is only called when cacheable like Symfony core would do: https://github.com/symfony/symfony/blob/v7.1.2/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php#L409
+        if ($response->isCacheable()) {
+            parent::store($request, $response);
+        }
     }
 
     /**