More TYPO3 v14 migrations

Author: lochmueller

Classes/Cache/StaticDatabaseBackend.php

@@ -9,6 +9,8 @@
 use SFC\Staticfilecache\Service\ConfigurationService;
 use TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend;
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
+use TYPO3\CMS\Core\Information\Typo3Version;
+use TYPO3\CMS\Core\Resource\ResourceFactory;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -24,12 +26,18 @@ abstract class StaticDatabaseBackend extends Typo3DatabaseBackend implements Log
     /**
      * Constructs this backend.
      *
-     * @param string $context application context
+     * @param mixed $context application context
      * @param array  $options Configuration options - depends on the actual backend
      */
     public function __construct($context, array $options = [])
     {
-        parent::__construct($context, $options);
+        if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 14) {
+            // @phpstan-ignore-next-line
+            parent::__construct($context, $options);
+        } else {
+            // Note. In v14 there is only the options array. So the first Param are the options.
+            parent::__construct($context);
+        }
         $this->configuration = GeneralUtility::makeInstance(ConfigurationService::class);
     }
 

Classes/Generator/AbstractGenerator.php

@@ -5,16 +5,21 @@
 namespace SFC\Staticfilecache\Generator;
 
 use Psr\EventDispatcher\EventDispatcherInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use SFC\Staticfilecache\Event\GeneratorCreate;
 use SFC\Staticfilecache\Event\GeneratorRemove;
 use SFC\Staticfilecache\Service\ConfigurationService;
 use SFC\Staticfilecache\Service\RemoveService;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\View\StandaloneView;
+use TYPO3\CMS\Core\View\ViewFactoryInterface;
+use TYPO3\CMS\Core\View\ViewFactoryData;
 
 abstract class AbstractGenerator
 {
-    public function __construct(protected EventDispatcherInterface $eventDispatcher) {}
+    public function __construct(
+        protected EventDispatcherInterface $eventDispatcher,
+        protected ViewFactoryInterface $viewFactory,
+    ) {}
 
     abstract public function generate(GeneratorCreate $generatorCreateEvent): void;
 
@@ -38,11 +43,12 @@ protected function removeFile(string $fileName): void
 
     protected function renderTemplateToFile(string $templateName, array $variables, string $htaccessFile): void
     {
-        /** @var StandaloneView $renderer */
-        $renderer = GeneralUtility::makeInstance(StandaloneView::class);
-        $renderer->setTemplatePathAndFilename(GeneralUtility::getFileAbsFileName($templateName));
-        $renderer->assignMultiple($variables);
-        $content = trim($renderer->render());
+        $view = $this->viewFactory->create(new ViewFactoryData(
+            templatePathAndFilename: GeneralUtility::getFileAbsFileName($templateName),
+        ));
+        $view->assignMultiple($variables);
+        $content = trim($view->render());
+
         // Note: Create even empty htaccess files (do not check!!!), so the delete is in sync
         $this->writeFile($htaccessFile, $content);
     }

Classes/Traits/CacheTrait.php

@@ -26,6 +26,7 @@
  *
  * $result = $this->cacheRemoteUri('https://www.google.de/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png');
  */
+// @phpstan-ignore-next-line
 trait CacheTrait
 {
     /**