Merge pull request #75 from helhum/stability-improvements

Author: helhum

Classes/Middleware/TypoScriptRenderingMiddleware.php

@@ -25,6 +25,7 @@
 class TypoScriptRenderingMiddleware implements MiddlewareInterface
 {
     private const argumentNamespace = 'tx_typoscriptrendering';
+    private const defaultContentType = 'text/html';
 
     /**
      * Dispatches the request to the corresponding typoscript_rendering configuration
@@ -37,20 +38,47 @@ class TypoScriptRenderingMiddleware implements MiddlewareInterface
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $frontendController = $GLOBALS['TSFE'];
+        $requestedContentType = $frontendController->config['config']['contentType'] ?? self::defaultContentType;
         if (!$frontendController->isGeneratePage() || !isset($request->getQueryParams()[self::argumentNamespace])) {
-            return $handler->handle($request);
+            return $this->amendContentType($handler->handle($request), $requestedContentType);
         }
         $this->ensureRequiredEnvironment();
 
+        $frontendController->config['config']['debug'] = 0;
         $frontendController->config['config']['disableAllHeaderCode'] = 1;
+        $frontendController->config['config']['disableCharsetHeader'] = 0;
         $frontendController->pSetup = [
             '10' => 'TYPOSCRIPT_RENDERING',
             '10.' => [
                 'request' => $request->getQueryParams()[self::argumentNamespace],
             ],
         ];
 
-        return $handler->handle($request);
+        return $this->amendContentType($handler->handle($request), $requestedContentType);
+    }
+
+    /**
+     * TYPO3's frontend rendering allows to influence the content type,
+     * but does not store this information in cache, which leads to wrong content type
+     * to be sent when content if pulled from cache.
+     * We add a tiny workaround, that allows plugins to set the content type, but also
+     * store the content type in cache:
+     *
+     * $GLOBALS['TSFE']->setContentType('application/json');
+     * $GLOBALS['TSFE']->config['config']['contentType'] = 'application/json';
+     *
+     * @param ResponseInterface $response
+     * @param string $requestedContentType
+     * @return ResponseInterface
+     */
+    private function amendContentType(ResponseInterface $response, string $requestedContentType): ResponseInterface
+    {
+        $originalContentTypeHeader = $response->getHeader('Content-Type')[0];
+        if (strpos($originalContentTypeHeader, self::defaultContentType) === 0 && strpos($originalContentTypeHeader, $requestedContentType) === false) {
+            $response = $response->withHeader('Content-Type', \str_replace(self::defaultContentType, $requestedContentType, $originalContentTypeHeader));
+        }
+
+        return $response;
     }
 
     /**

composer.json

@@ -22,7 +22,7 @@
     "license": "GPL-2.0-or-later",
     "require": {
         "php": "^7.2",
-        "typo3/cms-core": "^9.5 || ^10.4"
+        "typo3/cms-core": "^9.5.17 || ^10.4.2"
     },
     "require-dev": {
         "nimut/testing-framework": "^4.0 || ^5.0",