From d66fdf29a181510f43e73ebfc746475aec9fc1d2 Mon Sep 17 00:00:00 2001
From: Philipp Dieter <philipp.dieter@attic-media.net>
Date: Mon, 2 Dec 2024 18:44:51 +0100
Subject: [PATCH] [TASK] Work on compatibility for TYPO3 11

---
 Classes/Controller/ActionController.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Classes/Controller/ActionController.php b/Classes/Controller/ActionController.php
index ab29ca4..2cc9c7e 100644
--- a/Classes/Controller/ActionController.php
+++ b/Classes/Controller/ActionController.php
@@ -805,7 +805,12 @@ class ActionController extends BaseController
             if ($this->reload) {
                 $result['reload'] = true;
             }
-            return json_encode($result);
+            if (version_compare(TYPO3_branch, '10.0', '>=')) {
+                $response->getBody()->write(json_encode($result));
+                return $response;
+            } else {
+                return json_encode($result);
+            }
         }
         $result = array_merge(
             $result,
@@ -820,5 +825,12 @@ class ActionController extends BaseController
             );
         }
         $this->view->assignMultiple($result);
+        return $this
+            ->responseFactory
+            ->createResponse()
+            ->withHeader('Content-Type', 'text/html; charset=utf-8')
+            ->withBody($this->streamFactory->createStream(
+                (string)($html ?? $this->view->render()))
+            );
     }
 }