[BUGFIX] Make TSFE retrieval more resilient

Always fetch the TypoScriptFrontendController from
$GLOBALS['TYPO3_REQUEST'].

This prevents issues with third party Extensions that call
the ContentObjectRenderer before the request is initialized (e.g.
ig_ldap_sso_auth).

Classes/TagCollector/AbstractTagCollector.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tx\Cacheopt\TagCollector;
+
+use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
+
+abstract class AbstractTagCollector
+{
+    protected function getTypoScriptFrontendController(): ?TypoScriptFrontendController
+    {
+        $typo3Request = $GLOBALS['TYPO3_REQUEST'] ?? null;
+
+        if (!$typo3Request instanceof ServerRequestInterface) {
+            return null;
+        }
+
+        $frontendController = $typo3Request->getAttribute('frontend.controller');
+
+        if (!$frontendController instanceof TypoScriptFrontendController) {
+            return null;
+        }
+
+        return $frontendController;
+    }
+}

Classes/TagCollector/ContentTagCollector.php

@@ -18,7 +18,7 @@
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
-class ContentTagCollector implements ContentObjectPostInitHookInterface
+class ContentTagCollector extends AbstractTagCollector implements ContentObjectPostInitHookInterface
 {
     /**
      * Hook for post processing the initialization of ContentObjectRenderer.
@@ -28,7 +28,7 @@ class ContentTagCollector implements ContentObjectPostInitHookInterface
     public function postProcessContentObjectInitialization(
         ContentObjectRenderer &$parentObject
     ): void {
-        $tsfe = $this->getTypoScriptFrontendController($parentObject);
+        $tsfe = $this->getTypoScriptFrontendController();
         if (!$tsfe instanceof TypoScriptFrontendController) {
             return;
         }
@@ -50,15 +50,4 @@ public function postProcessContentObjectInitialization(
 
         $tsfe->addCacheTags($cacheTags);
     }
-
-    protected function getTypoScriptFrontendController(ContentObjectRenderer $cObj): ?TypoScriptFrontendController
-    {
-        $frontendController = $cObj->getRequest()->getAttribute('frontend.controller');
-
-        if (!$frontendController instanceof TypoScriptFrontendController) {
-            return null;
-        }
-
-        return $frontendController;
-    }
 }

Classes/TagCollector/FileTagCollector.php

@@ -14,14 +14,13 @@
  * The TYPO3 project - inspiring people to share!                         *
  *                                                                        */
 
-use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Resource\Event\GeneratePublicUrlForResourceEvent;
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\FileReference;
 use TYPO3\CMS\Core\Resource\ProcessedFile;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
-class FileTagCollector
+class FileTagCollector extends AbstractTagCollector
 {
     public function collectTagsForPreGeneratePublicUrl(GeneratePublicUrlForResourceEvent $event): void
     {
@@ -52,21 +51,4 @@ public function collectTagsForPreGeneratePublicUrl(GeneratePublicUrlForResourceE
 
         $tsfe->addCacheTags($cacheTags);
     }
-
-    protected function getTypoScriptFrontendController(): ?TypoScriptFrontendController
-    {
-        $typo3Request = $GLOBALS['TYPO3_REQUEST'];
-
-        if (!$typo3Request instanceof ServerRequest) {
-            return null;
-        }
-
-        $frontendController = $typo3Request->getAttribute('frontend.controller');
-
-        if (!$frontendController instanceof TypoScriptFrontendController) {
-            return null;
-        }
-
-        return $frontendController;
-    }
 }