[BUGFIX] Use late instancing of ContentObjectRenderer

Avoid issues caused by attempting to resolve ContentObjectRenderer in methods that may be called during DI compilation.
FluidTYPO3 · Jan 25, 2025 · a388cb0 · a388cb0
1 parent 02c21f3
commit a388cb0
Show file tree

Hide file tree

Showing 15 changed files with 164 additions and 78 deletions.
diff --git a/Classes/Traits/SourceSetViewHelperTrait.php b/Classes/Traits/SourceSetViewHelperTrait.php
@@ -1,10 +1,12 @@
 <?php
 namespace FluidTYPO3\Vhs\Traits;
 
+use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
 use FluidTYPO3\Vhs\Utility\ContextUtility;
 use FluidTYPO3\Vhs\Utility\FrontendSimulationUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
 
 /*
@@ -94,6 +96,11 @@ public function getImgResource(
         ?string $params = null,
         ?string $crop = null
     ): array {
+        $contentObject = ContentObjectFetcher::resolve($this->configurationManager);
+        if ($contentObject === null) {
+            throw new Exception(static::class . ' requires a ContentObjectRenderer, none found', 1737808465);
+        }
+
         $setup = [
             'width' => $width,
             'treatIdAsReference' => $treatIdAsReference,
@@ -111,7 +118,7 @@ public function getImgResource(
         if (ContextUtility::isBackend() && '../' === substr($src, 0, 3)) {
             $src = substr($src, 3);
         }
-        return (array) $this->contentObject->getImgResource($src, $setup);
+        return (array) $contentObject->getImgResource($src, $setup);
     }
 
     /**

diff --git a/Classes/Utility/ContentObjectFetcher.php b/Classes/Utility/ContentObjectFetcher.php
@@ -18,9 +18,9 @@ class ContentObjectFetcher
     public static function resolve(?ConfigurationManagerInterface $configurationManager = null): ?ContentObjectRenderer
     {
         $contentObject = null;
-        $request = $configurationManager !== null && method_exists($configurationManager, 'getRequest')
+        $request = ($configurationManager !== null && method_exists($configurationManager, 'getRequest')
             ? $configurationManager->getRequest()
-            : ($GLOBALS['TYPO3_REQUEST'] ?? null);
+            : ($GLOBALS['TYPO3_REQUEST'] ?? null)) ?? $GLOBALS['TYPO3_REQUEST'] ?? null;
 
         if ($request && $configurationManager === null) {
             $contentObject = static::resolveFromRequest($request);
@@ -29,7 +29,7 @@ public static function resolve(?ConfigurationManagerInterface $configurationMana
         if ($contentObject === null) {
             if ($configurationManager !== null && method_exists($configurationManager, 'getContentObject')) {
                 $contentObject = $configurationManager->getContentObject();
-            } else {
+            } elseif ($request) {
                 $contentObject = static::resolveFromRequest($request);
             }
         }

diff --git a/Classes/View/UncacheTemplateView.php b/Classes/View/UncacheTemplateView.php
@@ -8,7 +8,6 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use FluidTYPO3\Vhs\Utility\RequestResolver;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext;

diff --git a/Classes/ViewHelpers/Content/AbstractContentViewHelper.php b/Classes/ViewHelpers/Content/AbstractContentViewHelper.php
@@ -13,7 +13,6 @@
 use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
-use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
@@ -23,11 +22,6 @@ abstract class AbstractContentViewHelper extends AbstractViewHelper
 {
     use SlideViewHelperTrait;
 
-    /**
-     * @var ContentObjectRenderer|null
-     */
-    protected $contentObject;
-
     /**
      * @var ConfigurationManagerInterface
      */
@@ -41,7 +35,6 @@ abstract class AbstractContentViewHelper extends AbstractViewHelper
     public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager): void
     {
         $this->configurationManager = $configurationManager;
-        $this->contentObject = ContentObjectFetcher::resolve($this->configurationManager);
     }
 
     public function initializeArguments(): void
@@ -197,17 +190,19 @@ protected function getPageUid(): int
      */
     protected function getRenderedRecords(array $rows): array
     {
+        $contentObject = ContentObjectFetcher::resolve($this->configurationManager);
+
         /** @var array $loadRegister */
         $loadRegister = $this->arguments['loadRegister'];
-        if (!empty($loadRegister) && $this->contentObject !== null) {
-            $this->contentObject->cObjGetSingle('LOAD_REGISTER', $loadRegister);
+        if (!empty($loadRegister) && $contentObject !== null) {
+            $contentObject->cObjGetSingle('LOAD_REGISTER', $loadRegister);
         }
         $elements = [];
         foreach ($rows as $row) {
             $elements[] = static::renderRecord($row);
         }
-        if (!empty($loadRegister) && $this->contentObject !== null) {
-            $this->contentObject->cObjGetSingle('RESTORE_REGISTER', []);
+        if (!empty($loadRegister) && $contentObject !== null) {
+            $contentObject->cObjGetSingle('RESTORE_REGISTER', []);
         }
         return $elements;
     }

diff --git a/Classes/ViewHelpers/Content/InfoViewHelper.php b/Classes/ViewHelpers/Content/InfoViewHelper.php
@@ -9,13 +9,13 @@
  */
 
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
+use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
 use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\LanguageAspect;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
-use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
@@ -71,8 +71,12 @@ public function render()
         $record = false;
 
         if (0 === $contentUid) {
-            /** @var ContentObjectRenderer $cObj */
-            $cObj = $this->configurationManager->getContentObject();
+            $cObj = ContentObjectFetcher::resolve($this->configurationManager);
+
+            if ($cObj === null) {
+                throw new Exception('v:content.info requires a ContentObjectRenderer, none found', 1737807859);
+            }
+
             if ($cObj->getCurrentTable() !== 'tt_content') {
                 throw new Exception(
                     'v:content.info must have contentUid argument outside tt_content context',

diff --git a/Classes/ViewHelpers/Format/Placeholder/LipsumViewHelper.php b/Classes/ViewHelpers/Format/Placeholder/LipsumViewHelper.php
@@ -8,11 +8,13 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 /**
@@ -166,8 +168,11 @@ protected static function getContentObject(): ContentObjectRenderer
     {
         /** @var ConfigurationManagerInterface $configurationManager */
         $configurationManager = GeneralUtility::makeInstance(ConfigurationManagerInterface::class);
-        /** @var ContentObjectRenderer $contentObject */
-        $contentObject = $configurationManager->getContentObject();
+        /** @var ContentObjectRenderer|null $contentObject */
+        $contentObject = ContentObjectFetcher::resolve($configurationManager);
+        if ($contentObject === null) {
+            throw new Exception('v:format.placeholder.lipsum requires a ContentObjectRenderer, none found', 1737807859);
+        }
         return $contentObject;
     }
 }
diff --git a/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php b/Classes/ViewHelpers/Media/Image/AbstractImageViewHelper.php
@@ -17,7 +17,6 @@
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Domain\Model\FileReference;
-use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 
 /**
@@ -27,11 +26,6 @@
 
 abstract class AbstractImageViewHelper extends AbstractMediaViewHelper
 {
-    /**
-     * @var ContentObjectRenderer
-     */
-    protected $contentObject;
-
     /**
      * @var ConfigurationManagerInterface
      */
@@ -45,12 +39,7 @@ abstract class AbstractImageViewHelper extends AbstractMediaViewHelper
 
     public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager): void
     {
-        $contentObject = ContentObjectFetcher::resolve($configurationManager);
-        if ($contentObject === null) {
-            throw new \UnexpectedValueException(static::class . ' requires a cObj context, none was found', 1737756353);
-        }
         $this->configurationManager = $configurationManager;
-        $this->contentObject = $contentObject;
     }
 
     public function initializeArguments(): void
@@ -143,6 +132,11 @@ public function preprocessImage(?string $imageSource = null): void
 
         $tsfeBackup = FrontendSimulationUtility::simulateFrontendEnvironment();
 
+        $contentObject = ContentObjectFetcher::resolve($this->configurationManager);
+        if ($contentObject === null) {
+            throw new Exception(static::class . ' requires a ContentObjectRenderer, none found', 1737808465);
+        }
+
         $setup = [
             'width' => $width,
             'height' => $height,
@@ -165,7 +159,7 @@ public function preprocessImage(?string $imageSource = null): void
         if (ContextUtility::isBackend() && strpos($src, '../') === 0) {
             $src = mb_substr($src, 3);
         }
-        $this->imageInfo = $this->contentObject->getImgResource($src, $setup);
+        $this->imageInfo = $contentObject->getImgResource($src, $setup);
 
         if (!is_array($this->imageInfo)) {
             if ($this->arguments['graceful'] ?? false) {

diff --git a/Classes/ViewHelpers/Media/SourceViewHelper.php b/Classes/ViewHelpers/Media/SourceViewHelper.php
@@ -8,14 +8,15 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
 use FluidTYPO3\Vhs\Utility\ContextUtility;
 use FluidTYPO3\Vhs\Utility\FrontendSimulationUtility;
 use TYPO3\CMS\Core\Resource\FileReference;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
-use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 
 /**
  * Used in conjuntion with the `v:media.PictureViewHelper`.
@@ -36,12 +37,6 @@ class SourceViewHelper extends AbstractTagBasedViewHelper
      * @api
      */
     protected $tagName = 'source';
-
-    /**
-     * @var ContentObjectRenderer
-     */
-    protected $contentObject;
-
     /**
      * @var ConfigurationManagerInterface
      */
@@ -50,9 +45,6 @@ class SourceViewHelper extends AbstractTagBasedViewHelper
     public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager): void
     {
         $this->configurationManager = $configurationManager;
-        /** @var ContentObjectRenderer $contentObject */
-        $contentObject = $this->configurationManager->getContentObject();
-        $this->contentObject = $contentObject;
     }
 
     public function initializeArguments(): void
@@ -135,7 +127,12 @@ public function render()
         if (is_string($imageSource) && ContextUtility::isBackend() && '../' === mb_substr($imageSource, 0, 3)) {
             $imageSource = mb_substr($imageSource, 3);
         }
-        $result = $this->contentObject->getImgResource($imageSource, $setup);
+        $contentObject = ContentObjectFetcher::resolve($this->configurationManager);
+        if ($contentObject === null) {
+            throw new Exception('v:media.source requires a ContentObjectRenderer, none found', 1737807859);
+        }
+
+        $result = $contentObject->getImgResource($imageSource, $setup);
 
         FrontendSimulationUtility::resetFrontendEnvironment($tsfeBackup);
 

diff --git a/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php b/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php
@@ -9,6 +9,7 @@
  */
 
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
+use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
 use FluidTYPO3\Vhs\Utility\CoreUtility;
 use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use TYPO3\CMS\Core\Context\Context;
@@ -20,8 +21,10 @@
 use TYPO3\CMS\Core\Site\SiteFinder;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 
 /**
  * ViewHelper for rendering TYPO3 menus in Fluid
@@ -44,11 +47,18 @@ class LanguageMenuViewHelper extends AbstractTagBasedViewHelper
      */
     protected $cObj;
 
+    protected ConfigurationManagerInterface $configurationManager;
+
     /**
      * @var Site|\TYPO3\CMS\Core\Site\Entity\Site
      */
     protected $site;
 
+    public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager): void
+    {
+        $this->configurationManager = $configurationManager;
+    }
+
     public function initializeArguments(): void
     {
         parent::initializeArguments();
@@ -131,8 +141,12 @@ public function render()
         if (!is_object($GLOBALS['TSFE']->sys_page)) {
             return '';
         }
-        /** @var ContentObjectRenderer $contentObject */
-        $contentObject = $GLOBALS['TSFE']->cObj;
+        /** @var ContentObjectRenderer|null $contentObject */
+        $contentObject = ContentObjectFetcher::resolve($this->configurationManager);
+        if ($contentObject === null) {
+            throw new Exception('v:page.languageMenu requires a ContentObjectRenderer, none found', 1737807859);
+        }
+
         $this->cObj = $contentObject;
         $this->tagName = is_scalar($this->arguments['tagName']) ? (string) $this->arguments['tagName'] : 'ul';
         $this->tag->setTagName($this->tagName);

diff --git a/Classes/ViewHelpers/Render/UncacheViewHelper.php b/Classes/ViewHelpers/Render/UncacheViewHelper.php
@@ -8,14 +8,18 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
 use FluidTYPO3\Vhs\Utility\RequestResolver;
 use FluidTYPO3\Vhs\View\UncacheContentObject;
 use FluidTYPO3\Vhs\View\UncacheTemplateView;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Mvc\ExtbaseRequestParameters;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
+use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 
 /**
@@ -105,8 +109,7 @@ public static function renderStatic(
             $conf['partialRootPaths'] = $renderingContext->getTemplatePaths()->getPartialRootPaths();
         }
 
-        /** @var ContentObjectRenderer $contentObjectRenderer */
-        $contentObjectRenderer = $GLOBALS['TSFE']->cObj;
+        $contentObjectRenderer = static::getContentObject();
 
         $content = $contentObjectRenderer->cObjGetSingle(
             'COA_INT',
@@ -117,4 +120,16 @@ public static function renderStatic(
         );
         return $content;
     }
+
+    protected static function getContentObject(): ContentObjectRenderer
+    {
+        /** @var ConfigurationManagerInterface $configurationManager */
+        $configurationManager = GeneralUtility::makeInstance(ConfigurationManagerInterface::class);
+        /** @var ContentObjectRenderer|null $contentObject */
+        $contentObject = ContentObjectFetcher::resolve($configurationManager);
+        if ($contentObject === null) {
+            throw new Exception('v:render.uncache requires a ContentObjectRenderer, none found', 1737808465);
+        }
+        return $contentObject;
+    }
 }