Migration of TSFE to request Attributes

lochmueller · lochmueller · commit 49e34bc6fc49 · 2025-12-17T15:38:54.000+01:00
diff --git a/Classes/Cache/Listener/CachingAllowedListener.php b/Classes/Cache/Listener/CachingAllowedListener.php
@@ -5,12 +5,13 @@
 namespace SFC\Staticfilecache\Cache\Listener;
 
 use SFC\Staticfilecache\Event\CacheRuleEvent;
+use TYPO3\CMS\Frontend\Cache\CacheInstruction;
 
 class CachingAllowedListener
 {
     public function __invoke(CacheRuleEvent $event): void
     {
-        if (!$event->getRequest()->getAttribute('frontend.cache.instruction')->isCachingAllowed()) {
+        if (!$event->getRequest()->getAttribute('frontend.cache.instruction', new CacheInstruction())->isCachingAllowed()) {
             $event->addExplanation(__CLASS__, 'No caching via frontend.cache.instruction attribute');
         }
     }
diff --git a/Classes/Cache/Listener/ForceStaticCacheListener.php b/Classes/Cache/Listener/ForceStaticCacheListener.php
@@ -8,7 +8,8 @@
 use Psr\Http\Message\ServerRequestInterface;
 use SFC\Staticfilecache\Event\CacheRuleEvent;
 use SFC\Staticfilecache\Event\ForceStaticFileCacheEvent;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+use TYPO3\CMS\Core\TypoScript\FrontendTypoScript;
+use TYPO3\CMS\Frontend\Page\PageInformation;
 
 /**
  * Force the cache for special pages.
@@ -19,33 +20,38 @@ public function __construct(protected readonly EventDispatcherInterface $eventDi
 
     public function __invoke(CacheRuleEvent $event): void
     {
-        if ($event->isSkipProcessing() && $this->isForceCacheUri($GLOBALS['TSFE'] ?? null, $event->getRequest())) {
+        if ($event->isSkipProcessing() && $this->isForceCacheUri($event->getRequest())) {
             $event->setSkipProcessing(false);
             $event->truncateExplanations();
 
-            if ($GLOBALS['TSFE'] instanceof TypoScriptFrontendController) {
-                if (!\is_array($GLOBALS['TSFE']->config['INTincScript'])) {
+            $frontendTypoScript = $event->getRequest()->getAttribute('frontend.typoscript');
+            if ($frontendTypoScript instanceof FrontendTypoScript) {
+                $configArray = $frontendTypoScript->getConfigArray();
+                if (!\is_array($configArray['INTincScript'])) {
                     // Avoid exceptions in recursivelyReplaceIntPlaceholdersInContent
-                    $GLOBALS['TSFE']->config['INTincScript'] = [];
+                    $configArray['INTincScript'] = [];
+                    $frontendTypoScript->setConfigArray($configArray);
                 }
 
+                // @todo
                 // render the plugins in the output
-                $GLOBALS['TSFE']->INTincScript($event->getRequest());
+                // v14??? $GLOBALS['TSFE']->INTincScript($event->getRequest());
             }
         }
     }
 
     /**
      * Is force cache URI?
      */
-    protected function isForceCacheUri(?TypoScriptFrontendController $frontendController, ServerRequestInterface $request): bool
+    protected function isForceCacheUri(ServerRequestInterface $request): bool
     {
-        if (!\is_object($frontendController)) {
+        $pageInformation = $request->getAttribute('frontend.page.information');
+        if (!$pageInformation instanceof PageInformation) {
             return false;
         }
 
-        $forceStatic = (bool) ($frontendController->page['tx_staticfilecache_cache_force'] ?? false);
-        $event = new ForceStaticFileCacheEvent($forceStatic, $frontendController, $request);
+        $forceStatic = (bool) ($pageInformation->getPageRecord()['tx_staticfilecache_cache_force'] ?? false);
+        $event = new ForceStaticFileCacheEvent($forceStatic, $request);
         $this->eventDispatcher->dispatch($event);
 
         return $event->isForceStatic();
diff --git a/Classes/Cache/Listener/NoBackendUserListener.php b/Classes/Cache/Listener/NoBackendUserListener.php
@@ -17,7 +17,7 @@ public function __construct(private readonly Context $context) {}
     public function __invoke(CacheRuleEvent $event): void
     {
         if ($this->context->getPropertyFromAspect('backend.user', 'isLoggedIn', false)) {
-            $event->addExplanation(__CLASS__, 'Active BE Login (TSFE:beUserLogin)');
+            $event->addExplanation(__CLASS__, 'Active BE Login via context -> aspect');
             $event->setSkipProcessing(true);
         }
     }
diff --git a/Classes/Cache/Listener/NoIntScriptsListener.php b/Classes/Cache/Listener/NoIntScriptsListener.php
@@ -6,6 +6,7 @@
 
 use SFC\Staticfilecache\Event\CacheRuleEvent;
 use SFC\Staticfilecache\Service\ConfigurationService;
+use TYPO3\CMS\Core\TypoScript\FrontendTypoScript;
 use TYPO3\CMS\Frontend\Cache\NonceValueSubstitution;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
@@ -15,16 +16,19 @@ public function __construct(protected readonly ConfigurationService $configurati
 
     public function __invoke(CacheRuleEvent $event): void
     {
-        $tsfe = $GLOBALS['TSFE'] ?? null;
-        if ($tsfe instanceof TypoScriptFrontendController && $tsfe->isINTincScript()) {
-            foreach ((array) $tsfe->config['INTincScript'] as $key => $configuration) {
+        $frontendTypoScript = $event->getRequest()->getAttribute('frontend.typoscript');
+        if ($frontendTypoScript instanceof FrontendTypoScript) {
+            $configArray = $frontendTypoScript->getConfigArray();
+            if (isset($configArray['INTincScript']) && is_array($configArray['INTincScript'])) {
+                foreach ($configArray['INTincScript'] as $key => $configuration) {
 
-                $cspGenerationOverride = (bool) $this->configurationService->get('cspGenerationOverride');
-                if ($cspGenerationOverride && isset($configuration['target']) && $configuration['target'] === NonceValueSubstitution::class . '->substituteNonce') {
-                    continue;
-                }
+                    $cspGenerationOverride = (bool) $this->configurationService->get('cspGenerationOverride');
+                    if ($cspGenerationOverride && isset($configuration['target']) && $configuration['target'] === NonceValueSubstitution::class . '->substituteNonce') {
+                        continue;
+                    }
 
-                $event->addExplanation(__CLASS__ . ':' . $key, 'The page has a INTincScript: ' . implode(', ', $this->getInformation($configuration)));
+                    $event->addExplanation(__CLASS__ . ':' . $key, 'The page has a INTincScript: ' . implode(', ', $this->getInformation($configuration)));
+                }
             }
         }
     }
diff --git a/Classes/Cache/Listener/PageCacheableListener.php b/Classes/Cache/Listener/PageCacheableListener.php
@@ -5,16 +5,18 @@
 namespace SFC\Staticfilecache\Cache\Listener;
 
 use SFC\Staticfilecache\Event\CacheRuleEvent;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+use TYPO3\CMS\Frontend\Page\PageInformation;
 
 class PageCacheableListener
 {
     public function __invoke(CacheRuleEvent $event): void
     {
-        if (!(($GLOBALS['TSFE'] ?? null) instanceof TypoScriptFrontendController)) {
+        $pageInformation = $event->getRequest()->getAttribute('frontend.page.information');
+        if (!$pageInformation instanceof PageInformation) {
             return;
         }
-        $cache = (bool) ($GLOBALS['TSFE']->page['tx_staticfilecache_cache'] ?? true);
+
+        $cache = (bool) ($pageInformation->getPageRecord()['tx_staticfilecache_cache'] ?? true);
         if (!$cache) {
             $event->addExplanation(__CLASS__, 'static cache disabled on page');
         }
diff --git a/Classes/Cache/Listener/ValidDoktypeListener.php b/Classes/Cache/Listener/ValidDoktypeListener.php
@@ -5,7 +5,7 @@
 namespace SFC\Staticfilecache\Cache\Listener;
 
 use SFC\Staticfilecache\Event\CacheRuleEvent;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+use TYPO3\CMS\Frontend\Page\PageInformation;
 
 class ValidDoktypeListener
 {
@@ -14,9 +14,10 @@ class ValidDoktypeListener
      */
     public function __invoke(CacheRuleEvent $event): void
     {
-        $tsfe = $GLOBALS['TSFE'] ?? null;
-        if (!($tsfe instanceof TypoScriptFrontendController) || !isset($GLOBALS['TSFE']->page)) {
-            $event->addExplanation(__CLASS__, 'There is no valid page in the frontendController object');
+
+        $pageInformation = $event->getRequest()->getAttribute('frontend.page.information');
+        if (!$pageInformation instanceof PageInformation) {
+            $event->addExplanation(__CLASS__, 'There is no valid page in the frontend.page.information');
             $event->setSkipProcessing(true);
 
             return;
@@ -28,7 +29,7 @@ public function __invoke(CacheRuleEvent $event): void
             255, // DOKTYPE_RECYCLER,
         ];
 
-        $currentType = (int) ($GLOBALS['TSFE']->page['doktype'] ?? 1);
+        $currentType = (int) ($pageInformation->getPageRecord()['doktype'] ?? 1);
         if (\in_array($currentType, $ignoreTypes, true)) {
 
             $event->addExplanation(__CLASS__, 'The Page doktype ' . $currentType . ' is one of the following not allowed numbers: ' . implode(
diff --git a/Classes/Cache/Listener/ValidPageInformationListener.php b/Classes/Cache/Listener/ValidPageInformationListener.php
@@ -5,7 +5,7 @@
 namespace SFC\Staticfilecache\Cache\Listener;
 
 use SFC\Staticfilecache\Event\CacheRuleEvent;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+use TYPO3\CMS\Frontend\Page\PageInformation;
 
 /**
  * ValidPageInformation.
@@ -19,10 +19,10 @@ class ValidPageInformationListener
      */
     public function __invoke(CacheRuleEvent $event): void
     {
-        $tsfe = $GLOBALS['TSFE'] ?? null;
-        if (!$tsfe instanceof TypoScriptFrontendController || !\is_array($tsfe->page) || !$tsfe->page['uid']) {
+        $pageInformation = $event->getRequest()->getAttribute('frontend.page.information');
+        if (!$pageInformation instanceof PageInformation) {
             $event->setSkipProcessing(true);
-            $event->addExplanation(__CLASS__, 'There is no valid page in the TSFE');
+            $event->addExplanation(__CLASS__, 'There is no valid page information in the frontend.page.information');
         }
     }
 }
diff --git a/Classes/Cache/RemoteFileBackend.php b/Classes/Cache/RemoteFileBackend.php
@@ -275,6 +275,8 @@ protected function getFileName(string $entryIdentifier): string
 
     public function flushByTags(array $tags): void
     {
-        // @todo check
+        foreach ($tags as $tag) {
+            $this->flushByTag($tag);
+        }
     }
 }
diff --git a/Classes/Cache/StaticFileBackend.php b/Classes/Cache/StaticFileBackend.php
@@ -24,6 +24,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\PathUtility;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+use TYPO3\CMS\Frontend\Page\PageInformation;
 
 /**
  * Cache backend for StaticFileCache.
@@ -327,8 +328,10 @@ protected function getPriority(string $uri)
             $priority += (QueueService::PRIORITY_MEDIUM - \strlen($uri));
         }
 
-        if (($GLOBALS['TSFE'] ?? null) instanceof TypoScriptFrontendController) {
-            $priority += (int) $GLOBALS['TSFE']->page['tx_staticfilecache_cache_priority'];
+        // @todo
+        $pageInformation = $GLOBALS['TYPO3_REQUEST']?->getAttribute('frontend.page.information');
+        if ($pageInformation instanceof PageInformation) {
+            $priority += (int) ($pageInformation->getPageRecord()['tx_staticfilecache_cache_priority'] ?? 0);
         }
 
         return $priority;
diff --git a/Classes/Event/ForceStaticFileCacheEvent.php b/Classes/Event/ForceStaticFileCacheEvent.php
@@ -5,13 +5,11 @@
 namespace SFC\Staticfilecache\Event;
 
 use Psr\Http\Message\ServerRequestInterface;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 final class ForceStaticFileCacheEvent
 {
     public function __construct(
         private bool $forceStatic,
-        private ?TypoScriptFrontendController $frontendController,
         private ServerRequestInterface $request
     ) {}
 
@@ -25,16 +23,6 @@ public function setForceStatic(bool $forceStatic): void
         $this->forceStatic = $forceStatic;
     }
 
-    public function getFrontendController(): TypoScriptFrontendController
-    {
-        return $this->frontendController;
-    }
-
-    public function setFrontendController(TypoScriptFrontendController $frontendController): void
-    {
-        $this->frontendController = $frontendController;
-    }
-
     public function getRequest(): ServerRequestInterface
     {
         return $this->request;
diff --git a/Classes/Middleware/FrontendCacheMiddleware.php b/Classes/Middleware/FrontendCacheMiddleware.php
diff --git a/Classes/Middleware/GenerateMiddleware.php b/Classes/Middleware/GenerateMiddleware.php
@@ -19,8 +19,6 @@
 use SFC\Staticfilecache\Service\DateTimeService;
 use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Information\Typo3Version;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 class GenerateMiddleware implements MiddlewareInterface
 {
diff --git a/Classes/Middleware/PrepareMiddleware.php b/Classes/Middleware/PrepareMiddleware.php
@@ -4,6 +4,7 @@
 
 namespace SFC\Staticfilecache\Middleware;
 
+use TYPO3\CMS\Core\Cache\CacheTag;
 use TYPO3\CMS\Core\Http\Stream;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -14,16 +15,13 @@
 use SFC\Staticfilecache\Service\ConfigurationService;
 use SFC\Staticfilecache\Service\HttpPushService;
 use SFC\Staticfilecache\Service\InlineAssetsService;
-use SFC\Staticfilecache\Service\TypoScriptFrontendService;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class PrepareMiddleware implements MiddlewareInterface
 {
     public function __construct(
         protected readonly EventDispatcherInterface $eventDispatcher,
         protected readonly HttpPushService          $httpPushService,
         protected readonly ConfigurationService          $configurationService,
-        protected readonly TypoScriptFrontendService          $typoScriptFrontendService,
         protected readonly InlineAssetsService $inlineAssetsService
     ) {}
 
@@ -45,7 +43,11 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $this->eventDispatcher->dispatch($event);
 
         if (!$event->isSkipProcessing()) {
-            $cacheTags = $this->typoScriptFrontendService->getTags();
+
+            $cacheDataCollector = $GLOBALS['TYPO3_REQUEST']->getAttribute('frontend.cache.collector');
+            $cacheTags = array_map(fn(CacheTag $cacheTag) => $cacheTag->name, $cacheDataCollector->getCacheTags());
+
+
             if (false === $this->configurationService->isBool('clearCacheForAllDomains')) {
                 $cacheTags[] = 'sfc_domain_' . str_replace('.', '_', $event->getRequest()->getUri()->getHost());
             }
diff --git a/Classes/Service/TypoScriptFrontendService.php b/Classes/Service/TypoScriptFrontendService.php
diff --git a/Configuration/RequestMiddlewares.php b/Configuration/RequestMiddlewares.php
@@ -41,15 +41,6 @@
                 'staticfilecache/generate',
             ],
         ],
-        'staticfilecache/frontend-cache' => [
-            'target' => FrontendCacheMiddleware::class,
-            'after' => [
-                'typo3/cms-frontend/authentication',
-            ],
-            'before' => [
-                'staticfilecache/generate',
-            ],
-        ],
         'staticfilecache/cookie-check' => [
             'target' => CookieCheckMiddleware::class,
             'before' => [
diff --git a/Documentation/Introduction/WhatDoesItDo.rst b/Documentation/Introduction/WhatDoesItDo.rst
@@ -11,6 +11,6 @@ Tests with ApacheBench show an increase in performance (requests served per seco
 
 This extension generates static HTML files from static pages. If a static page exists, mod_rewrite will redirect the visitor to the static page. That means that TYPO3 will not be loaded at all. Your server will have less work to do and will use less power. That helps to keep our earth cool ;-)
 
-This extension works transparently together with the TYPO3 cache. Static files will be generated for all pages that TYPO3 caches in the cache_pages table. It uses the same decision making logic the '\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::sendCacheHeaders' function uses to decide if a static file will be generated and it uses the same logic as in '\TYPO3\CMS\Core\DataHandling\DataHandler::clear_cacheCmd' when removing static files.
+This extension works transparently together with the TYPO3 cache. Static files will be generated for all pages that TYPO3 caches in the cache_pages table. It uses the same decision making logic of the core to decide if a static file will be generated and it uses the same logic as in '\TYPO3\CMS\Core\DataHandling\DataHandler::clear_cacheCmd' when removing static files.
 
 Static files are created by default (following the sendCacheHeaders logic) but only when the URI contains no '?' (no URI parameters).

Original file line number	Diff line number	Diff line change
`@@ -5,12 +5,13 @@`
`5`	`5`	`namespace SFC\Staticfilecache\Cache\Listener;`
`6`	`6`
`7`	`7`	`use SFC\Staticfilecache\Event\CacheRuleEvent;`
	`8`	`+use TYPO3\CMS\Frontend\Cache\CacheInstruction;`
`8`	`9`
`9`	`10`	`class CachingAllowedListener`
`10`	`11`	`{`
`11`	`12`	`public function __invoke(CacheRuleEvent $event): void`
`12`	`13`	`{`
`13`		`- if (!$event->getRequest()->getAttribute('frontend.cache.instruction')->isCachingAllowed()) {`
	`14`	`+ if (!$event->getRequest()->getAttribute('frontend.cache.instruction', new CacheInstruction())->isCachingAllowed()) {`
`14`	`15`	`$event->addExplanation(__CLASS__, 'No caching via frontend.cache.instruction attribute');`
`15`	`16`	`}`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function __construct(private readonly Context $context) {}`
`17`	`17`	`public function __invoke(CacheRuleEvent $event): void`
`18`	`18`	`{`
`19`	`19`	`if ($this->context->getPropertyFromAspect('backend.user', 'isLoggedIn', false)) {`
`20`		`- $event->addExplanation(__CLASS__, 'Active BE Login (TSFE:beUserLogin)');`
	`20`	`+ $event->addExplanation(__CLASS__, 'Active BE Login via context -> aspect');`
`21`	`21`	`$event->setSkipProcessing(true);`
`22`	`22`	`}`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,16 +5,18 @@`
`5`	`5`	`namespace SFC\Staticfilecache\Cache\Listener;`
`6`	`6`
`7`	`7`	`use SFC\Staticfilecache\Event\CacheRuleEvent;`
`8`		`-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;`
	`8`	`+use TYPO3\CMS\Frontend\Page\PageInformation;`
`9`	`9`
`10`	`10`	`class PageCacheableListener`
`11`	`11`	`{`
`12`	`12`	`public function __invoke(CacheRuleEvent $event): void`
`13`	`13`	`{`
`14`		`- if (!(($GLOBALS['TSFE'] ?? null) instanceof TypoScriptFrontendController)) {`
	`14`	`+ $pageInformation = $event->getRequest()->getAttribute('frontend.page.information');`
	`15`	`+ if (!$pageInformation instanceof PageInformation) {`
`15`	`16`	`return;`
`16`	`17`	`}`
`17`		`- $cache = (bool) ($GLOBALS['TSFE']->page['tx_staticfilecache_cache'] ?? true);`
	`18`	`+`
	`19`	`+ $cache = (bool) ($pageInformation->getPageRecord()['tx_staticfilecache_cache'] ?? true);`
`18`	`20`	`if (!$cache) {`
`19`	`21`	`$event->addExplanation(__CLASS__, 'static cache disabled on page');`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`namespace SFC\Staticfilecache\Cache\Listener;`
`6`	`6`
`7`	`7`	`use SFC\Staticfilecache\Event\CacheRuleEvent;`
`8`		`-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;`
	`8`	`+use TYPO3\CMS\Frontend\Page\PageInformation;`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* ValidPageInformation.`
`@@ -19,10 +19,10 @@ class ValidPageInformationListener`
`19`	`19`	`*/`
`20`	`20`	`public function __invoke(CacheRuleEvent $event): void`
`21`	`21`	`{`
`22`		`- $tsfe = $GLOBALS['TSFE'] ?? null;`
`23`		`- if (!$tsfe instanceof TypoScriptFrontendController \|\| !\is_array($tsfe->page) \|\| !$tsfe->page['uid']) {`
	`22`	`+ $pageInformation = $event->getRequest()->getAttribute('frontend.page.information');`
	`23`	`+ if (!$pageInformation instanceof PageInformation) {`
`24`	`24`	`$event->setSkipProcessing(true);`
`25`		`- $event->addExplanation(__CLASS__, 'There is no valid page in the TSFE');`
	`25`	`+ $event->addExplanation(__CLASS__, 'There is no valid page information in the frontend.page.information');`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,6 +275,8 @@ protected function getFileName(string $entryIdentifier): string`
`275`	`275`
`276`	`276`	`public function flushByTags(array $tags): void`
`277`	`277`	`{`
`278`		`- // @todo check`
	`278`	`+ foreach ($tags as $tag) {`
	`279`	`+ $this->flushByTag($tag);`
	`280`	`+ }`
`279`	`281`	`}`
`280`	`282`	`}`