Merge pull request #27 from Flowpack/bugfix/cache-flushing

BUGFIX: Adapt cache flushing to Neos 9 cache flushing

Author: mficzel

Classes/Aspects/ContentCacheAspect.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Flowpack\FullPageCache\Aspects;
 
 use Neos\Cache\Frontend\StringFrontend;
@@ -36,12 +37,15 @@ public function grabUncachedSegment(JoinPointInterface $joinPoint)
     }
 
     /**
-     * @Flow\Before("method(Neos\Neos\Fusion\Cache\ContentCacheFlusher->shutdownObject())")
+     * This aspect is for Neos 8.x compatibility and can be removed, when Neos 8.x isn't supported anymore.
+     * See: ContentCacheAspect::interceptNodeCacheFlush() for Neos 9.x cache flushing
+     *
+     * @Flow\Before("method(Neos\Neos\Fusion\Cache\ContentCacheFlusher->commit())")
      * @param JoinPointInterface $joinPoint
      *
      * @throws \Neos\Utility\Exception\PropertyNotAccessibleException
      */
-    public function interceptNodeCacheFlush(JoinPointInterface $joinPoint)
+    public function interceptLegacyNodeCacheFlush(JoinPointInterface $joinPoint)
     {
         $object = $joinPoint->getProxy();
 
@@ -50,6 +54,19 @@ public function interceptNodeCacheFlush(JoinPointInterface $joinPoint)
         $this->cacheFrontend->flushByTags($tags);
     }
 
+    /**
+     * @Flow\Before("method(Neos\Neos\Fusion\Cache\ContentCacheFlusher->flushTagsImmediately())")
+     * @param JoinPointInterface $joinPoint
+     *
+     * @throws \Neos\Utility\Exception\PropertyNotAccessibleException
+     */
+    public function interceptNodeCacheFlush(JoinPointInterface $joinPoint)
+    {
+        $tags = $joinPoint->getMethodArgument('tagsToFlush');
+        $tags = array_map([$this, 'sanitizeTag'], array_keys($tags));
+        $this->cacheFrontend->flushByTags($tags);
+    }
+
     /**
      * @return bool
      */

README.md

@@ -8,7 +8,7 @@ It works by checking if a page is fully cachable and in that case caching the  w
 Settings
 --------
 
-Two settings are available to you to influence the behavior.
+Following settings are available to influence the behavior:
 
 ```yaml
 Flowpack: