First v14 caching

Author: lochmueller

Classes/Cache/StaticFileBackend13.php

@@ -44,7 +44,7 @@ public function getByTag($tag)
         if (!$this->isValidTag($tag)) {
             throw new \InvalidArgumentException('"' . $tag . '" is not a valid tag for a cache entry.', 1233058312);
         }
-        assert($this->backend instanceof TaggableBackendInterface);
+        $this->backend instanceof TaggableBackendInterface or throw new \InvalidArgumentException('Backend is not taggable', 12389123);
         $entries = [];
         $identifiers = $this->backend->findIdentifiersByTag($tag);
         foreach ($identifiers as $identifier) {

Classes/Cache/UriFrontend.php

@@ -19,7 +19,7 @@ public function __construct(private CookieService $cookieService) {}
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $feUser = $request->getAttribute('frontend.user');
-        assert($feUser instanceof FrontendUserAuthentication);
+        $feUser instanceof FrontendUserAuthentication or throw new \InvalidArgumentException('no frontend user attribite in the current request', 127389123);
 
         $response = $handler->handle($request);
 

Classes/Middleware/FrontendUserMiddleware.php

@@ -19,6 +19,7 @@
 use SFC\Staticfilecache\Service\DateTimeService;
 use TYPO3\CMS\Core\Http\ServerRequest;
 use TYPO3\CMS\Core\Information\Typo3Version;
+use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
 
 class GenerateMiddleware implements MiddlewareInterface
 {

Classes/Middleware/GenerateMiddleware.php

@@ -15,6 +15,7 @@
 use SFC\Staticfilecache\Service\ConfigurationService;
 use SFC\Staticfilecache\Service\HttpPushService;
 use SFC\Staticfilecache\Service\InlineAssetsService;
+use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
 
 class PrepareMiddleware implements MiddlewareInterface
 {

Classes/Middleware/PrepareMiddleware.php

@@ -14,10 +14,12 @@
         'staticfilecache/prepare' => [
             'target' => PrepareMiddleware::class,
             'before' => [
-                'typo3/cms-frontend/base-redirect-resolver',
+                'typo3/cms-core/cache-timeout',
             ],
             'after' => [
                 'typo3/cms-frontend/site',
+                'typo3/cms-frontend/page-resolver',
+                'typo3/cms-frontend/prepare-tsfe-rendering', // We need frontend.page.information
             ],
         ],
         'staticfilecache/generate' => [

Configuration/RequestMiddlewares.php

@@ -4,7 +4,6 @@
 
 use SFC\Staticfilecache\Cache\RemoteFileBackend;
 use SFC\Staticfilecache\Cache\StaticFileBackend;
-use SFC\Staticfilecache\Cache\StaticFileBackend13;
 use SFC\Staticfilecache\Cache\UriFrontend;
 use SFC\Staticfilecache\Hook\DatamapHook;
 use TYPO3\CMS\Core\Cache\Backend\NullBackend;
@@ -21,15 +20,11 @@
 $extensionConfig = (array)GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('staticfilecache');
 $useNullBackend = $extensionConfig['disableInDevelopment'] && Environment::getContext()->isDevelopment();
 
-$staticFileBackendClass = StaticFileBackend::class;
-if (GeneralUtility::makeInstance(Typo3Version::class)->getMajorVersion() < 14) {
-    $staticFileBackendClass = StaticFileBackend13::class;
-}
 
 
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['staticfilecache'] = [
     'frontend' => UriFrontend::class,
-    'backend' => $useNullBackend ? NullBackend::class : $staticFileBackendClass,
+    'backend' => $useNullBackend ? NullBackend::class : StaticFileBackend::class,
     'groups' => [
         'pages',
         'all',

ext_localconf.php

@@ -4,6 +4,3 @@ parameters:
 	paths:
 		- Classes
 		- Tests
-	excludePaths:
-		- Classes/Cache/StaticFileBackend.php
-		- Classes/Cache/StaticFileBackend13.php