Merge pull request #56 from nlx-lars/bugfix/contentcacheflusher-aspect

BUGFIX: Use ContentCacheFlusher Aspect for banning varnish pages

Author: daniellienert

Classes/Aspects/ContentCacheAspect.php

@@ -3,6 +3,8 @@
 
 namespace MOC\Varnish\Aspects;
 
+use MOC\Varnish\Service\CacheTagService;
+use MOC\Varnish\Service\VarnishBanService;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Aop\JoinPointInterface;
 use Neos\Flow\Configuration\Exception\InvalidConfigurationException;
@@ -30,6 +32,18 @@ class ContentCacheAspect
      */
     protected $logger;
 
+    /**
+     * @Flow\Inject
+     * @var VarnishBanService
+     */
+    protected $varnishBanService;
+
+    /**
+     * @Flow\Inject
+     * @var CacheTagService
+     */
+    protected $cacheTagService;
+
     /**
      * @var bool
      */
@@ -106,6 +120,21 @@ public function registerDisableContentCache(JoinPointInterface $joinPoint): void
         }
     }
 
+    /**
+     * @Flow\Before("setting(MOC.Varnish.enabled) && method(Neos\Neos\Fusion\Cache\ContentCacheFlusher->shutdownObject())")
+     * @param JoinPointInterface $joinPoint
+     *
+     * @throws PropertyNotAccessibleException
+     */
+    public function interceptContentCacheFlush(JoinPointInterface $joinPoint)
+    {
+        $object = $joinPoint->getProxy();
+
+        $tags = array_keys(ObjectAccess::getProperty($object, 'tagsToFlush', true));
+
+        $this->varnishBanService->banByTags($tags);
+    }
+
     /**
      * @return bool true if an uncached segment was evaluated
      */

Classes/Package.php

@@ -19,6 +19,8 @@
 
 /**
  * @Flow\Scope("singleton")
+ *
+ * @deprecated will be removed with 6.0
  */
 class ContentCacheFlusherService
 {