[TASK] v13 cache

Author: achimfritz

Build/phpstan11.neon

@@ -16,3 +16,7 @@ parameters:
     -
       message: '#.*unknown class TYPO3\\CMS\\Core\\TypoScript\\FrontendTypoScript.#'
       path: %currentWorkingDirectory%/Classes/CacheHelper.php
+    -
+      message: '#Instantiated class TYPO3\\CMS\\Core\\Cache\\CacheDataCollector not found.#'
+    -
+      message: '#Instantiated class TYPO3\\CMS\\Core\\Cache\\CacheTag not found.#'

Build/phpstan12.neon

@@ -16,3 +16,7 @@ parameters:
     -
       message: '#Call to an undefined method TYPO3\\CMS\\Core\\TypoScript\\FrontendTypoScript::getConfigArray\(\).#'
       path: %currentWorkingDirectory%/Classes/CacheHelper.php
+    -
+      message: '#Instantiated class TYPO3\\CMS\\Core\\Cache\\CacheDataCollector not found.#'
+    -
+      message: '#Instantiated class TYPO3\\CMS\\Core\\Cache\\CacheTag not found.#'

Classes/CacheHelper.php

@@ -12,6 +12,7 @@
  */
 
 use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Core\Cache\CacheTag;
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\Exception\AspectNotFoundException;
@@ -86,7 +87,13 @@ protected function buildTagsAndAddThemToPageCache(array $pages): array
         $tags = array_map(function ($pageId) {
             return 'menuId_' . $pageId;
         }, $usedPageIds);
-        $this->getFrontendController()->addCacheTags($tags);
+
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 13) {
+            $this->getFrontendController()->addCacheTags($tags);
+        } else {
+            $cacheDataCollector = $this->getServerRequest()->getAttribute('frontend.cache.collector');
+            $cacheDataCollector->addCacheTags(...array_map(fn (string $tag) => new CacheTag($tag), $tags));
+        }
         return $tags;
     }
 

Tests/Functional/DataProcessing/ListMenuProcessorTest.php

@@ -13,8 +13,10 @@
  */
 
 use B13\Menus\DataProcessing\ListMenu;
+use TYPO3\CMS\Core\Cache\CacheDataCollector;
 use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
 use TYPO3\CMS\Core\Http\ServerRequest;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Site\Entity\Site;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
@@ -317,6 +319,10 @@ public function processTest(array $tsfe, array $configuration, array $expected)
         $request = GeneralUtility::makeInstance(ServerRequest::class);
         $request = $request->withAttribute('site', $site);
         $request = $request->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_FE);
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() > 12) {
+            $cacheDataCollector = new CacheDataCollector();
+            $request = $request->withAttribute('frontend.cache.collector', $cacheDataCollector);
+        }
         $GLOBALS['TYPO3_REQUEST'] = $request;
 
         $GLOBALS['TSFE'] = $this->getTypoScriptFrontendController($site, $tsfe['id']);
@@ -371,6 +377,10 @@ public function menuIdTagsAreAddedToPageCache(array $tsfe, array $configuration,
         $request = GeneralUtility::makeInstance(ServerRequest::class);
         $request = $request->withAttribute('site', $site);
         $request = $request->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_FE);
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() > 12) {
+            $cacheDataCollector = new CacheDataCollector();
+            $request = $request->withAttribute('frontend.cache.collector', $cacheDataCollector);
+        }
         $GLOBALS['TYPO3_REQUEST'] = $request;
 
         $GLOBALS['TSFE'] = $this->getTypoScriptFrontendController($site, $tsfe['id']);

Tests/Functional/DataProcessing/TreeMenuProcessorTest.php

@@ -13,8 +13,10 @@
  */
 
 use B13\Menus\DataProcessing\TreeMenu;
+use TYPO3\CMS\Core\Cache\CacheDataCollector;
 use TYPO3\CMS\Core\Core\SystemEnvironmentBuilder;
 use TYPO3\CMS\Core\Http\ServerRequest;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Site\Entity\Site;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
@@ -401,6 +403,10 @@ public function processTest(array $tsfe, array $configuration, array $expected):
         $request = GeneralUtility::makeInstance(ServerRequest::class);
         $request = $request->withAttribute('site', $site);
         $request = $request->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_FE);
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() > 12) {
+            $cacheDataCollector = new CacheDataCollector();
+            $request = $request->withAttribute('frontend.cache.collector', $cacheDataCollector);
+        }
         $GLOBALS['TYPO3_REQUEST'] = $request;
 
         $GLOBALS['TSFE'] = $this->getTypoScriptFrontendController($site, $tsfe['id']);
@@ -466,6 +472,10 @@ public function menuIdTagsAreAddedToPageCache(array $tsfe, int $entryPoints, arr
         $request = GeneralUtility::makeInstance(ServerRequest::class);
         $request = $request->withAttribute('site', $site);
         $request = $request->withAttribute('applicationType', SystemEnvironmentBuilder::REQUESTTYPE_FE);
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() > 12) {
+            $cacheDataCollector = new CacheDataCollector();
+            $request = $request->withAttribute('frontend.cache.collector', $cacheDataCollector);
+        }
         $GLOBALS['TYPO3_REQUEST'] = $request;
 
         $GLOBALS['TSFE'] = $this->getTypoScriptFrontendController($site, $tsfe['id']);