[TASK] Initial TYPO3 v14 compatibility

.github/workflows/ci.yml

@@ -17,12 +17,8 @@ jobs:
       fail-fast: false
       max-parallel: 5
       matrix:
-        typo3: ['^12', '^13', '13.4.x-dev']
+        typo3: ['^13', '13.4.x-dev', '14.0.x-dev']
         php: ['8.2', '8.3']
-        include:
-          - typo3: '^12'
-            php: '8.1'
-
     steps:
       - id: checkout
         name: Checkout Code

Build/phpstan.neon

@@ -3,7 +3,6 @@ includes:
 	- %currentWorkingDirectory%/.build/vendor/phpstan/phpstan-strict-rules/rules.neon
 	- %currentWorkingDirectory%/.build/vendor/phpstan/phpstan-deprecation-rules/rules.neon
 	- %currentWorkingDirectory%/.build/vendor/friendsoftypo3/phpstan-typo3/extension.neon
-	- %currentWorkingDirectory%/Build/phpstan-baseline-v13.neon
 
 parameters:
 	level: 8

Classes/ViewHelpers/Data/PaginateViewHelper.php

@@ -14,13 +14,15 @@
 use TYPO3\CMS\Core\Pagination\SimplePagination;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 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;
 
@@ -34,6 +36,11 @@ class PaginateViewHelper extends AbstractViewHelper
      */
     protected $escapeOutput = false;
 
+    public function __construct(
+        protected readonly ViewFactoryInterface $viewFactory,
+    ) {
+    }
+
     public function initializeArguments(): void
     {
         parent::initializeArguments();
@@ -78,7 +85,7 @@ public function render(): string
                 'pagination' => $pagination,
                 'configuration' => $configuration,
             ]);
-            $paginationRendered = $paginationView->render();
+            $paginationRendered = $paginationView->render('Paginate/Index');
 
             $variableProvider = $renderingContext->getVariableProvider();
             $variableProvider->add('paginator', $paginator);
@@ -99,7 +106,7 @@ public function render(): string
         );
     }
 
-    protected function getTemplateObject(RenderingContextInterface $renderingContext, ServerRequestInterface $request): StandaloneView
+    protected function getTemplateObject(RenderingContextInterface $renderingContext, ServerRequestInterface $request): ViewInterface
     {
         $setup = $this->getConfigurationManager()->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
 
@@ -110,9 +117,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.'])) {
@@ -135,12 +139,12 @@ protected function getTemplateObject(RenderingContextInterface $renderingContext
             }
         }
 
-        $view->setLayoutRootPaths($layoutRootPaths);
-        $view->setPartialRootPaths($partialRootPaths);
-        $view->setTemplateRootPaths($templateRootPaths);
-        $view->setTemplate('Paginate/Index');
-
-        return $view;
+        return $this->viewFactory->create(new ViewFactoryData(
+            templateRootPaths: $templateRootPaths,
+            partialRootPaths: $partialRootPaths,
+            layoutRootPaths: $layoutRootPaths,
+            request: $request,
+        ));
     }
 
     protected function getConfigurationManager(): ConfigurationManagerInterface

Classes/ViewHelpers/File/IsAudioViewHelper.php

@@ -11,6 +11,7 @@
 
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\FileReference;
+use TYPO3\CMS\Core\Resource\FileType;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
@@ -25,16 +26,11 @@ public function render()
         $allowedFileExtensions = $GLOBALS['TYPO3_CONF_VARS']['SYS']['audiofile_ext'] ?? '';
         $allowedFileExtensions = GeneralUtility::trimExplode(',', $allowedFileExtensions);
 
-        if (is_object($file)
+        return is_object($file)
             && ($file instanceof FileReference || $file instanceof File)
             && (
                 in_array($file->getExtension(), $allowedFileExtensions, true)
-                || $file->getType() === File::FILETYPE_AUDIO
-            )
-        ) {
-            return true;
-        }
-
-        return false;
+                || $file->getType() === FileType::AUDIO->value
+            );
     }
 }

Classes/ViewHelpers/File/IsImageViewHelper.php

@@ -11,6 +11,7 @@
 
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\FileReference;
+use TYPO3\CMS\Core\Resource\FileType;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
@@ -25,16 +26,11 @@ public function render()
         $allowedFileExtensions = $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'] ?? '';
         $allowedFileExtensions = GeneralUtility::trimExplode(',', $allowedFileExtensions);
 
-        if (is_object($file)
+        return is_object($file)
             && ($file instanceof FileReference || $file instanceof File)
             && (
                 in_array($file->getExtension(), $allowedFileExtensions, true)
-                || $file->getType() === File::FILETYPE_IMAGE
-            )
-        ) {
-            return true;
-        }
-
-        return false;
+                || $file->getType() === FileType::IMAGE->value
+            );
     }
 }

Classes/ViewHelpers/File/IsMediaViewHelper.php

@@ -11,6 +11,7 @@
 
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\FileReference;
+use TYPO3\CMS\Core\Resource\FileType;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
 
@@ -25,16 +26,11 @@ public function render()
         $allowedFileExtensions = $GLOBALS['TYPO3_CONF_VARS']['SYS']['mediafile_ext'] ?? '';
         $allowedFileExtensions = GeneralUtility::trimExplode(',', $allowedFileExtensions);
 
-        if (is_object($file)
+        return is_object($file)
             && ($file instanceof FileReference || $file instanceof File)
             && (
                 in_array($file->getExtension(), $allowedFileExtensions, true)
-                || $file->getType() === File::FILETYPE_VIDEO
-            )
-        ) {
-            return true;
-        }
-
-        return false;
+                || $file->getType() === FileType::VIDEO->value
+            );
     }
 }