[TASK] Fix and clean up uncached renderer

Restore v12 compatibility
FluidTYPO3 · Jul 24, 2023 · 33def4d · 33def4d
1 parent 929fac4
commit 33def4d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 63 deletions.
diff --git a/Classes/View/UncacheContentObject.php b/Classes/View/UncacheContentObject.php
diff --git a/Classes/View/UncacheTemplateView.php b/Classes/View/UncacheTemplateView.php
@@ -21,7 +21,7 @@
 
 class UncacheTemplateView extends TemplateView
 {
-    public function callUserFunction(string $postUserFunc, array $conf, string $content): string
+    public function callUserFunction(string $postUserFunc, array $conf): string
     {
         $partial = $conf['partial'] ?? null;
         $section = $conf['section'] ?? null;
@@ -31,7 +31,6 @@ public function callUserFunction(string $postUserFunc, array $conf, string $cont
             ? $parameters->getControllerExtensionName()
             : $parameters['extensionName'] ?? null;
 
-
         if (empty($partial)) {
             return '';
         }

diff --git a/Classes/ViewHelpers/Render/UncacheViewHelper.php b/Classes/ViewHelpers/Render/UncacheViewHelper.php
@@ -10,9 +10,10 @@
 
 use FluidTYPO3\Vhs\Utility\RequestResolver;
 use FluidTYPO3\Vhs\View\UncacheContentObject;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
+use FluidTYPO3\Vhs\View\UncacheTemplateView;
 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\Traits\CompileWithRenderStatic;
@@ -93,6 +94,7 @@ public static function renderStatic(
         }
 
         $conf = [
+            'userFunc' => UncacheTemplateView::class . '->callUserFunction',
             'partial' => $arguments['partial'],
             'section' => $arguments['section'],
             'arguments' => $partialArguments,
@@ -103,14 +105,16 @@ public static function renderStatic(
             $conf['partialRootPaths'] = $renderingContext->getTemplatePaths()->getPartialRootPaths();
         }
 
-        $GLOBALS['TSFE']->config['INTincScript'][$substKey] = [
-            'type' => 'POSTUSERFUNC',
-            'cObj' => serialize(GeneralUtility::makeInstance(UncacheContentObject::class, $GLOBALS['TSFE']->cObj)),
-            'postUserFunc' => 'render',
-            'conf' => $conf,
-            'content' => $content
-        ];
+        /** @var ContentObjectRenderer $contentObjectRenderer */
+        $contentObjectRenderer = $GLOBALS['TSFE']->cObj;
 
+        $content = $contentObjectRenderer->cObjGetSingle(
+            'COA_INT',
+            [
+                '10' => 'USER',
+                '10.' => $conf,
+            ]
+        );
         return $content;
     }
 }
diff --git a/Tests/Unit/View/UncacheContentObjectTest.php b/Tests/Unit/View/UncacheContentObjectTest.php