Merge pull request #418 from RayTM/master

[BUGFIX] Added missing middleware implementing frontend.cache.instruction for TYPO3 v13

Classes/Middleware/FrontendCacheMiddleware.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SFC\Staticfilecache\Middleware;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use TYPO3\CMS\Frontend\Cache\CacheInstruction;
+
+class FrontendCacheMiddleware implements MiddlewareInterface
+{
+    public function process(
+        ServerRequestInterface  $request,
+        RequestHandlerInterface $handler,
+    ): ResponseInterface
+    {
+        if (class_exists(CacheInstruction::class)) {
+            // Get the attribute, if not available, use a new CacheInstruction object
+            $cacheInstruction = $request->getAttribute(
+                'frontend.cache.instruction',
+                new CacheInstruction(),
+            );
+
+            // Disable the cache and give a reason
+            $cacheInstruction->disableCache('EXT:staticfilecache: Cache is disabled');
+
+            // Write back the cache instruction to the attribute
+            $request = $request->withAttribute('frontend.cache.instruction', $cacheInstruction);
+        }
+        return $handler->handle($request);
+    }
+}

Configuration/RequestMiddlewares.php

@@ -5,6 +5,7 @@
 use SFC\Staticfilecache\Middleware\CookieCheckMiddleware;
 use SFC\Staticfilecache\Middleware\FallbackMiddleware;
 use SFC\Staticfilecache\Middleware\FrontendUserMiddleware;
+use SFC\Staticfilecache\Middleware\FrontendCacheMiddleware;
 use SFC\Staticfilecache\Middleware\GenerateMiddleware;
 use SFC\Staticfilecache\Middleware\PrepareMiddleware;
 
@@ -40,6 +41,15 @@
                 'staticfilecache/generate',
             ],
         ],
+        'staticfilecache/frontend-cache' => [
+            'target' => FrontendCacheMiddleware::class,
+            'after' => [
+                'typo3/cms-frontend/authentication',
+            ],
+            'before' => [
+                'staticfilecache/generate',
+            ],
+        ],
         'staticfilecache/cookie-check' => [
             'target' => CookieCheckMiddleware::class,
             'before' => [