BUGFIX: Use HeaderEnabled instead of HeaderLifetime to determine cachability

That way caching is supported even if no lifetime is set and the cache is valid ad infinitum

Author: mficzel

Classes/Aspects/ContentCacheAspect.php

@@ -28,7 +28,7 @@ class ContentCacheAspect
     protected $cacheFrontend;
 
     /**
-     * @Flow\Before("method(Neos\Fusion\Core\Cache\ContentCache->(createUncachedSegment|replaceUncachedPlaceholders)())")
+     * @Flow\Before("method(Neos\Fusion\Core\Cache\ContentCache->(createUncachedSegment)())")
      */
     public function grabUncachedSegment(JoinPointInterface $joinPoint)
     {

Classes/Middleware/CacheHeaderMiddleware.php

@@ -69,6 +69,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
                 ->withHeader('CacheControl', 'public, max-age=' . $publicLifetime);
         }
 
+        $response = $response
+            ->withHeader(RequestCacheMiddleware::HEADER_ENABLED, "");
+
         if ($tags) {
             $response = $response
                 ->withHeader(RequestCacheMiddleware::HEADER_TAGS, $tags);

Classes/Middleware/RequestCacheMiddleware.php

@@ -74,17 +74,17 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         $response = $next->handle($request->withHeader(self::HEADER_ENABLED, ''));
 
-        if ($response->hasHeader(self::HEADER_LIFTIME)) {
-            $lifetime = (int)$response->getHeaderLine(self::HEADER_LIFTIME);
-            $tags = $response->getHeader(self::HEADER_TAGS);
+        if ($response->hasHeader(self::HEADER_ENABLED)) {
+            $lifetime = $response->hasHeader(self::HEADER_LIFTIME) ? (int)$response->getHeaderLine(self::HEADER_LIFTIME) : null;
+            $tags = $response->hasHeader(self::HEADER_TAGS) ? $response->getHeader(self::HEADER_TAGS) : [];
             $response = $response
+                ->withoutHeader(self::HEADER_ENABLED)
                 ->withoutHeader(self::HEADER_LIFTIME)
-                ->withoutHeader(self::HEADER_TAGS)
-                ->withHeader(self::HEADER_INFO, 'MISS: ' . $entryIdentifier);
-
+                ->withoutHeader(self::HEADER_TAGS);
 
             $this->cacheFrontend->set($entryIdentifier,[ 'timestamp' => time(), 'response' => str($response) ], $tags, $lifetime);
             $response->getBody()->rewind();
+            return $response->withHeader(self::HEADER_INFO, 'MISS: ' . $entryIdentifier);
         }
 
         return $response;