Fix isStaticCacheble call for TYPO3 v13

lochmueller · Mar 20, 2024 · 37fc64a · 37fc64a
1 parent a63dc72
commit 37fc64a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 42 deletions.
diff --git a/Classes/Cache/Listener/StaticCacheableListener.php b/Classes/Cache/Listener/StaticCacheableListener.php
@@ -5,6 +5,8 @@
 namespace SFC\Staticfilecache\Cache\Listener;
 
 use SFC\Staticfilecache\Event\CacheRuleEvent;
+use TYPO3\CMS\Core\Information\Typo3Version;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 /**
@@ -20,8 +22,15 @@ class StaticCacheableListener
      */
     public function __invoke(CacheRuleEvent $event): void
     {
-        if (($GLOBALS['TSFE'] ?? null) instanceof TypoScriptFrontendController && !$GLOBALS['TSFE']->isStaticCacheble()) {
-            $event->addExplanation(__CLASS__, 'The page is not static cacheable via TypoScriptFrontend. Check the first Question on: https://github.com/lochmueller/staticfilecache/blob/master/Documentation/Faq/Index.rst');
+        if (($GLOBALS['TSFE'] ?? null) instanceof TypoScriptFrontendController) {
+            if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() >= 13) {
+                $isStaticCacheble = $GLOBALS['TSFE']->isStaticCacheble($event->getRequest());
+            } else {
+                $isStaticCacheble = $GLOBALS['TSFE']->isStaticCacheble();
+            }
+            if(!$isStaticCacheble) {
+                $event->addExplanation(__CLASS__, 'The page is not static cacheable via TypoScriptFrontend. Check the first Question on: https://github.com/lochmueller/staticfilecache/blob/master/Documentation/Faq/Index.rst');
+            }
         }
     }
 }
diff --git a/Classes/Cache/Rule/LoginDeniedConfiguration.php b/Classes/Cache/Rule/LoginDeniedConfiguration.php
diff --git a/Classes/Configuration.php b/Classes/Configuration.php
@@ -8,7 +8,6 @@
 use TYPO3\CMS\Core\Configuration\Exception\ExtensionConfigurationPathDoesNotExistException;
 use SFC\Staticfilecache\Cache\RemoteFileBackend;
 use SFC\Staticfilecache\Cache\Rule\Enable;
-use SFC\Staticfilecache\Cache\Rule\LoginDeniedConfiguration;
 use SFC\Staticfilecache\Cache\Rule\NoFakeFrontend;
 use SFC\Staticfilecache\Cache\Rule\NoIntScripts;
 use SFC\Staticfilecache\Cache\Rule\NoLongPathSegment;
@@ -38,7 +37,6 @@
 use SFC\Staticfilecache\Service\ObjectFactoryService;
 use TYPO3\CMS\Core\Cache\Backend\NullBackend;
 use TYPO3\CMS\Core\Core\Environment;
-use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Utility\ExtensionUtility;
 
@@ -47,7 +45,6 @@ class Configuration extends StaticFileCacheObject
     public const EXTENSION_KEY = 'staticfilecache';
 
     protected ConfigurationService $configurationService;
-    protected Typo3Version $typo3version;
 
     /**
      * Configuration constructor.
@@ -58,7 +55,6 @@ class Configuration extends StaticFileCacheObject
     public function __construct()
     {
         $this->configurationService = GeneralUtility::makeInstance(ConfigurationService::class);
-        $this->typo3version = GeneralUtility::makeInstance(Typo3Version::class);
     }
 
     /**
@@ -96,7 +92,6 @@ protected function registerRules(): self
             'noWorkspacePreview' => NoWorkspacePreview::class,
             'noUserOrGroupSet' => NoUserOrGroupSet::class,
             'noIntScripts' => NoIntScripts::class,
-            'loginDeniedConfiguration' => LoginDeniedConfiguration::class,
             'noNoCache' => NoNoCache::class,
             'enable' => Enable::class,
             'validPageInformation' => ValidPageInformation::class,