fix: handling of new EXT:solr requests

Author: lochmueller

Classes/Cache/Listener/CachingAllowedListener.php

@@ -4,12 +4,12 @@
 
 namespace SFC\Staticfilecache\Cache\Listener;
 
-use SFC\Staticfilecache\Event\CacheRuleEvent;
+use SFC\Staticfilecache\Event\CacheRuleEventInterface;
 use TYPO3\CMS\Frontend\Cache\CacheInstruction;
 
 class CachingAllowedListener
 {
-    public function __invoke(CacheRuleEvent $event): void
+    public function __invoke(CacheRuleEventInterface $event): void
     {
         if (!$event->getRequest()->getAttribute('frontend.cache.instruction', new CacheInstruction())->isCachingAllowed()) {
             $event->addExplanation(__CLASS__, 'No caching via frontend.cache.instruction attribute');

Classes/Cache/Listener/SolrIndexingProcessListener.php

@@ -13,6 +13,10 @@ class SolrIndexingProcessListener
 {
     public function __invoke(CacheRuleFallbackEvent $event): void
     {
+        // Note!! This is handled by old EXT:solr versions!!!
+        // The new version set the 'frontend.cache.instruction' in the
+        // right way and is cached via CachingAllowedListener.
+
         if ($event->getRequest()->hasHeader('X-Tx-Solr-Iq')) {
             $event->addExplanation(__CLASS__, 'Solr Indexing request');
             $event->setSkipProcessing(true);

Configuration/Services.yaml

@@ -132,6 +132,9 @@ services:
       - name: event.listener
         identifier: 'CachingAllowedListener'
         event: SFC\Staticfilecache\Event\CacheRuleEvent
+      - name: event.listener
+        identifier: 'CachingAllowedListenerFallback'
+        event: SFC\Staticfilecache\Event\CacheRuleFallbackEvent
 
   SFC\Staticfilecache\Cache\Listener\NoUserOrGroupSetListener:
     tags: