Merge pull request #4 from netlogix/bugfix/expose-cache-lifetime

netlogix · Mar 7, 2023 · 83dbf04 · 83dbf04
2 parents ec23905 + dadca6d
commit 83dbf04
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Classes/Service/CacheTagService.php b/Classes/Service/CacheTagService.php
@@ -54,7 +54,7 @@ class CacheTagService extends AbstractService implements SingletonInterface
     protected array $environments = [
         [
             self::ENVIRONMENT_TAGS => [],
-            self::ENVIRONMENT_LIFETIME => null,
+            self::ENVIRONMENT_LIFETIME => 0,
         ],
     ];
 
@@ -263,7 +263,7 @@ protected function getObjectIdentificationHelpers(): array
     public function exposeCacheLifetime(array $params, TypoScriptFrontendController $tsfe)
     {
         $environmentLifetime = $this->getEnvironmentLifetime();
-        if (!$environmentLifetime) {
+        if ($environmentLifetime === 0) {
             return $params['cacheTimeout'];
         } else {
             return min($params['cacheTimeout'], $environmentLifetime);
@@ -342,6 +342,9 @@ public function addPageCacheTags($objectOrCacheTag)
 
     public function decreaseEnvironmentLifetime(int $lifetime)
     {
+        if ($lifetime === 0) {
+            return;
+        }
         foreach ($this->environments as &$environment) {
             if ($environment[self::ENVIRONMENT_LIFETIME] === 0 || ($environment[self::ENVIRONMENT_LIFETIME] > $lifetime)) {
                 $environment[self::ENVIRONMENT_LIFETIME] = $lifetime;

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -7,6 +7,7 @@
 call_user_func(function () {
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['createHashBase'][] = \Netlogix\Nxcachetags\Service\UserToHashBaseService::class . '->createHashBase';
     $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['clearCachePostProc'][] = \Netlogix\Nxcachetags\Hooks\DataHandler::class . '->clearCachePostProc';
+    $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['get_cache_timeout'][] = \Netlogix\Nxcachetags\Service\CacheTagService::class . '->exposeCacheLifetime';
 
     if (!isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['nxcachetags_cacheviewhelper'])) {
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['nxcachetags_cacheviewhelper'] = [