[BUGFIX] Use proper ViewInterface

benjaminkott · Oct 28, 2024 · 303f2ba · 303f2ba
1 parent 9f10179
commit 303f2ba
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/Classes/ViewHelpers/Data/PaginateViewHelper.php b/Classes/ViewHelpers/Data/PaginateViewHelper.php
@@ -16,16 +16,15 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\View\ViewFactoryData;
 use TYPO3\CMS\Core\View\ViewFactoryInterface;
+use TYPO3\CMS\Core\View\ViewInterface;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Pagination\QueryResultPaginator;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContextFactory;
-use TYPO3\CMS\Fluid\View\StandaloneView;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\View\ViewInterface as FluidStandaloneViewInterface;
 
 /**
  * PaginateViewHelper
@@ -37,9 +36,9 @@ class PaginateViewHelper extends AbstractViewHelper
      */
     protected $escapeOutput = false;
 
-    public function __construct(protected ViewFactoryInterface $viewFactory)
-    {
-    }
+    public function __construct(
+        protected readonly ViewFactoryInterface $viewFactory,
+    ) {}
 
     public function initializeArguments(): void
     {
@@ -106,7 +105,7 @@ public function render(): string
         );
     }
 
-    protected function getTemplateObject(RenderingContextInterface $renderingContext, ServerRequestInterface $request): FluidStandaloneViewInterface
+    protected function getTemplateObject(RenderingContextInterface $renderingContext, ServerRequestInterface $request): ViewInterface
     {
         $setup = $this->getConfigurationManager()->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
 
@@ -117,9 +116,6 @@ protected function getTemplateObject(RenderingContextInterface $renderingContext
             $context->setRequest($request);
         }
 
-        /** @var StandaloneView $view */
-        $view = GeneralUtility::makeInstance(StandaloneView::class, $context);
-
         $layoutRootPaths = [];
         $layoutRootPaths[] = GeneralUtility::getFileAbsFileName('EXT:bootstrap_package/Resources/Private/Layouts/ViewHelpers/');
         if (isset($setup['plugin.']['tx_bootstrappackage.']['view.']['layoutRootPaths.'])) {
@@ -142,15 +138,12 @@ protected function getTemplateObject(RenderingContextInterface $renderingContext
             }
         }
 
-        $viewFactoryData = new ViewFactoryData(
+        return $this->viewFactory->create(new ViewFactoryData(
             templateRootPaths: $templateRootPaths,
             partialRootPaths: $partialRootPaths,
             layoutRootPaths: $layoutRootPaths,
             request: $request,
-        );
-        $view = $this->viewFactory->create($viewFactoryData);
-
-        return $view;
+        ));
     }
 
     protected function getConfigurationManager(): ConfigurationManagerInterface

diff --git a/Classes/ViewHelpers/FrameViewHelper.php b/Classes/ViewHelpers/FrameViewHelper.php
@@ -17,12 +17,12 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\View\ViewFactoryData;
 use TYPO3\CMS\Core\View\ViewFactoryInterface;
+use TYPO3\CMS\Core\View\ViewInterface;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
-use TYPO3Fluid\Fluid\View\ViewInterface as FluidStandaloneViewInterface;
 
 /**
  * FrameViewHelper
@@ -34,9 +34,9 @@ class FrameViewHelper extends AbstractViewHelper
      */
     protected $escapeOutput = false;
 
-    public function __construct(protected ViewFactoryInterface $viewFactory)
-    {
-    }
+    public function __construct(
+        protected readonly ViewFactoryInterface $viewFactory,
+    ) {}
 
     public function initializeArguments(): void
     {
@@ -174,7 +174,7 @@ public function render()
         return $view->render('Frame/Index');
     }
 
-    protected function getTemplateObject(): FluidStandaloneViewInterface
+    protected function getTemplateObject(): ViewInterface
     {
         $setup = static::getConfigurationManager()->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
 
@@ -200,15 +200,12 @@ protected function getTemplateObject(): FluidStandaloneViewInterface
             }
         }
 
-        $viewFactoryData = new ViewFactoryData(
+        return $this->viewFactory->create(new ViewFactoryData(
             templateRootPaths: $templateRootPaths,
             partialRootPaths: $partialRootPaths,
             layoutRootPaths: $layoutRootPaths,
             request: $this->getRequestFromRenderingContext($this->renderingContext),
-        );
-        $view = $this->viewFactory->create($viewFactoryData);
-
-        return $view;
+        ));
     }
 
     protected static function getConfigurationManager(): ConfigurationManagerInterface