From 53c3ed41248b0694bcd3266ab6f1ef3555d8de26 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 28 Jan 2024 16:20:16 +0100
Subject: [PATCH 01/31] WIP: FEATURE: Fusion Runtime render directly http
 response

---
 Neos.Fusion/Classes/Core/Runtime.php          | 39 +++++++++++++++++-
 Neos.Fusion/Classes/View/FusionView.php       | 41 ++++++++++---------
 .../View/Fixtures/Fusion/HttpResponse.fusion  |  9 ++++
 .../View/Fixtures/Fusion/Root.fusion          |  4 ++
 .../Tests/Functional/View/FusionViewTest.php  | 36 ++++++++++++++++
 5 files changed, 108 insertions(+), 21 deletions(-)
 create mode 100644 Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/HttpResponse.fusion

diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 67e121b068b..43a62a70484 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -11,6 +11,10 @@
  * source code.
  */
 
+use GuzzleHttp\Psr7\Message;
+use GuzzleHttp\Psr7\Response;
+use GuzzleHttp\Psr7\Utils;
+use Psr\Http\Message\ResponseInterface;
 use Neos\Eel\Utility as EelUtility;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Configuration\Exception\InvalidConfigurationException;
@@ -302,6 +306,39 @@ public function getLastEvaluationStatus()
         return $this->lastEvaluationStatus;
     }
 
+    public function renderResponse(string $fusionPath, array $contextArray): ResponseInterface
+    {
+        foreach ($contextArray as $key => $_) {
+            if ($this->fusionGlobals->has($key)) {
+                throw new Exception(sprintf('Overriding Fusion global variable "%s" via @context is not allowed.', $key), 1706452063);
+            }
+        }
+        $this->pushContextArray($contextArray);
+        try {
+            $output = $this->render($fusionPath);
+        } finally {
+            $this->popContext();
+        }
+
+        /**
+         * parse potential raw http response possibly rendered via "Neos.Fusion:Http.Message"
+         * {@see \Neos\Fusion\FusionObjects\HttpResponseImplementation}
+         */
+        $outputStringHasHttpPreamble = is_string($output) && str_starts_with($output, 'HTTP/');
+        if ($outputStringHasHttpPreamble) {
+            return Message::parseResponse($output);
+        }
+
+        $stream = match(true) {
+            is_string($output),
+            $output instanceof \Stringable => Utils::streamFor((string)$output),
+            $output === null, $output === false => Utils::streamFor(''),
+            default => throw new \RuntimeException(sprintf('Cannot render %s into http response body.', get_debug_type($output)), 1706454898)
+        };
+
+        return new Response(body: $stream);
+    }
+
     /**
      * Render an absolute Fusion path and return the result.
      *
@@ -629,7 +666,7 @@ protected function prepareContextForFusionObject(AbstractFusionObject $fusionObj
             $newContextArray ??= $this->currentContext;
             foreach ($fusionConfiguration['__meta']['context'] as $contextKey => $contextValue) {
                 if ($this->fusionGlobals->has($contextKey)) {
-                    throw new Exception(sprintf('Overriding Fusion global variable "%s" via @context is not allowed.', $contextKey), 1694247627130);
+                    throw new Exception(sprintf('Overriding Fusion global variable "%s" via @context is not allowed.', $contextKey), 1706452069);
                 }
                 $newContextArray[$contextKey] = $this->evaluate($fusionPath . '/__meta/context/' . $contextKey, $fusionObject, self::BEHAVIOR_EXCEPTION);
             }
diff --git a/Neos.Fusion/Classes/View/FusionView.php b/Neos.Fusion/Classes/View/FusionView.php
index bf983346f4f..37392406a57 100644
--- a/Neos.Fusion/Classes/View/FusionView.php
+++ b/Neos.Fusion/Classes/View/FusionView.php
@@ -22,6 +22,7 @@
 use Neos\Fusion\Core\Runtime;
 use Neos\Fusion\Core\RuntimeFactory;
 use Neos\Fusion\Exception\RuntimeException;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * View for using Fusion for standard MVC controllers.
@@ -46,7 +47,8 @@ class FusionView extends AbstractView
         'fusionGlobals' => [null, 'Additional global variables; merged together with the "request". Must only be specified at creation.', FusionGlobals::class],
         'packageKey' => [null, 'The package key where the Fusion should be loaded from. If not given, is automatically derived from the current request.', 'string'],
         'debugMode' => [false, 'Flag to enable debug mode of the Fusion runtime explicitly (overriding the global setting).', 'boolean'],
-        'enableContentCache' => [false, 'Flag to enable content caching inside Fusion (overriding the global setting).', 'boolean']
+        'enableContentCache' => [false, 'Flag to enable content caching inside Fusion (overriding the global setting).', 'boolean'],
+        'renderHttpResponse' => [false, 'Flag to render fusion as http repose for advanced form support and Neos.Fusion:Http.ResponseHead support.', 'boolean'],
     ];
 
     /**
@@ -139,13 +141,29 @@ public function setFusionPathPatterns(array $pathPatterns)
     /**
      * Render the view
      *
-     * @return mixed The rendered view
+     * @return mixed|ResponseInterface The rendered view
      * @api
      */
     public function render()
     {
         $this->initializeFusionRuntime();
-        return $this->renderFusion();
+
+        if ($this->getOption('renderHttpResponse') === true) {
+            try {
+                return $this->fusionRuntime->renderResponse($this->getFusionPathForCurrentRequest(), $this->variables);
+            } catch (RuntimeException $exception) {
+                throw $exception->getPrevious();
+            }
+        } else {
+            try {
+                $this->fusionRuntime->pushContextArray($this->variables);
+                return $this->fusionRuntime->render($this->getFusionPathForCurrentRequest());
+            } catch (RuntimeException $exception) {
+                throw $exception->getPrevious();
+            } finally {
+                $this->fusionRuntime->popContext();
+            }
+        }
     }
 
     /**
@@ -283,21 +301,4 @@ protected function getFusionPathForCurrentRequest()
         }
         return $this->fusionPath;
     }
-
-    /**
-     * Render the given Fusion and return the rendered page
-     * @return mixed
-     * @throws \Exception
-     */
-    protected function renderFusion()
-    {
-        $this->fusionRuntime->pushContextArray($this->variables);
-        try {
-            $output = $this->fusionRuntime->render($this->getFusionPathForCurrentRequest());
-        } catch (RuntimeException $exception) {
-            throw $exception->getPrevious();
-        }
-        $this->fusionRuntime->popContext();
-        return $output;
-    }
 }
diff --git a/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/HttpResponse.fusion b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/HttpResponse.fusion
new file mode 100644
index 00000000000..d75b5c47d1f
--- /dev/null
+++ b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/HttpResponse.fusion
@@ -0,0 +1,9 @@
+
+response = Neos.Fusion:Http.Message {
+  httpResponseHead {
+    statusCode = 404
+    headers.Content-Type = 'application/json'
+  }
+
+  body = '{"some":"json"}'
+}
diff --git a/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion
index b190f6bd5a0..fbcf0fc40a3 100644
--- a/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion
+++ b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion
@@ -1 +1,5 @@
 include: ./**/*.fusion
+include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/Join.fusion'
+include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/DataStructure.fusion'
+include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/Http.Message.fusion'
+include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/Http.ResponseHead.fusion'
diff --git a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
index dc2f06d8ba9..629508c8643 100644
--- a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
+++ b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
@@ -15,6 +15,7 @@
 use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\Tests\FunctionalTestCase;
 use Neos\Fusion\View\FusionView;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Testcase for the Fusion View
@@ -64,6 +65,41 @@ public function fusionViewOutputsVariable()
         self::assertEquals('XHallo Welt', $view->render());
     }
 
+    /**
+     * @test
+     */
+    public function fusionViewCanReturnHttpResponse()
+    {
+        $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
+        $view->setOption('renderHttpResponse', true);
+        $view->assign('test', 'Hallo Welt');
+        $response = $view->render();
+        self::assertInstanceOf(ResponseInterface::class, $response);
+        self::assertEquals('XHallo Welt', $view->render()->getBody()->getContents());
+    }
+
+    /**
+     * @test
+     */
+    public function fusionViewCanReturnHttpResponseFromHttpMessagePrototype()
+    {
+        $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
+        $view->setFusionPath('response');
+        self::assertSame(<<<EOF
+        HTTP/1.1 404 Not Found\r
+        Content-Type: application/json\r
+        \r
+        {"some":"json"}
+        EOF, $view->render());
+
+        $view->setOption('renderHttpResponse', true);
+        $response = $view->render();
+        self::assertInstanceOf(ResponseInterface::class, $response);
+        self::assertSame('{"some":"json"}', $response->getBody()->getContents());
+        self::assertSame(404, $response->getStatusCode());
+        self::assertSame("application/json", $response->getHeaderLine("Content-Type"));
+    }
+
     /**
      * Prepare a FusionView for testing that Mocks a request with the given controller and action names.
      *

From bd64cdd7520b14fa9f4aff0ede03e97b0057d169 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 28 Jan 2024 16:24:23 +0100
Subject: [PATCH 02/31] WIP: Neos Fusion View use Runtime::renderResponse

---
 Neos.Neos/Classes/View/FusionView.php | 48 ++++-----------------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/Neos.Neos/Classes/View/FusionView.php b/Neos.Neos/Classes/View/FusionView.php
index 2f95ba9010f..0e5d019bb8f 100644
--- a/Neos.Neos/Classes/View/FusionView.php
+++ b/Neos.Neos/Classes/View/FusionView.php
@@ -57,11 +57,11 @@ class FusionView extends AbstractView
     /**
      * Renders the view
      *
-     * @return string|ResponseInterface The rendered view
+     * @return ResponseInterface The rendered view
      * @throws \Exception if no node is given
      * @api
      */
-    public function render(): string|ResponseInterface
+    public function render(): ResponseInterface
     {
         $currentNode = $this->getCurrentNode();
 
@@ -76,20 +76,15 @@ public function render(): string|ResponseInterface
 
         $this->setFallbackRuleFromDimension($currentNode->subgraphIdentity->dimensionSpacePoint);
 
-        $fusionRuntime->pushContextArray([
-            'node' => $currentNode,
-            'documentNode' => $this->getClosestDocumentNode($currentNode) ?: $currentNode,
-            'site' => $currentSiteNode
-        ]);
         try {
-            $output = $fusionRuntime->render($this->fusionPath);
-            $output = $this->parsePotentialRawHttpResponse($output);
+            return $fusionRuntime->renderResponse($this->fusionPath, [
+                'node' => $currentNode,
+                'documentNode' => $this->getClosestDocumentNode($currentNode) ?: $currentNode,
+                'site' => $currentSiteNode
+            ]);
         } catch (RuntimeException $exception) {
             throw $exception->getPrevious() ?: $exception;
         }
-        $fusionRuntime->popContext();
-
-        return $output;
     }
 
     /**
@@ -131,35 +126,6 @@ public function render(): string|ResponseInterface
      */
     protected $securityContext;
 
-    /**
-     * @param string $output
-     * @return string|ResponseInterface If output is a string with a HTTP preamble a ResponseInterface
-     *                                  otherwise the original output.
-     */
-    protected function parsePotentialRawHttpResponse($output)
-    {
-        if ($this->isRawHttpResponse($output)) {
-            return Message::parseResponse($output);
-        }
-
-        return $output;
-    }
-
-    /**
-     * Checks if the mixed input looks like a raw HTTTP response.
-     *
-     * @param mixed $value
-     * @return bool
-     */
-    protected function isRawHttpResponse($value): bool
-    {
-        if (is_string($value) && strpos($value, 'HTTP/') === 0) {
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Is it possible to render $node with $his->fusionPath?
      *

From 95169a6c7e711a3504610fe1362a5de9d7114a9e Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 28 Jan 2024 17:00:52 +0100
Subject: [PATCH 03/31] WIP: Hacky HttpResponseConstraints

---
 .../Classes/Core/HttpResponseConstraints.php  | 100 ++++++++++++++++++
 Neos.Fusion/Classes/Core/Runtime.php          |  11 +-
 2 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 Neos.Fusion/Classes/Core/HttpResponseConstraints.php

diff --git a/Neos.Fusion/Classes/Core/HttpResponseConstraints.php b/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
new file mode 100644
index 00000000000..89b58b3bdd3
--- /dev/null
+++ b/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\Fusion\Core;
+
+use GuzzleHttp\Psr7\Response;
+use Psr\Http\Message\ResponseInterface;
+
+final class HttpResponseConstraints
+{
+    private ResponseInterface $partialResponse;
+
+    public function __construct()
+    {
+        $this->partialResponse = new Response();
+    }
+
+    /**
+     * Gets the response status code.
+     *
+     * @return int Status code.
+     */
+    public function getStatusCode()
+    {
+        return $this->partialResponse->getStatusCode();
+    }
+
+    /**
+     * @param int $code The 3-digit integer result code to set.
+     */
+    public function setStatus(int $code)
+    {
+        $this->partialResponse = $this->partialResponse->withStatus($code);
+    }
+
+    /**
+     * Retrieves all message header values.
+     *
+     * While header names are not case-sensitive, getHeaders() will preserve the
+     * exact case in which headers were originally specified.
+     *
+     * @return string[][] Returns an associative array of the message's headers. Each
+     *     key MUST be a header name, and each value MUST be an array of strings
+     *     for that header.
+     */
+    public function getPartialResponse(): ResponseInterface
+    {
+        return $this->partialResponse->getHeaders();
+    }
+
+    /**
+     * While header names are case-insensitive, the casing of the header will
+     * be preserved by this function, and returned from getHeaders().
+     *
+     * @param string $name Case-insensitive header field name.
+     * @param string|string[] $value Header value(s).
+     */
+    public function setHeader(string $name, $value)
+    {
+        $this->partialResponse = $this->partialResponse->withHeader($name, $value);
+    }
+
+    /**
+     * Existing values for the specified header will be maintained. The new
+     * value(s) will be appended to the existing list. If the header did not
+     * exist previously, it will be added.
+     *
+     * @param string $name Case-insensitive header field name to add.
+     * @param string|string[] $value Header value(s).
+     */
+    public function setAndMergeHeader(string $name, $value)
+    {
+        $this->partialResponse = $this->partialResponse->withAddedHeader($name, $value);
+    }
+
+    /**
+     * @param string $name Case-insensitive header field name to remove.
+     */
+    public function unsetHeader(string $name)
+    {
+        $this->partialResponse = $this->partialResponse->withoutHeader($name);
+    }
+
+    public function applyToResponse(ResponseInterface $response): ResponseInterface
+    {
+        foreach ($this->partialResponse->getHeaders() as $name => $values) {
+            $response = $response->withAddedHeader($name, $values);
+        }
+
+        // preserve non 200 status codes that would otherwise be overwritten
+        if ($this->partialResponse->getStatusCode() !== 200) {
+            $response = $response->withStatus($this->partialResponse->getStatusCode());
+        }
+
+        $this->partialResponse = new Response();
+
+        return $response;
+    }
+}
diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 43a62a70484..dac7cb6a822 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -114,6 +114,8 @@ class Runtime
      */
     public readonly FusionGlobals $fusionGlobals;
 
+    public readonly HttpResponseConstraints $unsafeHttpResponseConstrains;
+
     /**
      * @var RuntimeConfiguration
      */
@@ -159,6 +161,7 @@ public function __construct(
         );
         $this->runtimeContentCache = new RuntimeContentCache($this);
         $this->fusionGlobals = $fusionGlobals;
+        $this->unsafeHttpResponseConstrains = new HttpResponseConstraints();
     }
 
     /**
@@ -326,7 +329,9 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
          */
         $outputStringHasHttpPreamble = is_string($output) && str_starts_with($output, 'HTTP/');
         if ($outputStringHasHttpPreamble) {
-            return Message::parseResponse($output);
+            return $this->unsafeHttpResponseConstrains->applyToResponse(
+                Message::parseResponse($output)
+            );
         }
 
         $stream = match(true) {
@@ -336,7 +341,9 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
             default => throw new \RuntimeException(sprintf('Cannot render %s into http response body.', get_debug_type($output)), 1706454898)
         };
 
-        return new Response(body: $stream);
+        return $this->unsafeHttpResponseConstrains->applyToResponse(
+            new Response(body: $stream)
+        );
     }
 
     /**

From d567bdc2f2dbf9643cc67406b92c9fbac9bd2d14 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 28 Jan 2024 17:21:09 +0100
Subject: [PATCH 04/31] WIP: Hurray make Runtime independent of
 ControllerContext

+ working legacy layer for manipulating getResponse and accessing getRequest
---
 .../Classes/Core/HttpResponseConstraints.php  | 14 +++++
 Neos.Fusion/Classes/Core/Runtime.php          | 55 +++++++++----------
 Neos.Fusion/Classes/Core/RuntimeFactory.php   | 26 ++-------
 Neos.Fusion/Classes/View/FusionView.php       |  3 -
 .../Classes/View/FusionExceptionView.php      |  1 -
 Neos.Neos/Classes/View/FusionView.php         |  1 -
 6 files changed, 45 insertions(+), 55 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/HttpResponseConstraints.php b/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
index 89b58b3bdd3..7b774c36e73 100644
--- a/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
+++ b/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
@@ -5,6 +5,7 @@
 namespace Neos\Fusion\Core;
 
 use GuzzleHttp\Psr7\Response;
+use Neos\Flow\Mvc\ActionResponse;
 use Psr\Http\Message\ResponseInterface;
 
 final class HttpResponseConstraints
@@ -16,6 +17,19 @@ public function __construct()
         $this->partialResponse = new Response();
     }
 
+    /**
+     * @deprecated
+     */
+    public static function createFromActionResponse(?ActionResponse $actionResponse)
+    {
+        $constraints = new self();
+        if (!$actionResponse) {
+            return $constraints;
+        }
+        $constraints->partialResponse = $actionResponse->buildHttpResponse();
+        return $constraints;
+    }
+
     /**
      * Gets the response status code.
      *
diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index dac7cb6a822..33fad6bc8f5 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -124,7 +124,7 @@ class Runtime
     /**
      * @deprecated
      */
-    protected ControllerContext $controllerContext;
+    protected ?ControllerContext $controllerContext = null;
 
     /**
      * @var array
@@ -164,15 +164,6 @@ public function __construct(
         $this->unsafeHttpResponseConstrains = new HttpResponseConstraints();
     }
 
-    /**
-     * @deprecated {@see self::getControllerContext()}
-     * @internal
-     */
-    public function setControllerContext(ControllerContext $controllerContext): void
-    {
-        $this->controllerContext = $controllerContext;
-    }
-
     /**
      * Returns the context which has been passed by the currently active MVC Controller
      *
@@ -183,23 +174,10 @@ public function setControllerContext(ControllerContext $controllerContext): void
      */
     public function getControllerContext(): ControllerContext
     {
-        if (isset($this->controllerContext)) {
-            return $this->controllerContext;
-        }
-
-        if (!($request = $this->fusionGlobals->get('request')) instanceof ActionRequest) {
-            throw new Exception(sprintf('Expected Fusion variable "request" to be of type ActionRequest, got value of type "%s".', get_debug_type($request)), 1693558026485);
+        if ($this->controllerContext === null) {
+            throw new Exception(sprintf('Legacy controller context in runtime is only available when fusion global "request" is a ActionRequest and during "renderResponse".'), 1706458355);
         }
-
-        $uriBuilder = new UriBuilder();
-        $uriBuilder->setRequest($request);
-
-        return $this->controllerContext = new ControllerContext(
-            $request,
-            new ActionResponse(),
-            new Arguments([]),
-            $uriBuilder
-        );
+        return $this->controllerContext;
     }
 
     /**
@@ -311,6 +289,20 @@ public function getLastEvaluationStatus()
 
     public function renderResponse(string $fusionPath, array $contextArray): ResponseInterface
     {
+        // legacy controller context layer
+        $possibleRequest = $this->fusionGlobals->get('request');
+        if ($possibleRequest instanceof ActionRequest) {
+            $uriBuilder = new UriBuilder();
+            $uriBuilder->setRequest($possibleRequest);
+
+            $this->controllerContext = new ControllerContext(
+                $possibleRequest,
+                new ActionResponse(),
+                new Arguments([]),
+                $uriBuilder
+            );
+        }
+
         foreach ($contextArray as $key => $_) {
             if ($this->fusionGlobals->has($key)) {
                 throw new Exception(sprintf('Overriding Fusion global variable "%s" via @context is not allowed.', $key), 1706452063);
@@ -323,6 +315,9 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
             $this->popContext();
         }
 
+        $legacyControllerContextResponseConstraints = HttpResponseConstraints::createFromActionResponse($this->controllerContext?->getResponse());
+        $this->controllerContext = null;
+
         /**
          * parse potential raw http response possibly rendered via "Neos.Fusion:Http.Message"
          * {@see \Neos\Fusion\FusionObjects\HttpResponseImplementation}
@@ -330,7 +325,9 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
         $outputStringHasHttpPreamble = is_string($output) && str_starts_with($output, 'HTTP/');
         if ($outputStringHasHttpPreamble) {
             return $this->unsafeHttpResponseConstrains->applyToResponse(
-                Message::parseResponse($output)
+                $legacyControllerContextResponseConstraints->applyToResponse(
+                    Message::parseResponse($output)
+                )
             );
         }
 
@@ -342,7 +339,9 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
         };
 
         return $this->unsafeHttpResponseConstrains->applyToResponse(
-            new Response(body: $stream)
+            $legacyControllerContextResponseConstraints->applyToResponse(
+                new Response(body: $stream)
+            )
         );
     }
 
diff --git a/Neos.Fusion/Classes/Core/RuntimeFactory.php b/Neos.Fusion/Classes/Core/RuntimeFactory.php
index 8cd07a696d8..738d631f528 100644
--- a/Neos.Fusion/Classes/Core/RuntimeFactory.php
+++ b/Neos.Fusion/Classes/Core/RuntimeFactory.php
@@ -45,19 +45,18 @@ class RuntimeFactory
      */
     public function create(array $fusionConfiguration, ControllerContext $controllerContext = null): Runtime
     {
-        if ($controllerContext === null) {
-            $controllerContext = self::createControllerContextFromEnvironment();
-        }
         $defaultContextVariables = EelUtility::getDefaultContextVariables(
             $this->defaultContextConfiguration ?? []
         );
         $runtime = new Runtime(
             FusionConfiguration::fromArray($fusionConfiguration),
             FusionGlobals::fromArray(
-                ['request' => $controllerContext->getRequest(), ...$defaultContextVariables]
+                [
+                    'request' => $controllerContext?->getRequest() ?? ActionRequest::fromHttpRequest(ServerRequest::fromGlobals()),
+                    ...$defaultContextVariables
+                ]
             )
         );
-        $runtime->setControllerContext($controllerContext);
         return $runtime;
     }
 
@@ -82,21 +81,4 @@ public function createFromSourceCode(
             $fusionGlobals
         );
     }
-
-    private static function createControllerContextFromEnvironment(): ControllerContext
-    {
-        $httpRequest = ServerRequest::fromGlobals();
-
-        $request = ActionRequest::fromHttpRequest($httpRequest);
-
-        $uriBuilder = new UriBuilder();
-        $uriBuilder->setRequest($request);
-
-        return new ControllerContext(
-            $request,
-            new ActionResponse(),
-            new Arguments([]),
-            $uriBuilder
-        );
-    }
 }
diff --git a/Neos.Fusion/Classes/View/FusionView.php b/Neos.Fusion/Classes/View/FusionView.php
index 37392406a57..bdc4413e113 100644
--- a/Neos.Fusion/Classes/View/FusionView.php
+++ b/Neos.Fusion/Classes/View/FusionView.php
@@ -194,9 +194,6 @@ public function initializeFusionRuntime()
                 $this->parsedFusion,
                 $fusionGlobals
             );
-            if (isset($this->controllerContext)) {
-                $this->fusionRuntime->setControllerContext($this->controllerContext);
-            }
         }
         if (isset($this->options['debugMode'])) {
             $this->fusionRuntime->setDebugMode($this->options['debugMode']);
diff --git a/Neos.Neos/Classes/View/FusionExceptionView.php b/Neos.Neos/Classes/View/FusionExceptionView.php
index bf4807b0e65..46241f48729 100644
--- a/Neos.Neos/Classes/View/FusionExceptionView.php
+++ b/Neos.Neos/Classes/View/FusionExceptionView.php
@@ -216,7 +216,6 @@ protected function getFusionRuntime(
                 $fusionConfiguration,
                 $fusionGlobals
             );
-            $this->fusionRuntime->setControllerContext($controllerContext);
 
             if (isset($this->options['enableContentCache']) && $this->options['enableContentCache'] !== null) {
                 $this->fusionRuntime->setEnableContentCache($this->options['enableContentCache']);
diff --git a/Neos.Neos/Classes/View/FusionView.php b/Neos.Neos/Classes/View/FusionView.php
index 0e5d019bb8f..82e29a29634 100644
--- a/Neos.Neos/Classes/View/FusionView.php
+++ b/Neos.Neos/Classes/View/FusionView.php
@@ -212,7 +212,6 @@ protected function getFusionRuntime(Node $currentSiteNode)
                 $fusionConfiguration,
                 $fusionGlobals
             );
-            $this->fusionRuntime->setControllerContext($this->controllerContext);
 
             if (isset($this->options['enableContentCache']) && $this->options['enableContentCache'] !== null) {
                 $this->fusionRuntime->setEnableContentCache($this->options['enableContentCache']);

From 1aeaa49a97f7485f4d474d3a20b46bffc5ffcedc Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 28 Jan 2024 17:28:15 +0100
Subject: [PATCH 05/31] WIP: Migrate PluginImplementation to use
 `unsafeHttpResponseConstrains`

---
 Neos.Fusion/Classes/Core/HttpResponseConstraints.php | 9 ++-------
 Neos.Fusion/Classes/Core/Runtime.php                 | 5 ++++-
 Neos.Neos/Classes/Fusion/PluginImplementation.php    | 7 +------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/HttpResponseConstraints.php b/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
index 7b774c36e73..2c7a98df064 100644
--- a/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
+++ b/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
@@ -20,14 +20,9 @@ public function __construct()
     /**
      * @deprecated
      */
-    public static function createFromActionResponse(?ActionResponse $actionResponse)
+    public function setAndMergeFromActionResponse(ActionResponse $actionResponse)
     {
-        $constraints = new self();
-        if (!$actionResponse) {
-            return $constraints;
-        }
-        $constraints->partialResponse = $actionResponse->buildHttpResponse();
-        return $constraints;
+        $this->partialResponse = $this->applyToResponse($actionResponse->buildHttpResponse());
     }
 
     /**
diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 33fad6bc8f5..6e2e26ffe2a 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -315,7 +315,10 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
             $this->popContext();
         }
 
-        $legacyControllerContextResponseConstraints = HttpResponseConstraints::createFromActionResponse($this->controllerContext?->getResponse());
+        $legacyControllerContextResponseConstraints = new HttpResponseConstraints();
+        if ($this->controllerContext) {
+            $legacyControllerContextResponseConstraints->setAndMergeFromActionResponse($this->controllerContext->getResponse());
+        }
         $this->controllerContext = null;
 
         /**
diff --git a/Neos.Neos/Classes/Fusion/PluginImplementation.php b/Neos.Neos/Classes/Fusion/PluginImplementation.php
index c623542afd9..02c388453f5 100644
--- a/Neos.Neos/Classes/Fusion/PluginImplementation.php
+++ b/Neos.Neos/Classes/Fusion/PluginImplementation.php
@@ -166,17 +166,12 @@ public function evaluate(): string
         $currentContext = $this->runtime->getCurrentContext();
         $this->node = $currentContext['node'];
         $this->documentNode = $currentContext['documentNode'];
-        $parentResponse = $this->runtime->getControllerContext()->getResponse();
         $pluginResponse = new ActionResponse();
         $this->dispatcher->dispatch($this->buildPluginRequest(), $pluginResponse);
 
-        // We need to make sure to not merge content up into the parent ActionResponse
-        // because that would break the Fusion HttpResponse.
         $content = $pluginResponse->getContent();
-        $pluginResponse->setContent('');
-
-        $pluginResponse->mergeIntoParentResponse($parentResponse);
 
+        $this->runtime->unsafeHttpResponseConstrains->setAndMergeFromActionResponse($pluginResponse);
         return $content;
     }
 

From b9128fb239cbbfcfd8677b465be62bcf29ddeeda Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 28 Jan 2024 17:44:41 +0100
Subject: [PATCH 06/31] WIP: FusionObject to not depend on the controller
 context

---
 .../FusionObjects/TemplateImplementation.php     |  2 +-
 .../FusionObjects/UriBuilderImplementation.php   | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Neos.Fusion/Classes/FusionObjects/TemplateImplementation.php b/Neos.Fusion/Classes/FusionObjects/TemplateImplementation.php
index 2287410a718..4ccc72f2381 100644
--- a/Neos.Fusion/Classes/FusionObjects/TemplateImplementation.php
+++ b/Neos.Fusion/Classes/FusionObjects/TemplateImplementation.php
@@ -79,7 +79,7 @@ public function getPath()
      */
     public function evaluate()
     {
-        $actionRequest =  $this->runtime->getControllerContext()->getRequest();
+        $actionRequest = $this->runtime->fusionGlobals->get('request');
         if (!$actionRequest instanceof ActionRequest) {
             $actionRequest = null;
         }
diff --git a/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php b/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php
index ce3ef08ae15..032992e051a 100644
--- a/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php
+++ b/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php
@@ -11,6 +11,10 @@
  * source code.
  */
 
+use GuzzleHttp\Psr7\ServerRequest;
+use Neos\Flow\Mvc\ActionRequest;
+use Neos\Flow\Mvc\Routing\UriBuilder;
+
 
 /**
  * A Fusion UriBuilder object
@@ -150,8 +154,16 @@ public function isAbsolute()
      */
     public function evaluate()
     {
-        $controllerContext = $this->runtime->getControllerContext();
-        $uriBuilder = $controllerContext->getUriBuilder()->reset();
+        $uriBuilder = new UriBuilder();
+        $possibleRequest = $this->runtime->fusionGlobals->get('request');
+        if ($possibleRequest instanceof ActionRequest) {
+            $uriBuilder->setRequest($possibleRequest);
+        } else {
+            // legacy
+            $uriBuilder->setRequest(
+                ActionRequest::fromHttpRequest(ServerRequest::fromGlobals())
+            );
+        }
 
         $format = $this->getFormat();
         if ($format !== null) {

From c3d36813068ae6a007a90350e3501b40dbbe5cc7 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 28 Jan 2024 18:49:53 +0100
Subject: [PATCH 07/31] WIP: Skip non working test :(

---
 .../Classes/Core/HttpResponseConstraints.php  |  1 +
 Neos.Fusion/Classes/Core/Runtime.php          |  2 +-
 Neos.Fusion/Classes/Core/RuntimeFactory.php   |  3 ---
 .../UriBuilderImplementation.php              |  1 -
 .../Unit/Fusion/PluginImplementationTest.php  | 21 +++++++++++++++----
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/HttpResponseConstraints.php b/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
index 2c7a98df064..2f572cf6471 100644
--- a/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
+++ b/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
@@ -102,6 +102,7 @@ public function applyToResponse(ResponseInterface $response): ResponseInterface
             $response = $response->withStatus($this->partialResponse->getStatusCode());
         }
 
+        // reset internal state
         $this->partialResponse = new Response();
 
         return $response;
diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 6e2e26ffe2a..b84f4b45fd2 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -334,7 +334,7 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
             );
         }
 
-        $stream = match(true) {
+        $stream = match (true) {
             is_string($output),
             $output instanceof \Stringable => Utils::streamFor((string)$output),
             $output === null, $output === false => Utils::streamFor(''),
diff --git a/Neos.Fusion/Classes/Core/RuntimeFactory.php b/Neos.Fusion/Classes/Core/RuntimeFactory.php
index 738d631f528..252c45170df 100644
--- a/Neos.Fusion/Classes/Core/RuntimeFactory.php
+++ b/Neos.Fusion/Classes/Core/RuntimeFactory.php
@@ -15,10 +15,7 @@
 use Neos\Eel\Utility as EelUtility;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\ActionRequest;
-use Neos\Flow\Mvc\ActionResponse;
-use Neos\Flow\Mvc\Controller\Arguments;
 use Neos\Flow\Mvc\Controller\ControllerContext;
-use Neos\Flow\Mvc\Routing\UriBuilder;
 
 /**
  * @Flow\Scope("singleton")
diff --git a/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php b/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php
index 032992e051a..2e0eae65ff3 100644
--- a/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php
+++ b/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php
@@ -15,7 +15,6 @@
 use Neos\Flow\Mvc\ActionRequest;
 use Neos\Flow\Mvc\Routing\UriBuilder;
 
-
 /**
  * A Fusion UriBuilder object
  *
diff --git a/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php b/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
index e8aff26d8ea..90c721757bb 100644
--- a/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
+++ b/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
@@ -11,6 +11,7 @@
  * source code.
  */
 
+use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Uri;
 use Neos\Flow\Mvc\ActionRequest;
 use Neos\Flow\Mvc\ActionResponse;
@@ -18,6 +19,8 @@
 use Neos\Flow\Mvc\Dispatcher;
 use Neos\Flow\Mvc\RequestInterface;
 use Neos\Flow\Tests\UnitTestCase;
+use Neos\Fusion\Core\FusionConfiguration;
+use Neos\Fusion\Core\FusionGlobals;
 use Neos\Fusion\Core\Runtime;
 use Neos\Neos\Fusion\PluginImplementation;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -79,7 +82,7 @@ public function setUp(): void
         $this->mockControllerContext = $this->getMockBuilder(ControllerContext::class)->disableOriginalConstructor()->getMock();
         $this->mockControllerContext->method('getRequest')->willReturn($this->mockActionRequest);
 
-        $this->mockRuntime = $this->getMockBuilder(Runtime::class)->disableOriginalConstructor()->getMock();
+        $this->mockRuntime = $this->getMockBuilder(Runtime::class)->setConstructorArgs([FusionConfiguration::fromArray([]), FusionGlobals::fromArray([])])->getMock();
         $this->mockRuntime->method('getControllerContext')->willReturn($this->mockControllerContext);
         $this->pluginImplementation->_set('runtime', $this->mockRuntime);
 
@@ -96,12 +99,12 @@ public function responseHeadersDataProvider(): array
             [
                 'Plugin response key does already exist in parent with same value',
                 ['parent' => ['key' => 'value'], 'plugin' => ['key' => 'value']],
-                ['key' => 'value']
+                ['key' => 'value'] // 'value, value'
             ],
             [
                 'Plugin response key does not exist in parent with different value',
                 ['parent' => ['key' => 'value'], 'plugin' => ['key' => 'otherValue']],
-                ['key' => 'otherValue']
+                ['key' => 'otherValue'] // 'otherValue, value'
             ],
             [
                 'Plugin response key does not exist in parent',
@@ -119,6 +122,8 @@ public function responseHeadersDataProvider(): array
      */
     public function evaluateSetHeaderIntoParent(string $message, array $input, array $expected): void
     {
+        $this->markTestSkipped('DOESNT WORK.');
+
         $this->pluginImplementation->method('buildPluginRequest')->willReturn($this->mockActionRequest);
 
         $parentResponse = new ActionResponse();
@@ -133,8 +138,16 @@ public function evaluateSetHeaderIntoParent(string $message, array $input, array
 
         $this->pluginImplementation->evaluate();
 
+        // in the runtime would be:
+        $runtimeResponse = $this->mockRuntime->unsafeHttpResponseConstrains->applyToResponse(new Response());
+
+        // in the action would be:
+        $parentResponse->replaceHttpResponse($runtimeResponse);
+
         foreach ($expected as $expectedKey => $expectedValue) {
-            self::assertEquals($expectedValue, (string)$parentResponse->getHttpHeader($expectedKey), $message);
+            // previously tests succeeded:
+            // self::assertEquals($expectedValue, join(', ', \Neos\Utility\ObjectAccess::getProperty($parentResponse, 'headers', true)[$expectedKey]), $message);
+            self::assertEquals($expectedValue, $parentResponse->buildHttpResponse()->getHeaderLine($expectedKey), $message);
         }
     }
 

From 6ae0b24687336371e32b2646dec49945c7b7af1b Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Tue, 30 Jan 2024 14:24:11 +0100
Subject: [PATCH 08/31] TASK: Migrate further fusion objects to
 `$this->runtime->fusionGlobals->get('request');`

---
 .../UriBuilderImplementation.php              |  5 +++-
 .../Fusion/ConvertUrisImplementation.php      | 26 +++++++++++++++----
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php b/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php
index 2e0eae65ff3..f59cdde7359 100644
--- a/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php
+++ b/Neos.Fusion/Classes/FusionObjects/UriBuilderImplementation.php
@@ -158,7 +158,10 @@ public function evaluate()
         if ($possibleRequest instanceof ActionRequest) {
             $uriBuilder->setRequest($possibleRequest);
         } else {
-            // legacy
+            // unfortunately, the uri-builder always needs a request at hand and cannot build uris without
+            // even, if the default param merging would not be required
+            // this will improve with a reformed uri building:
+            // https://github.com/neos/flow-development-collection/pull/2744
             $uriBuilder->setRequest(
                 ActionRequest::fromHttpRequest(ServerRequest::fromGlobals())
             );
diff --git a/Neos.Neos/Classes/Fusion/ConvertUrisImplementation.php b/Neos.Neos/Classes/Fusion/ConvertUrisImplementation.php
index 0254272e55d..99cc98edb44 100644
--- a/Neos.Neos/Classes/Fusion/ConvertUrisImplementation.php
+++ b/Neos.Neos/Classes/Fusion/ConvertUrisImplementation.php
@@ -14,11 +14,13 @@
 
 namespace Neos\Neos\Fusion;
 
+use GuzzleHttp\Psr7\ServerRequest;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Log\Utility\LogEnvironment;
+use Neos\Flow\Mvc\ActionRequest;
 use Neos\Flow\Mvc\Exception\NoMatchingRouteException;
 use Neos\Flow\Mvc\Routing\UriBuilder;
 use Neos\Flow\ResourceManagement\ResourceManager;
@@ -103,7 +105,6 @@ class ConvertUrisImplementation extends AbstractFusionObject
      */
     public function evaluate()
     {
-
         $text = $this->fusionValue('value');
 
         if ($text === '' || $text === null) {
@@ -149,12 +150,23 @@ public function evaluate()
                         NodeAggregateId::fromString($matches[2])
                     );
                     $uriBuilder = new UriBuilder();
-                    $uriBuilder->setRequest($this->runtime->getControllerContext()->getRequest());
+                    $possibleRequest = $this->runtime->fusionGlobals->get('request');
+                    if ($possibleRequest instanceof ActionRequest) {
+                        $uriBuilder->setRequest($possibleRequest);
+                    } else {
+                        // unfortunately, the uri-builder always needs a request at hand and cannot build uris without
+                        // even, if the default param merging would not be required
+                        // this will improve with a reformed uri building:
+                        // https://github.com/neos/flow-development-collection/pull/2744
+                        $uriBuilder->setRequest(
+                            ActionRequest::fromHttpRequest(ServerRequest::fromGlobals())
+                        );
+                    }
                     $uriBuilder->setCreateAbsoluteUri($absolute);
                     try {
                         $resolvedUri = (string)NodeUriBuilder::fromUriBuilder($uriBuilder)->uriFor($nodeAddress);
                     } catch (NoMatchingRouteException) {
-                        $this->systemLogger->warning(sprintf('Could not resolve "%s" to a node uri. Arguments: %s', $matches[0], json_encode($uriBuilder->getLastArguments())), LogEnvironment::fromMethodName(__METHOD__));
+                        $this->systemLogger->info(sprintf('Could not resolve "%s" to a live node uri. Arguments: %s', $matches[0], json_encode($uriBuilder->getLastArguments())), LogEnvironment::fromMethodName(__METHOD__));
                     }
                     $this->runtime->addCacheTag(
                         CacheTag::forDynamicNodeAggregate($contentRepository->id, $nodeAddress->contentStreamId, NodeAggregateId::fromString($matches[2]))->value
@@ -205,8 +217,12 @@ protected function replaceLinkTargets($processedContent)
         $setExternal = $this->fusionValue('setExternal');
         $externalLinkTarget = \trim((string)$this->fusionValue('externalLinkTarget'));
         $resourceLinkTarget = \trim((string)$this->fusionValue('resourceLinkTarget'));
-        $controllerContext = $this->runtime->getControllerContext();
-        $host = $controllerContext->getRequest()->getHttpRequest()->getUri()->getHost();
+        $possibleRequest = $this->runtime->fusionGlobals->get('request');
+        if ($possibleRequest instanceof ActionRequest) {
+            $host = $possibleRequest->getHttpRequest()->getUri()->getHost();
+        } else {
+            $host = null;
+        }
         $processedContent = \preg_replace_callback(
             '~<a\s+.*?href="(.*?)".*?>~i',
             static function ($matches) use ($externalLinkTarget, $resourceLinkTarget, $host, $setNoOpener, $setExternal) {

From 6298673e9d492ec56f7fe77196ff8c8f964cf25b Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Tue, 30 Jan 2024 14:42:48 +0100
Subject: [PATCH 09/31] Revert introduction of `HttpResponseConstraints` and
 api in runtime to allow setting headers dynamically

Instead, the legacy layer

> $this->runtime->getControllerContext()->getResponse();

should be continued to be used by fusion forms and fusion plugin impl.
---
 .../Classes/Core/HttpResponseConstraints.php  | 110 ------------------
 Neos.Fusion/Classes/Core/Runtime.php          |  49 ++++----
 .../Classes/Fusion/PluginImplementation.php   |   7 +-
 .../Unit/Fusion/PluginImplementationTest.php  |  21 +---
 4 files changed, 39 insertions(+), 148 deletions(-)
 delete mode 100644 Neos.Fusion/Classes/Core/HttpResponseConstraints.php

diff --git a/Neos.Fusion/Classes/Core/HttpResponseConstraints.php b/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
deleted file mode 100644
index 2f572cf6471..00000000000
--- a/Neos.Fusion/Classes/Core/HttpResponseConstraints.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Neos\Fusion\Core;
-
-use GuzzleHttp\Psr7\Response;
-use Neos\Flow\Mvc\ActionResponse;
-use Psr\Http\Message\ResponseInterface;
-
-final class HttpResponseConstraints
-{
-    private ResponseInterface $partialResponse;
-
-    public function __construct()
-    {
-        $this->partialResponse = new Response();
-    }
-
-    /**
-     * @deprecated
-     */
-    public function setAndMergeFromActionResponse(ActionResponse $actionResponse)
-    {
-        $this->partialResponse = $this->applyToResponse($actionResponse->buildHttpResponse());
-    }
-
-    /**
-     * Gets the response status code.
-     *
-     * @return int Status code.
-     */
-    public function getStatusCode()
-    {
-        return $this->partialResponse->getStatusCode();
-    }
-
-    /**
-     * @param int $code The 3-digit integer result code to set.
-     */
-    public function setStatus(int $code)
-    {
-        $this->partialResponse = $this->partialResponse->withStatus($code);
-    }
-
-    /**
-     * Retrieves all message header values.
-     *
-     * While header names are not case-sensitive, getHeaders() will preserve the
-     * exact case in which headers were originally specified.
-     *
-     * @return string[][] Returns an associative array of the message's headers. Each
-     *     key MUST be a header name, and each value MUST be an array of strings
-     *     for that header.
-     */
-    public function getPartialResponse(): ResponseInterface
-    {
-        return $this->partialResponse->getHeaders();
-    }
-
-    /**
-     * While header names are case-insensitive, the casing of the header will
-     * be preserved by this function, and returned from getHeaders().
-     *
-     * @param string $name Case-insensitive header field name.
-     * @param string|string[] $value Header value(s).
-     */
-    public function setHeader(string $name, $value)
-    {
-        $this->partialResponse = $this->partialResponse->withHeader($name, $value);
-    }
-
-    /**
-     * Existing values for the specified header will be maintained. The new
-     * value(s) will be appended to the existing list. If the header did not
-     * exist previously, it will be added.
-     *
-     * @param string $name Case-insensitive header field name to add.
-     * @param string|string[] $value Header value(s).
-     */
-    public function setAndMergeHeader(string $name, $value)
-    {
-        $this->partialResponse = $this->partialResponse->withAddedHeader($name, $value);
-    }
-
-    /**
-     * @param string $name Case-insensitive header field name to remove.
-     */
-    public function unsetHeader(string $name)
-    {
-        $this->partialResponse = $this->partialResponse->withoutHeader($name);
-    }
-
-    public function applyToResponse(ResponseInterface $response): ResponseInterface
-    {
-        foreach ($this->partialResponse->getHeaders() as $name => $values) {
-            $response = $response->withAddedHeader($name, $values);
-        }
-
-        // preserve non 200 status codes that would otherwise be overwritten
-        if ($this->partialResponse->getStatusCode() !== 200) {
-            $response = $response->withStatus($this->partialResponse->getStatusCode());
-        }
-
-        // reset internal state
-        $this->partialResponse = new Response();
-
-        return $response;
-    }
-}
diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index b84f4b45fd2..2f685ba18e0 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -114,8 +114,6 @@ class Runtime
      */
     public readonly FusionGlobals $fusionGlobals;
 
-    public readonly HttpResponseConstraints $unsafeHttpResponseConstrains;
-
     /**
      * @var RuntimeConfiguration
      */
@@ -161,7 +159,6 @@ public function __construct(
         );
         $this->runtimeContentCache = new RuntimeContentCache($this);
         $this->fusionGlobals = $fusionGlobals;
-        $this->unsafeHttpResponseConstrains = new HttpResponseConstraints();
     }
 
     /**
@@ -291,13 +288,16 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
     {
         // legacy controller context layer
         $possibleRequest = $this->fusionGlobals->get('request');
+        $legacyActionResponse = null;
         if ($possibleRequest instanceof ActionRequest) {
             $uriBuilder = new UriBuilder();
             $uriBuilder->setRequest($possibleRequest);
 
             $this->controllerContext = new ControllerContext(
                 $possibleRequest,
-                new ActionResponse(),
+                // expose action response to be possibly mutated in neos forms or fusion plugins.
+                // this behaviour is highly internal and deprecated!
+                $legacyActionResponse = new ActionResponse(),
                 new Arguments([]),
                 $uriBuilder
             );
@@ -315,23 +315,18 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
             $this->popContext();
         }
 
-        $legacyControllerContextResponseConstraints = new HttpResponseConstraints();
-        if ($this->controllerContext) {
-            $legacyControllerContextResponseConstraints->setAndMergeFromActionResponse($this->controllerContext->getResponse());
-        }
-        $this->controllerContext = null;
-
         /**
          * parse potential raw http response possibly rendered via "Neos.Fusion:Http.Message"
          * {@see \Neos\Fusion\FusionObjects\HttpResponseImplementation}
          */
         $outputStringHasHttpPreamble = is_string($output) && str_starts_with($output, 'HTTP/');
         if ($outputStringHasHttpPreamble) {
-            return $this->unsafeHttpResponseConstrains->applyToResponse(
-                $legacyControllerContextResponseConstraints->applyToResponse(
-                    Message::parseResponse($output)
-                )
-            );
+            $response = Message::parseResponse($output);
+            if ($legacyActionResponse) {
+                $response = self::applyActionResponseToPsrResponse($legacyActionResponse, $response);
+                $this->controllerContext = null;
+            }
+            return $response;
         }
 
         $stream = match (true) {
@@ -341,11 +336,25 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
             default => throw new \RuntimeException(sprintf('Cannot render %s into http response body.', get_debug_type($output)), 1706454898)
         };
 
-        return $this->unsafeHttpResponseConstrains->applyToResponse(
-            $legacyControllerContextResponseConstraints->applyToResponse(
-                new Response(body: $stream)
-            )
-        );
+        $response = new Response(body: $stream);
+        if ($legacyActionResponse) {
+            $response = self::applyActionResponseToPsrResponse($legacyActionResponse, $response);
+            $this->controllerContext = null;
+        }
+        return $response;
+    }
+
+    private static function applyActionResponseToPsrResponse(ActionResponse $actionResponse, ResponseInterface $response): ResponseInterface
+    {
+        $actionResponseAsHttp = $actionResponse->buildHttpResponse();
+        foreach ($actionResponseAsHttp->getHeaders() as $name => $values) {
+            $response = $response->withAddedHeader($name, $values);
+        }
+        // preserve non 200 status codes that would otherwise be overwritten
+        if ($actionResponseAsHttp->getStatusCode() !== 200) {
+            $response = $response->withStatus($actionResponseAsHttp->getStatusCode());
+        }
+        return $response;
     }
 
     /**
diff --git a/Neos.Neos/Classes/Fusion/PluginImplementation.php b/Neos.Neos/Classes/Fusion/PluginImplementation.php
index 02c388453f5..c623542afd9 100644
--- a/Neos.Neos/Classes/Fusion/PluginImplementation.php
+++ b/Neos.Neos/Classes/Fusion/PluginImplementation.php
@@ -166,12 +166,17 @@ public function evaluate(): string
         $currentContext = $this->runtime->getCurrentContext();
         $this->node = $currentContext['node'];
         $this->documentNode = $currentContext['documentNode'];
+        $parentResponse = $this->runtime->getControllerContext()->getResponse();
         $pluginResponse = new ActionResponse();
         $this->dispatcher->dispatch($this->buildPluginRequest(), $pluginResponse);
 
+        // We need to make sure to not merge content up into the parent ActionResponse
+        // because that would break the Fusion HttpResponse.
         $content = $pluginResponse->getContent();
+        $pluginResponse->setContent('');
+
+        $pluginResponse->mergeIntoParentResponse($parentResponse);
 
-        $this->runtime->unsafeHttpResponseConstrains->setAndMergeFromActionResponse($pluginResponse);
         return $content;
     }
 
diff --git a/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php b/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
index 90c721757bb..e8aff26d8ea 100644
--- a/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
+++ b/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
@@ -11,7 +11,6 @@
  * source code.
  */
 
-use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Uri;
 use Neos\Flow\Mvc\ActionRequest;
 use Neos\Flow\Mvc\ActionResponse;
@@ -19,8 +18,6 @@
 use Neos\Flow\Mvc\Dispatcher;
 use Neos\Flow\Mvc\RequestInterface;
 use Neos\Flow\Tests\UnitTestCase;
-use Neos\Fusion\Core\FusionConfiguration;
-use Neos\Fusion\Core\FusionGlobals;
 use Neos\Fusion\Core\Runtime;
 use Neos\Neos\Fusion\PluginImplementation;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -82,7 +79,7 @@ public function setUp(): void
         $this->mockControllerContext = $this->getMockBuilder(ControllerContext::class)->disableOriginalConstructor()->getMock();
         $this->mockControllerContext->method('getRequest')->willReturn($this->mockActionRequest);
 
-        $this->mockRuntime = $this->getMockBuilder(Runtime::class)->setConstructorArgs([FusionConfiguration::fromArray([]), FusionGlobals::fromArray([])])->getMock();
+        $this->mockRuntime = $this->getMockBuilder(Runtime::class)->disableOriginalConstructor()->getMock();
         $this->mockRuntime->method('getControllerContext')->willReturn($this->mockControllerContext);
         $this->pluginImplementation->_set('runtime', $this->mockRuntime);
 
@@ -99,12 +96,12 @@ public function responseHeadersDataProvider(): array
             [
                 'Plugin response key does already exist in parent with same value',
                 ['parent' => ['key' => 'value'], 'plugin' => ['key' => 'value']],
-                ['key' => 'value'] // 'value, value'
+                ['key' => 'value']
             ],
             [
                 'Plugin response key does not exist in parent with different value',
                 ['parent' => ['key' => 'value'], 'plugin' => ['key' => 'otherValue']],
-                ['key' => 'otherValue'] // 'otherValue, value'
+                ['key' => 'otherValue']
             ],
             [
                 'Plugin response key does not exist in parent',
@@ -122,8 +119,6 @@ public function responseHeadersDataProvider(): array
      */
     public function evaluateSetHeaderIntoParent(string $message, array $input, array $expected): void
     {
-        $this->markTestSkipped('DOESNT WORK.');
-
         $this->pluginImplementation->method('buildPluginRequest')->willReturn($this->mockActionRequest);
 
         $parentResponse = new ActionResponse();
@@ -138,16 +133,8 @@ public function evaluateSetHeaderIntoParent(string $message, array $input, array
 
         $this->pluginImplementation->evaluate();
 
-        // in the runtime would be:
-        $runtimeResponse = $this->mockRuntime->unsafeHttpResponseConstrains->applyToResponse(new Response());
-
-        // in the action would be:
-        $parentResponse->replaceHttpResponse($runtimeResponse);
-
         foreach ($expected as $expectedKey => $expectedValue) {
-            // previously tests succeeded:
-            // self::assertEquals($expectedValue, join(', ', \Neos\Utility\ObjectAccess::getProperty($parentResponse, 'headers', true)[$expectedKey]), $message);
-            self::assertEquals($expectedValue, $parentResponse->buildHttpResponse()->getHeaderLine($expectedKey), $message);
+            self::assertEquals($expectedValue, (string)$parentResponse->getHttpHeader($expectedKey), $message);
         }
     }
 

From cc70fedd9ac9ed21139f658a7746689dd76475ce Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Tue, 30 Jan 2024 15:26:04 +0100
Subject: [PATCH 10/31] TASK: Migrate further fusion objects to
 `$this->runtime->fusionGlobals->get('request');`

---
 Neos.Fusion/Classes/Core/Runtime.php          | 20 +++++++++----------
 .../ResourceUriImplementation.php             | 10 ++++++----
 .../ResourceUriImplementationTest.php         | 18 ++++++-----------
 .../Classes/Fusion/ImageUriImplementation.php |  5 ++++-
 .../Classes/Fusion/NodeUriImplementation.php  | 17 ++++++++++++++--
 .../Classes/Fusion/PluginImplementation.php   |  5 ++++-
 6 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 2f685ba18e0..3f83ac5cb82 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -303,6 +303,7 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
             );
         }
 
+        /** unlike pushContextArray, we will  only allow "legal" fusion global variables. {@see self::pushContext} */
         foreach ($contextArray as $key => $_) {
             if ($this->fusionGlobals->has($key)) {
                 throw new Exception(sprintf('Overriding Fusion global variable "%s" via @context is not allowed.', $key), 1706452063);
@@ -323,7 +324,7 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
         if ($outputStringHasHttpPreamble) {
             $response = Message::parseResponse($output);
             if ($legacyActionResponse) {
-                $response = self::applyActionResponseToPsrResponse($legacyActionResponse, $response);
+                $response = self::applyActionResponseToHttpResponse($legacyActionResponse, $response);
                 $this->controllerContext = null;
             }
             return $response;
@@ -338,23 +339,22 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
 
         $response = new Response(body: $stream);
         if ($legacyActionResponse) {
-            $response = self::applyActionResponseToPsrResponse($legacyActionResponse, $response);
+            $response = self::applyActionResponseToHttpResponse($legacyActionResponse, $response);
             $this->controllerContext = null;
         }
         return $response;
     }
 
-    private static function applyActionResponseToPsrResponse(ActionResponse $actionResponse, ResponseInterface $response): ResponseInterface
+    private static function applyActionResponseToHttpResponse(ActionResponse $actionResponse, ResponseInterface $httpResponse): ResponseInterface
     {
-        $actionResponseAsHttp = $actionResponse->buildHttpResponse();
-        foreach ($actionResponseAsHttp->getHeaders() as $name => $values) {
-            $response = $response->withAddedHeader($name, $values);
+        foreach ($actionResponse->buildHttpResponse()->getHeaders() as $name => $values) {
+            $httpResponse = $httpResponse->withAddedHeader($name, $values);
         }
-        // preserve non 200 status codes that would otherwise be overwritten
-        if ($actionResponseAsHttp->getStatusCode() !== 200) {
-            $response = $response->withStatus($actionResponseAsHttp->getStatusCode());
+        // if the status code is 200 we assume it's the default and will not overrule it
+        if ($actionResponse->getStatusCode() !== 200) {
+            $httpResponse = $httpResponse->withStatus($actionResponse->getStatusCode());
         }
-        return $response;
+        return $httpResponse;
     }
 
     /**
diff --git a/Neos.Fusion/Classes/FusionObjects/ResourceUriImplementation.php b/Neos.Fusion/Classes/FusionObjects/ResourceUriImplementation.php
index 06804001fa0..ce4603163db 100644
--- a/Neos.Fusion/Classes/FusionObjects/ResourceUriImplementation.php
+++ b/Neos.Fusion/Classes/FusionObjects/ResourceUriImplementation.php
@@ -116,10 +116,12 @@ public function evaluate()
         } else {
             $package = $this->getPackage();
             if ($package === null) {
-                $controllerContext = $this->runtime->getControllerContext();
-                /** @var $actionRequest ActionRequest */
-                $actionRequest = $controllerContext->getRequest();
-                $package = $actionRequest->getControllerPackageKey();
+                $possibleRequest = $this->runtime->fusionGlobals->get('request');
+                if ($possibleRequest instanceof ActionRequest) {
+                    $package = $possibleRequest->getControllerPackageKey();
+                } else {
+                    throw new \RuntimeException('Could not infer package-key from action request. Please render Fusion with request or specify a package-key.', 1706624314);
+                }
             }
         }
         $localize = $this->isLocalize();
diff --git a/Neos.Fusion/Tests/Unit/FusionObjects/ResourceUriImplementationTest.php b/Neos.Fusion/Tests/Unit/FusionObjects/ResourceUriImplementationTest.php
index 742f53d1cc9..a0cc8983cb1 100644
--- a/Neos.Fusion/Tests/Unit/FusionObjects/ResourceUriImplementationTest.php
+++ b/Neos.Fusion/Tests/Unit/FusionObjects/ResourceUriImplementationTest.php
@@ -13,10 +13,11 @@
 
 use Neos\Flow\I18n\Service;
 use Neos\Flow\Mvc\ActionRequest;
-use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\ResourceManagement\PersistentResource;
 use Neos\Flow\ResourceManagement\ResourceManager;
 use Neos\Flow\Tests\UnitTestCase;
+use Neos\Fusion\Core\FusionConfiguration;
+use Neos\Fusion\Core\FusionGlobals;
 use Neos\Fusion\Core\Runtime;
 use Neos\Fusion\Exception;
 use Neos\Fusion\FusionObjects\ResourceUriImplementation;
@@ -46,11 +47,6 @@ class ResourceUriImplementationTest extends UnitTestCase
      */
     protected $mockI18nService;
 
-    /**
-     * @var ControllerContext
-     */
-    protected $mockControllerContext;
-
     /**
      * @var ActionRequest
      */
@@ -58,14 +54,12 @@ class ResourceUriImplementationTest extends UnitTestCase
 
     public function setUp(): void
     {
-        $this->mockRuntime = $this->getMockBuilder(Runtime::class)->disableOriginalConstructor()->getMock();
-
-        $this->mockControllerContext = $this->getMockBuilder(ControllerContext::class)->disableOriginalConstructor()->getMock();
-
         $this->mockActionRequest = $this->getMockBuilder(ActionRequest::class)->disableOriginalConstructor()->getMock();
-        $this->mockControllerContext->expects(self::any())->method('getRequest')->will(self::returnValue($this->mockActionRequest));
 
-        $this->mockRuntime->expects(self::any())->method('getControllerContext')->will(self::returnValue($this->mockControllerContext));
+        $this->mockRuntime = $this->getMockBuilder(Runtime::class)->setConstructorArgs([
+            FusionConfiguration::fromArray([]),
+            FusionGlobals::fromArray(['request' => $this->mockActionRequest])
+        ])->getMock();
 
         $this->resourceUriImplementation = new ResourceUriImplementation($this->mockRuntime, 'resourceUri/test', 'Neos.Fusion:ResourceUri');
 
diff --git a/Neos.Neos/Classes/Fusion/ImageUriImplementation.php b/Neos.Neos/Classes/Fusion/ImageUriImplementation.php
index 506fb8296f4..263861658a5 100644
--- a/Neos.Neos/Classes/Fusion/ImageUriImplementation.php
+++ b/Neos.Neos/Classes/Fusion/ImageUriImplementation.php
@@ -15,6 +15,7 @@
 namespace Neos\Neos\Fusion;
 
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Mvc\ActionRequest;
 use Neos\Media\Domain\Model\AssetInterface;
 use Neos\Media\Domain\Model\ThumbnailConfiguration;
 use Neos\Media\Domain\Service\AssetService;
@@ -181,7 +182,9 @@ public function evaluate()
                 $this->getFormat()
             );
         }
-        $request = $this->getRuntime()->getControllerContext()->getRequest();
+
+        $possibleRequest = $this->runtime->fusionGlobals->get('request');
+        $request = $possibleRequest instanceof ActionRequest ? $possibleRequest : null;
         $thumbnailData = $this->assetService->getThumbnailUriAndSizeForAsset($asset, $thumbnailConfiguration, $request);
         if ($thumbnailData === null) {
             return '';
diff --git a/Neos.Neos/Classes/Fusion/NodeUriImplementation.php b/Neos.Neos/Classes/Fusion/NodeUriImplementation.php
index 7845fdbcaed..9e1da3c7d83 100644
--- a/Neos.Neos/Classes/Fusion/NodeUriImplementation.php
+++ b/Neos.Neos/Classes/Fusion/NodeUriImplementation.php
@@ -14,14 +14,16 @@
 
 namespace Neos\Neos\Fusion;
 
+use GuzzleHttp\Psr7\ServerRequest;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
+use Neos\Flow\Mvc\ActionRequest;
+use Neos\Neos\FrontendRouting\NodeAddressFactory;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Log\Utility\LogEnvironment;
 use Neos\Flow\Mvc\Exception\NoMatchingRouteException;
 use Neos\Flow\Mvc\Routing\UriBuilder;
 use Neos\Fusion\FusionObjects\AbstractFusionObject;
-use Neos\Neos\FrontendRouting\NodeAddressFactory;
 use Neos\Neos\FrontendRouting\NodeUriBuilder;
 use Psr\Log\LoggerInterface;
 
@@ -159,7 +161,18 @@ public function evaluate()
         );*/
 
         $uriBuilder = new UriBuilder();
-        $uriBuilder->setRequest($this->runtime->getControllerContext()->getRequest());
+        $possibleRequest = $this->runtime->fusionGlobals->get('request');
+        if ($possibleRequest instanceof ActionRequest) {
+            $uriBuilder->setRequest($possibleRequest);
+        } else {
+            // unfortunately, the uri-builder always needs a request at hand and cannot build uris without
+            // even, if the default param merging would not be required
+            // this will improve with a reformed uri building:
+            // https://github.com/neos/flow-development-collection/pull/2744
+            $uriBuilder->setRequest(
+                ActionRequest::fromHttpRequest(ServerRequest::fromGlobals())
+            );
+        }
         $uriBuilder
             ->setFormat($this->getFormat())
             ->setCreateAbsoluteUri($this->isAbsolute())
diff --git a/Neos.Neos/Classes/Fusion/PluginImplementation.php b/Neos.Neos/Classes/Fusion/PluginImplementation.php
index c623542afd9..36ba957cc32 100644
--- a/Neos.Neos/Classes/Fusion/PluginImplementation.php
+++ b/Neos.Neos/Classes/Fusion/PluginImplementation.php
@@ -90,7 +90,10 @@ public function getArgumentNamespace()
      */
     protected function buildPluginRequest(): ActionRequest
     {
-        $parentRequest = $this->runtime->getControllerContext()->getRequest();
+        $parentRequest = $this->runtime->fusionGlobals->get('request');
+        if (!$parentRequest instanceof ActionRequest) {
+            throw new \RuntimeException('Fusion Plugins must be rendered with an ActionRequest set as fusion-global.', 1706624581);
+        }
         $pluginRequest = $parentRequest->createSubRequest();
         $pluginRequest->setArgumentNamespace('--' . $this->getPluginNamespace());
         $this->passArgumentsToPluginRequest($pluginRequest);

From 58cefd695706cef336bfa0819e4578fa77e16c81 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sat, 3 Feb 2024 22:29:25 +0100
Subject: [PATCH 11/31] TASK: Document legacy Runtime::getControllerContext

---
 Neos.Fusion/Classes/Core/Runtime.php | 104 ++++++++++++++++-----------
 1 file changed, 63 insertions(+), 41 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 3f83ac5cb82..082737ad67e 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -120,9 +120,9 @@ class Runtime
     protected $runtimeConfiguration;
 
     /**
-     * @deprecated
+     * @deprecated legacy layer {@see self::getControllerContext()}
      */
-    protected ?ControllerContext $controllerContext = null;
+    private ?ActionResponse $legacyActionResponseForCurrentRendering = null;
 
     /**
      * @var array
@@ -161,22 +161,6 @@ public function __construct(
         $this->fusionGlobals = $fusionGlobals;
     }
 
-    /**
-     * Returns the context which has been passed by the currently active MVC Controller
-     *
-     * DEPRECATED CONCEPT. We only implement this as backwards-compatible layer.
-     *
-     * @deprecated use `Runtime::fusionGlobals->get('request')` instead to get the request. {@see FusionGlobals::get()}
-     * @internal
-     */
-    public function getControllerContext(): ControllerContext
-    {
-        if ($this->controllerContext === null) {
-            throw new Exception(sprintf('Legacy controller context in runtime is only available when fusion global "request" is a ActionRequest and during "renderResponse".'), 1706458355);
-        }
-        return $this->controllerContext;
-    }
-
     /**
      * Inject settings of this package
      *
@@ -286,22 +270,11 @@ public function getLastEvaluationStatus()
 
     public function renderResponse(string $fusionPath, array $contextArray): ResponseInterface
     {
-        // legacy controller context layer
-        $possibleRequest = $this->fusionGlobals->get('request');
-        $legacyActionResponse = null;
-        if ($possibleRequest instanceof ActionRequest) {
-            $uriBuilder = new UriBuilder();
-            $uriBuilder->setRequest($possibleRequest);
-
-            $this->controllerContext = new ControllerContext(
-                $possibleRequest,
-                // expose action response to be possibly mutated in neos forms or fusion plugins.
-                // this behaviour is highly internal and deprecated!
-                $legacyActionResponse = new ActionResponse(),
-                new Arguments([]),
-                $uriBuilder
-            );
+        if ($this->legacyActionResponseForCurrentRendering !== null) {
+            throw new Exception('Recursion detected in `Runtime::renderResponse`. This entry point is only allowed to be invoked once per rendering.', 1706993940);
         }
+        /** Legacy layer {@see self::getControllerContext()} */
+        $this->legacyActionResponseForCurrentRendering = new ActionResponse();
 
         /** unlike pushContextArray, we will  only allow "legal" fusion global variables. {@see self::pushContext} */
         foreach ($contextArray as $key => $_) {
@@ -323,10 +296,8 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
         $outputStringHasHttpPreamble = is_string($output) && str_starts_with($output, 'HTTP/');
         if ($outputStringHasHttpPreamble) {
             $response = Message::parseResponse($output);
-            if ($legacyActionResponse) {
-                $response = self::applyActionResponseToHttpResponse($legacyActionResponse, $response);
-                $this->controllerContext = null;
-            }
+            $response = self::applyActionResponseToHttpResponse($this->legacyActionResponseForCurrentRendering, $response);
+            $this->legacyActionResponseForCurrentRendering = null;
             return $response;
         }
 
@@ -338,10 +309,8 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
         };
 
         $response = new Response(body: $stream);
-        if ($legacyActionResponse) {
-            $response = self::applyActionResponseToHttpResponse($legacyActionResponse, $response);
-            $this->controllerContext = null;
-        }
+        $response = self::applyActionResponseToHttpResponse($this->legacyActionResponseForCurrentRendering, $response);
+        $this->legacyActionResponseForCurrentRendering = null;
         return $response;
     }
 
@@ -988,6 +957,59 @@ protected function throwExceptionForUnrenderablePathIfNeeded($fusionPath, $fusio
         }
     }
 
+    /**
+     * The concept of the controller context inside Fusion has been deprecated.
+     *
+     * To migrate the use case of fetching the active request, please look into {@see FusionGlobals::get()} instead.
+     * By convention, an {@see ActionRequest} will be available as `request`:
+     *
+     * ```php
+     * $actionRequest = $this->runtime->fusionGlobals->get('request');
+     * if (!$actionRequest instanceof ActionRequest) {
+     *     // fallback or error
+     * }
+     * ```
+     *
+     * To get an {@see UriBuilder} proceed with:
+     *
+     * ```php
+     * $uriBuilder = new UriBuilder();
+     * $uriBuilder->setRequest($actionRequest);
+     * ```
+     *
+     * WARNING:
+     *      Invoking this backwards-compatible layer is possibly unsafe, if the rendering was not started
+     *      in {@see self::renderResponse()} or no `request` global is available. This will raise an exception.
+     *
+     * MAINTAINER NOTE:
+     *      Initially it was possible to mutate the current response of the active MVC controller though $response.
+     *      While HIGHLY internal behaviour and ONLY to be used by Neos.Fusion.Form or Neos.Neos:Plugin
+     *      a legacy layer in place still allows this functionality.
+     *
+     * @deprecated with Neos 9.0
+     * @internal
+     */
+    public function getControllerContext(): ControllerContext
+    {
+        // legacy controller context layer
+        $actionRequest = $this->fusionGlobals->get('request');
+        if ($this->legacyActionResponseForCurrentRendering === null || !$actionRequest instanceof ActionRequest) {
+            throw new Exception(sprintf('Fusions simulated legacy controller context is only available inside `Runtime::renderResponse` and when the Fusion global "request" is an ActionRequest.'), 1706458355);
+        }
+
+        $uriBuilder = new UriBuilder();
+        $uriBuilder->setRequest($actionRequest);
+
+        return new ControllerContext(
+            $actionRequest,
+            // expose action response to be possibly mutated in neos forms or fusion plugins.
+            // this behaviour is highly internal and deprecated!
+            $this->legacyActionResponseForCurrentRendering,
+            new Arguments([]),
+            $uriBuilder
+        );
+    }
+
     /**
      * Configures this runtime to override the default exception handler configured in the settings
      * or via Fusion's \@exceptionHandler {@see AbstractRenderingExceptionHandler}.

From 7559f87b1cf5011885c06f819282064f09a177b4 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sat, 3 Feb 2024 22:41:59 +0100
Subject: [PATCH 12/31] TASK: Extract controller context legacy layer into
 withSimulatedLegacyControllerContext

---
 Neos.Fusion/Classes/Core/Runtime.php | 105 ++++++++++++++-------------
 1 file changed, 56 insertions(+), 49 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 082737ad67e..f3f597a5ef0 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -270,60 +270,39 @@ public function getLastEvaluationStatus()
 
     public function renderResponse(string $fusionPath, array $contextArray): ResponseInterface
     {
-        if ($this->legacyActionResponseForCurrentRendering !== null) {
-            throw new Exception('Recursion detected in `Runtime::renderResponse`. This entry point is only allowed to be invoked once per rendering.', 1706993940);
-        }
-        /** Legacy layer {@see self::getControllerContext()} */
-        $this->legacyActionResponseForCurrentRendering = new ActionResponse();
-
-        /** unlike pushContextArray, we will  only allow "legal" fusion global variables. {@see self::pushContext} */
+        /** Unlike pushContextArray, we don't allow to overrule fusion globals {@see self::pushContext} */
         foreach ($contextArray as $key => $_) {
             if ($this->fusionGlobals->has($key)) {
                 throw new Exception(sprintf('Overriding Fusion global variable "%s" via @context is not allowed.', $key), 1706452063);
             }
         }
         $this->pushContextArray($contextArray);
-        try {
-            $output = $this->render($fusionPath);
-        } finally {
-            $this->popContext();
-        }
 
-        /**
-         * parse potential raw http response possibly rendered via "Neos.Fusion:Http.Message"
-         * {@see \Neos\Fusion\FusionObjects\HttpResponseImplementation}
-         */
-        $outputStringHasHttpPreamble = is_string($output) && str_starts_with($output, 'HTTP/');
-        if ($outputStringHasHttpPreamble) {
-            $response = Message::parseResponse($output);
-            $response = self::applyActionResponseToHttpResponse($this->legacyActionResponseForCurrentRendering, $response);
-            $this->legacyActionResponseForCurrentRendering = null;
-            return $response;
-        }
+        return $this->withSimulatedLegacyControllerContext(function () use ($fusionPath) {
+            try {
+                $output = $this->render($fusionPath);
+            } finally {
+                $this->popContext();
+            }
 
-        $stream = match (true) {
-            is_string($output),
-            $output instanceof \Stringable => Utils::streamFor((string)$output),
-            $output === null, $output === false => Utils::streamFor(''),
-            default => throw new \RuntimeException(sprintf('Cannot render %s into http response body.', get_debug_type($output)), 1706454898)
-        };
+            /**
+             * parse potential raw http response possibly rendered via "Neos.Fusion:Http.Message"
+             * {@see \Neos\Fusion\FusionObjects\HttpResponseImplementation}
+             */
+            $outputStringHasHttpPreamble = is_string($output) && str_starts_with($output, 'HTTP/');
+            if ($outputStringHasHttpPreamble) {
+                return Message::parseResponse($output);
+            }
 
-        $response = new Response(body: $stream);
-        $response = self::applyActionResponseToHttpResponse($this->legacyActionResponseForCurrentRendering, $response);
-        $this->legacyActionResponseForCurrentRendering = null;
-        return $response;
-    }
+            $stream = match (true) {
+                is_string($output),
+                $output instanceof \Stringable => Utils::streamFor((string)$output),
+                $output === null, $output === false => Utils::streamFor(''),
+                default => throw new \RuntimeException(sprintf('Cannot render %s into http response body.', get_debug_type($output)), 1706454898)
+            };
 
-    private static function applyActionResponseToHttpResponse(ActionResponse $actionResponse, ResponseInterface $httpResponse): ResponseInterface
-    {
-        foreach ($actionResponse->buildHttpResponse()->getHeaders() as $name => $values) {
-            $httpResponse = $httpResponse->withAddedHeader($name, $values);
-        }
-        // if the status code is 200 we assume it's the default and will not overrule it
-        if ($actionResponse->getStatusCode() !== 200) {
-            $httpResponse = $httpResponse->withStatus($actionResponse->getStatusCode());
-        }
-        return $httpResponse;
+            return new Response(body: $stream);
+        });
     }
 
     /**
@@ -957,6 +936,39 @@ protected function throwExceptionForUnrenderablePathIfNeeded($fusionPath, $fusio
         }
     }
 
+    /**
+     * Implements the legacy controller context simulation {@see self::getControllerContext()}
+     *
+     * Initially it was possible to mutate the current response of the active MVC controller though $response.
+     * While HIGHLY internal behaviour and ONLY to be used by Neos.Fusion.Form or Neos.Neos:Plugin
+     * this legacy layer is in place still allows this functionality.
+     *
+     * @param \Closure(): ResponseInterface $renderer
+     */
+    private function withSimulatedLegacyControllerContext(\Closure $renderer): ResponseInterface
+    {
+        if ($this->legacyActionResponseForCurrentRendering !== null) {
+            throw new Exception('Recursion detected in `Runtime::renderResponse`. This entry point is only allowed to be invoked once per rendering.', 1706993940);
+        }
+        $this->legacyActionResponseForCurrentRendering = new ActionResponse();
+
+        // actual rendering
+        $httpResponse = $renderer();
+
+        // transfer possible headers that have been set dynamically
+        foreach ($this->legacyActionResponseForCurrentRendering->buildHttpResponse()->getHeaders() as $name => $values) {
+            $httpResponse = $httpResponse->withAddedHeader($name, $values);
+        }
+        // if the status code is 200 we assume it's the default and will not overrule it
+        if ($this->legacyActionResponseForCurrentRendering->getStatusCode() !== 200) {
+            $httpResponse = $httpResponse->withStatus($this->legacyActionResponseForCurrentRendering->getStatusCode());
+        }
+
+        // reset for next render
+        $this->legacyActionResponseForCurrentRendering = null;
+        return $httpResponse;
+    }
+
     /**
      * The concept of the controller context inside Fusion has been deprecated.
      *
@@ -981,11 +993,6 @@ protected function throwExceptionForUnrenderablePathIfNeeded($fusionPath, $fusio
      *      Invoking this backwards-compatible layer is possibly unsafe, if the rendering was not started
      *      in {@see self::renderResponse()} or no `request` global is available. This will raise an exception.
      *
-     * MAINTAINER NOTE:
-     *      Initially it was possible to mutate the current response of the active MVC controller though $response.
-     *      While HIGHLY internal behaviour and ONLY to be used by Neos.Fusion.Form or Neos.Neos:Plugin
-     *      a legacy layer in place still allows this functionality.
-     *
      * @deprecated with Neos 9.0
      * @internal
      */

From 35f688de64d367952b0a957b7e01460175996d72 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Fri, 16 Feb 2024 22:41:56 +0100
Subject: [PATCH 13/31] TASK: Runtime fix `renderResponse` lock not being
 released

---
 Neos.Fusion/Classes/Core/Runtime.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index f3f597a5ef0..66df6e0196f 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -953,19 +953,23 @@ private function withSimulatedLegacyControllerContext(\Closure $renderer): Respo
         $this->legacyActionResponseForCurrentRendering = new ActionResponse();
 
         // actual rendering
-        $httpResponse = $renderer();
+        try {
+            $httpResponse = $renderer();
+        } finally {
+            $toBeMergedLegacyActionResponse = $this->legacyActionResponseForCurrentRendering;
+            // reset for next render
+            $this->legacyActionResponseForCurrentRendering = null;
+        }
 
         // transfer possible headers that have been set dynamically
-        foreach ($this->legacyActionResponseForCurrentRendering->buildHttpResponse()->getHeaders() as $name => $values) {
+        foreach ($toBeMergedLegacyActionResponse->buildHttpResponse()->getHeaders() as $name => $values) {
             $httpResponse = $httpResponse->withAddedHeader($name, $values);
         }
         // if the status code is 200 we assume it's the default and will not overrule it
-        if ($this->legacyActionResponseForCurrentRendering->getStatusCode() !== 200) {
-            $httpResponse = $httpResponse->withStatus($this->legacyActionResponseForCurrentRendering->getStatusCode());
+        if ($toBeMergedLegacyActionResponse->getStatusCode() !== 200) {
+            $httpResponse = $httpResponse->withStatus($toBeMergedLegacyActionResponse->getStatusCode());
         }
 
-        // reset for next render
-        $this->legacyActionResponseForCurrentRendering = null;
         return $httpResponse;
     }
 

From 8adfc90c8e77e67ac7279b3cc823d958865cdd17 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Fri, 16 Feb 2024 22:47:21 +0100
Subject: [PATCH 14/31] TASK: Runtime `renderResponse` unwrap
 `RuntimeException` itself

Previously the pattern was that the utmost caller of the runtime would unwrap the exception.
To simplify this, as the runtime now has a single entry point, we add this behaviour into the runtime.
---
 Neos.Fusion/Classes/Core/Runtime.php    |  3 +++
 Neos.Fusion/Classes/View/FusionView.php |  6 +-----
 Neos.Neos/Classes/View/FusionView.php   | 16 +++++-----------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 66df6e0196f..266c101082d 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -281,6 +281,9 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
         return $this->withSimulatedLegacyControllerContext(function () use ($fusionPath) {
             try {
                 $output = $this->render($fusionPath);
+            } catch (RuntimeException $exception) {
+                // unwrap the FusionRuntimeException
+                throw $exception->getPrevious();
             } finally {
                 $this->popContext();
             }
diff --git a/Neos.Fusion/Classes/View/FusionView.php b/Neos.Fusion/Classes/View/FusionView.php
index bdc4413e113..36d4fe6ae5c 100644
--- a/Neos.Fusion/Classes/View/FusionView.php
+++ b/Neos.Fusion/Classes/View/FusionView.php
@@ -149,11 +149,7 @@ public function render()
         $this->initializeFusionRuntime();
 
         if ($this->getOption('renderHttpResponse') === true) {
-            try {
-                return $this->fusionRuntime->renderResponse($this->getFusionPathForCurrentRequest(), $this->variables);
-            } catch (RuntimeException $exception) {
-                throw $exception->getPrevious();
-            }
+            return $this->fusionRuntime->renderResponse($this->getFusionPathForCurrentRequest(), $this->variables);
         } else {
             try {
                 $this->fusionRuntime->pushContextArray($this->variables);
diff --git a/Neos.Neos/Classes/View/FusionView.php b/Neos.Neos/Classes/View/FusionView.php
index 82e29a29634..446771cae37 100644
--- a/Neos.Neos/Classes/View/FusionView.php
+++ b/Neos.Neos/Classes/View/FusionView.php
@@ -14,7 +14,6 @@
 
 namespace Neos\Neos\View;
 
-use GuzzleHttp\Psr7\Message;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindClosestNodeFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
@@ -24,7 +23,6 @@
 use Neos\Fusion\Core\FusionGlobals;
 use Neos\Fusion\Core\Runtime;
 use Neos\Fusion\Core\RuntimeFactory;
-use Neos\Fusion\Exception\RuntimeException;
 use Neos\Neos\Domain\Model\RenderingMode;
 use Neos\Neos\Domain\Repository\SiteRepository;
 use Neos\Neos\Domain\Service\FusionService;
@@ -76,15 +74,11 @@ public function render(): ResponseInterface
 
         $this->setFallbackRuleFromDimension($currentNode->subgraphIdentity->dimensionSpacePoint);
 
-        try {
-            return $fusionRuntime->renderResponse($this->fusionPath, [
-                'node' => $currentNode,
-                'documentNode' => $this->getClosestDocumentNode($currentNode) ?: $currentNode,
-                'site' => $currentSiteNode
-            ]);
-        } catch (RuntimeException $exception) {
-            throw $exception->getPrevious() ?: $exception;
-        }
+        return $fusionRuntime->renderResponse($this->fusionPath, [
+            'node' => $currentNode,
+            'documentNode' => $this->getClosestDocumentNode($currentNode) ?: $currentNode,
+            'site' => $currentSiteNode
+        ]);
     }
 
     /**

From 05aefc7baa260d2d9ae37845afef7912089262a3 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 18 Feb 2024 12:15:58 +0100
Subject: [PATCH 15/31] TASK: Add Fusion RuntimeException::getWrappedException

... to centralise tricking phpstan
---
 Neos.Fusion/Classes/Core/Runtime.php               | 3 +--
 Neos.Fusion/Classes/Exception/RuntimeException.php | 9 +++++++++
 Neos.Fusion/Classes/View/FusionView.php            | 2 +-
 Neos.Neos/Classes/View/FusionExceptionView.php     | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 266c101082d..2d44aaac02e 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -282,8 +282,7 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
             try {
                 $output = $this->render($fusionPath);
             } catch (RuntimeException $exception) {
-                // unwrap the FusionRuntimeException
-                throw $exception->getPrevious();
+                throw $exception->getWrappedException();
             } finally {
                 $this->popContext();
             }
diff --git a/Neos.Fusion/Classes/Exception/RuntimeException.php b/Neos.Fusion/Classes/Exception/RuntimeException.php
index 8ee31394250..b827edf4b74 100644
--- a/Neos.Fusion/Classes/Exception/RuntimeException.php
+++ b/Neos.Fusion/Classes/Exception/RuntimeException.php
@@ -32,4 +32,13 @@ public function getFusionPath()
     {
         return $this->fusionPath;
     }
+
+    /**
+     * Unwrap this Fusion RuntimeException
+     */
+    public function getWrappedException(): \Exception
+    {
+        /** @phpstan-ignore-next-line due to overridden construction, we are sure that the previous exists. */
+        return $this->getPrevious();
+    }
 }
diff --git a/Neos.Fusion/Classes/View/FusionView.php b/Neos.Fusion/Classes/View/FusionView.php
index 36d4fe6ae5c..e44ffb6f664 100644
--- a/Neos.Fusion/Classes/View/FusionView.php
+++ b/Neos.Fusion/Classes/View/FusionView.php
@@ -155,7 +155,7 @@ public function render()
                 $this->fusionRuntime->pushContextArray($this->variables);
                 return $this->fusionRuntime->render($this->getFusionPathForCurrentRequest());
             } catch (RuntimeException $exception) {
-                throw $exception->getPrevious();
+                throw $exception->getWrappedException();
             } finally {
                 $this->fusionRuntime->popContext();
             }
diff --git a/Neos.Neos/Classes/View/FusionExceptionView.php b/Neos.Neos/Classes/View/FusionExceptionView.php
index 46241f48729..1d4a85119d9 100644
--- a/Neos.Neos/Classes/View/FusionExceptionView.php
+++ b/Neos.Neos/Classes/View/FusionExceptionView.php
@@ -171,7 +171,7 @@ public function render()
             $output = $fusionRuntime->render('error');
             return $this->extractBodyFromOutput($output);
         } catch (RuntimeException $exception) {
-            throw $exception->getPrevious() ?: $exception;
+            throw $exception->getWrappedException();
         } finally {
             $fusionRuntime->popContext();
         }

From 706ccc77d56ba011235263b98ba1498250134509 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 18 Feb 2024 12:26:26 +0100
Subject: [PATCH 16/31] TASK: Remove manual http response parsing from
 FusionExceptionView

---
 .../Classes/View/FusionExceptionView.php      | 33 +++++--------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/Neos.Neos/Classes/View/FusionExceptionView.php b/Neos.Neos/Classes/View/FusionExceptionView.php
index 1d4a85119d9..4feb70ea7c5 100644
--- a/Neos.Neos/Classes/View/FusionExceptionView.php
+++ b/Neos.Neos/Classes/View/FusionExceptionView.php
@@ -32,7 +32,6 @@
 use Neos\Fusion\Core\FusionGlobals;
 use Neos\Fusion\Core\Runtime as FusionRuntime;
 use Neos\Fusion\Core\RuntimeFactory;
-use Neos\Fusion\Exception\RuntimeException;
 use Neos\Neos\Domain\Model\RenderingMode;
 use Neos\Neos\Domain\Repository\DomainRepository;
 use Neos\Neos\Domain\Repository\SiteRepository;
@@ -158,7 +157,7 @@ public function render()
 
         $this->setFallbackRuleFromDimension($dimensionSpacePoint);
 
-        $fusionRuntime->pushContextArray(array_merge(
+        $httpResponse = $fusionRuntime->renderResponse('error', array_merge(
             $this->variables,
             [
                 'node' => $currentSiteNode,
@@ -167,29 +166,13 @@ public function render()
             ]
         ));
 
-        try {
-            $output = $fusionRuntime->render('error');
-            return $this->extractBodyFromOutput($output);
-        } catch (RuntimeException $exception) {
-            throw $exception->getWrappedException();
-        } finally {
-            $fusionRuntime->popContext();
-        }
-    }
-
-    /**
-     * @param string $output
-     * @return string The message body without the message head
-     */
-    protected function extractBodyFromOutput(string $output): string
-    {
-        if (substr($output, 0, 5) === 'HTTP/') {
-            $endOfHeader = strpos($output, "\r\n\r\n");
-            if ($endOfHeader !== false) {
-                $output = substr($output, $endOfHeader + 4);
-            }
-        }
-        return $output;
+        /**
+         * Workaround: The http status code will already be sent and
+         * Flow's {@see \Neos\Flow\Error\DebugExceptionHandler::echoExceptionWeb()}
+         * expects a view to return a string to be echo'd.
+         * Thus, we unwrap the repose here:
+         */
+        return $httpResponse->getBody()->getContents();
     }
 
     /**

From aca97ab02f5abffa9dc5b9f1ebc700a44c284f63 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 18 Feb 2024 15:15:28 +0100
Subject: [PATCH 17/31] TASK: Revert Fusion `FusionView` HttpResponse support

This will be discussed separately and not part of the change of the Neos Node `FusionView`
---
 Neos.Fusion/Classes/View/FusionView.php       | 40 +++++++++++--------
 .../View/Fixtures/Fusion/Root.fusion          |  4 --
 .../Tests/Functional/View/FusionViewTest.php  | 36 -----------------
 3 files changed, 23 insertions(+), 57 deletions(-)

diff --git a/Neos.Fusion/Classes/View/FusionView.php b/Neos.Fusion/Classes/View/FusionView.php
index e44ffb6f664..bf983346f4f 100644
--- a/Neos.Fusion/Classes/View/FusionView.php
+++ b/Neos.Fusion/Classes/View/FusionView.php
@@ -22,7 +22,6 @@
 use Neos\Fusion\Core\Runtime;
 use Neos\Fusion\Core\RuntimeFactory;
 use Neos\Fusion\Exception\RuntimeException;
-use Psr\Http\Message\ResponseInterface;
 
 /**
  * View for using Fusion for standard MVC controllers.
@@ -47,8 +46,7 @@ class FusionView extends AbstractView
         'fusionGlobals' => [null, 'Additional global variables; merged together with the "request". Must only be specified at creation.', FusionGlobals::class],
         'packageKey' => [null, 'The package key where the Fusion should be loaded from. If not given, is automatically derived from the current request.', 'string'],
         'debugMode' => [false, 'Flag to enable debug mode of the Fusion runtime explicitly (overriding the global setting).', 'boolean'],
-        'enableContentCache' => [false, 'Flag to enable content caching inside Fusion (overriding the global setting).', 'boolean'],
-        'renderHttpResponse' => [false, 'Flag to render fusion as http repose for advanced form support and Neos.Fusion:Http.ResponseHead support.', 'boolean'],
+        'enableContentCache' => [false, 'Flag to enable content caching inside Fusion (overriding the global setting).', 'boolean']
     ];
 
     /**
@@ -141,25 +139,13 @@ public function setFusionPathPatterns(array $pathPatterns)
     /**
      * Render the view
      *
-     * @return mixed|ResponseInterface The rendered view
+     * @return mixed The rendered view
      * @api
      */
     public function render()
     {
         $this->initializeFusionRuntime();
-
-        if ($this->getOption('renderHttpResponse') === true) {
-            return $this->fusionRuntime->renderResponse($this->getFusionPathForCurrentRequest(), $this->variables);
-        } else {
-            try {
-                $this->fusionRuntime->pushContextArray($this->variables);
-                return $this->fusionRuntime->render($this->getFusionPathForCurrentRequest());
-            } catch (RuntimeException $exception) {
-                throw $exception->getWrappedException();
-            } finally {
-                $this->fusionRuntime->popContext();
-            }
-        }
+        return $this->renderFusion();
     }
 
     /**
@@ -190,6 +176,9 @@ public function initializeFusionRuntime()
                 $this->parsedFusion,
                 $fusionGlobals
             );
+            if (isset($this->controllerContext)) {
+                $this->fusionRuntime->setControllerContext($this->controllerContext);
+            }
         }
         if (isset($this->options['debugMode'])) {
             $this->fusionRuntime->setDebugMode($this->options['debugMode']);
@@ -294,4 +283,21 @@ protected function getFusionPathForCurrentRequest()
         }
         return $this->fusionPath;
     }
+
+    /**
+     * Render the given Fusion and return the rendered page
+     * @return mixed
+     * @throws \Exception
+     */
+    protected function renderFusion()
+    {
+        $this->fusionRuntime->pushContextArray($this->variables);
+        try {
+            $output = $this->fusionRuntime->render($this->getFusionPathForCurrentRequest());
+        } catch (RuntimeException $exception) {
+            throw $exception->getPrevious();
+        }
+        $this->fusionRuntime->popContext();
+        return $output;
+    }
 }
diff --git a/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion
index fbcf0fc40a3..b190f6bd5a0 100644
--- a/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion
+++ b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion
@@ -1,5 +1 @@
 include: ./**/*.fusion
-include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/Join.fusion'
-include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/DataStructure.fusion'
-include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/Http.Message.fusion'
-include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/Http.ResponseHead.fusion'
diff --git a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
index 629508c8643..dc2f06d8ba9 100644
--- a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
+++ b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
@@ -15,7 +15,6 @@
 use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\Tests\FunctionalTestCase;
 use Neos\Fusion\View\FusionView;
-use Psr\Http\Message\ResponseInterface;
 
 /**
  * Testcase for the Fusion View
@@ -65,41 +64,6 @@ public function fusionViewOutputsVariable()
         self::assertEquals('XHallo Welt', $view->render());
     }
 
-    /**
-     * @test
-     */
-    public function fusionViewCanReturnHttpResponse()
-    {
-        $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
-        $view->setOption('renderHttpResponse', true);
-        $view->assign('test', 'Hallo Welt');
-        $response = $view->render();
-        self::assertInstanceOf(ResponseInterface::class, $response);
-        self::assertEquals('XHallo Welt', $view->render()->getBody()->getContents());
-    }
-
-    /**
-     * @test
-     */
-    public function fusionViewCanReturnHttpResponseFromHttpMessagePrototype()
-    {
-        $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
-        $view->setFusionPath('response');
-        self::assertSame(<<<EOF
-        HTTP/1.1 404 Not Found\r
-        Content-Type: application/json\r
-        \r
-        {"some":"json"}
-        EOF, $view->render());
-
-        $view->setOption('renderHttpResponse', true);
-        $response = $view->render();
-        self::assertInstanceOf(ResponseInterface::class, $response);
-        self::assertSame('{"some":"json"}', $response->getBody()->getContents());
-        self::assertSame(404, $response->getStatusCode());
-        self::assertSame("application/json", $response->getHeaderLine("Content-Type"));
-    }
-
     /**
      * Prepare a FusionView for testing that Mocks a request with the given controller and action names.
      *

From 8a53df6ab24452d29d279c25d811bbbb7ebc58de Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 18 Feb 2024 15:57:39 +0100
Subject: [PATCH 18/31] TASK: Make Fusion `FusionView` independent of
 `ControllerContext`

---
 Neos.Fusion/Classes/View/FusionView.php       | 58 ++++++++++++++-----
 .../AbstractFusionObjectTest.php              | 23 ++------
 .../FusionObjects/ContentCacheTest.php        |  7 +--
 .../Tests/Functional/View/FusionViewTest.php  | 18 +-----
 4 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/Neos.Fusion/Classes/View/FusionView.php b/Neos.Fusion/Classes/View/FusionView.php
index bf983346f4f..1d300f57f49 100644
--- a/Neos.Fusion/Classes/View/FusionView.php
+++ b/Neos.Fusion/Classes/View/FusionView.php
@@ -13,6 +13,7 @@
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\ActionRequest;
+use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\Mvc\View\AbstractView;
 use Neos\Fusion\Core\FusionConfiguration;
 use Neos\Fusion\Core\FusionGlobals;
@@ -94,6 +95,28 @@ public function setOption($optionName, $value)
         parent::setOption($optionName, $value);
     }
 
+    /**
+     * Legacy layer to make the `request` available in Fusion.
+     *
+     * Please use {@see setOption} and {@see FusionGlobals} instead:
+     *
+     *     $view->setOption('fusionGlobals', FusionGlobals::fromArray(['request' => $this->request]))
+     *
+     * @deprecated with Neos 9
+     */
+    public function setControllerContext(ControllerContext $controllerContext)
+    {
+        /** @var FusionGlobals $fusionGlobals */
+        $fusionGlobals = $this->options['fusionGlobals'] ?? FusionGlobals::empty();
+        if ($fusionGlobals->has('request')) {
+            // no need for legacy layer as the request was already set.
+            return;
+        }
+        $this->setOption('fusionGlobals', $fusionGlobals->merge(FusionGlobals::fromArray(
+            ['request' => $controllerContext->getRequest()]
+        )));
+    }
+
     /**
      * Sets the Fusion path to be rendered to an explicit value;
      * to be used mostly inside tests.
@@ -164,21 +187,10 @@ public function initializeFusionRuntime()
             if (!$fusionGlobals instanceof FusionGlobals) {
                 throw new \InvalidArgumentException('View option "fusionGlobals" must be of type FusionGlobals', 1694252923947);
             }
-            $fusionGlobals = $fusionGlobals->merge(
-                FusionGlobals::fromArray(
-                    array_filter([
-                        'request' => $this->controllerContext?->getRequest()
-                    ])
-                )
-            );
-
             $this->fusionRuntime = $this->runtimeFactory->createFromConfiguration(
                 $this->parsedFusion,
                 $fusionGlobals
             );
-            if (isset($this->controllerContext)) {
-                $this->fusionRuntime->setControllerContext($this->controllerContext);
-            }
         }
         if (isset($this->options['debugMode'])) {
             $this->fusionRuntime->setDebugMode($this->options['debugMode']);
@@ -250,9 +262,9 @@ protected function getPackageKey()
         if ($packageKey !== null) {
             return $packageKey;
         } else {
-            $request = $this->controllerContext?->getRequest();
+            $request = $this->getRequestFromFusionGlobals();
             if (!$request) {
-                throw new \RuntimeException(sprintf('To resolve the @package in all fusionPathPatterns, either packageKey has to be specified, or the current request be available.'));
+                throw new \RuntimeException(sprintf('To resolve the @package in all fusionPathPatterns, either packageKey has to be specified, or the current request be available.'), 1708267874);
             }
             return $request->getControllerPackageKey();
         }
@@ -270,8 +282,10 @@ protected function getFusionPathForCurrentRequest()
             if ($fusionPath !== null) {
                 $this->fusionPath = $fusionPath;
             } else {
-                /** @var $request ActionRequest */
-                $request = $this->controllerContext->getRequest();
+                $request = $this->getRequestFromFusionGlobals();
+                if (!$request) {
+                    throw new \RuntimeException(sprintf('The option `fusionPath` was not set. Could not fallback to the current request.'), 1708267857);
+                }
                 $fusionPathForCurrentRequest = $request->getControllerObjectName();
                 $fusionPathForCurrentRequest = str_replace('\\Controller\\', '\\', $fusionPathForCurrentRequest);
                 $fusionPathForCurrentRequest = str_replace('\\', '/', $fusionPathForCurrentRequest);
@@ -300,4 +314,18 @@ protected function renderFusion()
         $this->fusionRuntime->popContext();
         return $output;
     }
+
+    private function getRequestFromFusionGlobals(): ?ActionRequest
+    {
+        /** @var FusionGlobals $fusionGlobals */
+        $fusionGlobals = $this->options['fusionGlobals'] ?? FusionGlobals::empty();
+        if (!$fusionGlobals instanceof FusionGlobals) {
+            throw new \InvalidArgumentException('View option "fusionGlobals" must be of type FusionGlobals', 1694252923947);
+        }
+        $actionRequest = $fusionGlobals->get('request');
+        if (!$actionRequest instanceof ActionRequest) {
+            return null;
+        }
+        return $actionRequest;
+    }
 }
diff --git a/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php b/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
index 810452e8a2b..749af8fe021 100644
--- a/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
+++ b/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
@@ -12,11 +12,8 @@
  */
 
 use Neos\Flow\Mvc\ActionRequest;
-use Neos\Flow\Mvc\ActionResponse;
-use Neos\Flow\Mvc\Controller\Arguments;
-use Neos\Flow\Mvc\Controller\ControllerContext;
-use Neos\Flow\Mvc\Routing\UriBuilder;
 use Neos\Flow\Tests\FunctionalTestCase;
+use Neos\Fusion\Core\FusionGlobals;
 use Neos\Fusion\View\FusionView;
 use Psr\Http\Message\ServerRequestFactoryInterface;
 
@@ -27,9 +24,9 @@
 abstract class AbstractFusionObjectTest extends FunctionalTestCase
 {
     /**
-     * @var ControllerContext
+     * @var ActionRequest
      */
-    protected $controllerContext;
+    protected $request;
 
     /**
      * Helper to build a Fusion view object
@@ -43,20 +40,10 @@ protected function buildView()
         /** @var ServerRequestFactoryInterface $httpRequestFactory */
         $httpRequestFactory = $this->objectManager->get(ServerRequestFactoryInterface::class);
         $httpRequest = $httpRequestFactory->createServerRequest('GET', 'http://localhost/');
-        $request = ActionRequest::fromHttpRequest($httpRequest);
+        $this->request = ActionRequest::fromHttpRequest($httpRequest);
 
-        $uriBuilder = new UriBuilder();
-        $uriBuilder->setRequest($request);
-
-        $this->controllerContext = new ControllerContext(
-            $request,
-            new ActionResponse(),
-            new Arguments([]),
-            $uriBuilder
-        );
-
-        $view->setControllerContext($this->controllerContext);
         $view->setPackageKey('Neos.Fusion');
+        $view->setOption('fusionGlobals', FusionGlobals::fromArray(['request' => $this->request]));
         $view->setFusionPathPattern(__DIR__ . '/Fixtures/Fusion');
         $view->assign('fixtureDirectory', __DIR__ . '/Fixtures/');
 
diff --git a/Neos.Fusion/Tests/Functional/FusionObjects/ContentCacheTest.php b/Neos.Fusion/Tests/Functional/FusionObjects/ContentCacheTest.php
index b98dfc1a503..a6e1c494449 100644
--- a/Neos.Fusion/Tests/Functional/FusionObjects/ContentCacheTest.php
+++ b/Neos.Fusion/Tests/Functional/FusionObjects/ContentCacheTest.php
@@ -13,7 +13,6 @@
 
 use Neos\Flow\Cache\CacheManager;
 use Neos\Cache\Frontend\FrontendInterface;
-use Neos\Flow\Mvc\ActionRequest;
 use Neos\Fusion\Core\Cache\ContentCache;
 use Neos\Fusion\Tests\Functional\FusionObjects\Fixtures\Model\TestModel;
 
@@ -331,8 +330,7 @@ public function conditionsAreAppliedForUncachedSegment()
             'object' => $object
         ]);
 
-        /** @var \Neos\Flow\Mvc\ActionRequest $actionRequest */
-        $actionRequest = $this->controllerContext->getRequest();
+        $actionRequest = $this->request;
         $actionRequest->setArgument('currentPage', 1);
 
         $firstRenderResult = $view->render();
@@ -729,8 +727,7 @@ public function contextIsCorrectlyEvaluated()
         $view->assign('someContextVariable', 'prettyUnused');
         $view->setFusionPath('contentCache/dynamicWithChangingDiscriminator');
 
-        /** @var ActionRequest $actionRequest */
-        $actionRequest = $this->controllerContext->getRequest();
+        $actionRequest = $this->request;
         $actionRequest->setArgument('testArgument', '1');
         $firstRenderResult = $view->render();
 
diff --git a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
index dc2f06d8ba9..1969b7ada0d 100644
--- a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
+++ b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
@@ -12,8 +12,8 @@
  */
 
 use Neos\Flow\Mvc\ActionRequest;
-use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\Tests\FunctionalTestCase;
+use Neos\Fusion\Core\FusionGlobals;
 use Neos\Fusion\View\FusionView;
 
 /**
@@ -22,19 +22,6 @@
  */
 class FusionViewTest extends FunctionalTestCase
 {
-    /**
-     * @var ControllerContext
-     */
-    protected $mockControllerContext;
-
-    /**
-     * Initializer
-     */
-    public function setUp(): void
-    {
-        $this->mockControllerContext = $this->getMockBuilder(ControllerContext::class)->disableOriginalConstructor()->getMock();
-    }
-
     /**
      * @test
      */
@@ -76,10 +63,9 @@ protected function buildView($controllerObjectName, $controllerActionName)
         $request = $this->getMockBuilder(ActionRequest::class)->disableOriginalConstructor()->getMock();
         $request->expects(self::any())->method('getControllerObjectName')->will(self::returnValue($controllerObjectName));
         $request->expects(self::any())->method('getControllerActionName')->will(self::returnValue($controllerActionName));
-        $this->mockControllerContext->expects(self::any())->method('getRequest')->will(self::returnValue($request));
 
         $view = new FusionView();
-        $view->setControllerContext($this->mockControllerContext);
+        $view->setOption('fusionGlobals', FusionGlobals::fromArray(['request' => $request]));
         $view->setFusionPathPattern(__DIR__ . '/Fixtures/Fusion');
 
         return $view;

From c0ddd4595f96f9ca65575cc99898046bb3dc2abd Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Thu, 22 Feb 2024 19:03:50 +0100
Subject: [PATCH 19/31] !!! TASK: Introduce `LegacyFusionControllerContext`
 instead of using `ControllerContext`

`getArguments` removed without replacement.
---
 .../Core/LegacyFusionControllerContext.php    | 127 ++++++++++++++++++
 Neos.Fusion/Classes/Core/Runtime.php          |  32 +----
 .../Fusion/ExceptionHandlers/PageHandler.php  |  11 +-
 .../Unit/Fusion/PluginImplementationTest.php  |   2 +
 4 files changed, 144 insertions(+), 28 deletions(-)
 create mode 100644 Neos.Fusion/Classes/Core/LegacyFusionControllerContext.php

diff --git a/Neos.Fusion/Classes/Core/LegacyFusionControllerContext.php b/Neos.Fusion/Classes/Core/LegacyFusionControllerContext.php
new file mode 100644
index 00000000000..07d02d0e6f1
--- /dev/null
+++ b/Neos.Fusion/Classes/Core/LegacyFusionControllerContext.php
@@ -0,0 +1,127 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\Fusion\Core;
+
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Mvc\ActionRequest;
+use Neos\Flow\Mvc\ActionResponse;
+use Neos\Flow\Mvc\Controller\ControllerContext;
+use Neos\Flow\Mvc\FlashMessage\FlashMessageContainer;
+use Neos\Flow\Mvc\FlashMessage\FlashMessageService;
+use Neos\Flow\Mvc\Routing\UriBuilder;
+
+/**
+ * Legacy stub to replace the original {@see ControllerContext} inside Fusion {@see Runtime::getControllerContext()}.
+ *
+ * The concept of the controller context inside Fusion has been deprecated.
+ *
+ * You should definitely not pass this object along further, which will also most likely not work as it doesn't
+ * satisfy the constraint of `instanceof ControllerContext`!
+ *
+ * To migrate the use case of fetching the active request, please look into {@see FusionGlobals::get()} instead.
+ * By convention, an {@see ActionRequest} will be available as `request`:
+ *
+ *     $actionRequest = $this->runtime->fusionGlobals->get('request');
+ *     if (!$actionRequest instanceof ActionRequest) {
+ *         // fallback or error
+ *     }
+ *
+ * To get an {@see UriBuilder} proceed with:
+ *
+ *     $uriBuilder = new UriBuilder();
+ *     $uriBuilder->setRequest($actionRequest);
+ *
+ * WARNING regarding {@see Runtime::getControllerContext()}:
+ *      Invoking this backwards-compatible layer is possibly unsafe, if the rendering was not started
+ *      in {@see self::renderResponse()} or no `request` global is available. This will raise an exception.
+ *
+ * @deprecated with Neos 9.0 can be removed with 10
+ * @internal
+ */
+final class LegacyFusionControllerContext
+{
+    /**
+     * @Flow\Inject
+     * @var FlashMessageService
+     */
+    protected $flashMessageService;
+
+    public function __construct(
+        private readonly ActionRequest $request,
+        private readonly ActionResponse $legacyActionResponseForCurrentRendering
+    ) {
+    }
+
+    /**
+     * To migrate the use case of fetching the active request, please look into {@see FusionGlobals::get()} instead.
+     * By convention, an {@see ActionRequest} will be available as `request`:
+     *
+     *     $actionRequest = $this->runtime->fusionGlobals->get('request');
+     *     if (!$actionRequest instanceof ActionRequest) {
+     *         // fallback or error
+     *     }
+     *
+     * @deprecated with Neos 9.0 can be removed with 10
+     */
+    public function getRequest(): ActionRequest
+    {
+        return $this->request;
+    }
+
+    /**
+     * To migrate the use case of getting the UriBuilder please use this instead:
+     *
+     *     $actionRequest = $this->runtime->fusionGlobals->get('request');
+     *     if (!$actionRequest instanceof ActionRequest) {
+     *         // fallback or error
+     *     }
+     *     $uriBuilder = new UriBuilder();
+     *     $uriBuilder->setRequest($actionRequest);
+     *
+     * @deprecated with Neos 9.0 can be removed with 10
+     */
+    public function getUriBuilder(): UriBuilder
+    {
+        $uriBuilder = new UriBuilder();
+        $uriBuilder->setRequest($this->request);
+        return $uriBuilder;
+    }
+
+    /**
+     * To migrate this use case please use {@see FlashMessageService::getFlashMessageContainerForRequest()} in
+     * combination with fetching the active request as described here {@see getRequest} instead.
+     *
+     * @deprecated with Neos 9.0 can be removed with 10
+     */
+    public function getFlashMessageContainer(): FlashMessageContainer
+    {
+        return $this->flashMessageService->getFlashMessageContainerForRequest($this->request);
+    }
+
+    /**
+     * PURELY INTERNAL with partially undefined behaviour!!!
+     *
+     * Gives access to the legacy mutable action response simulation {@see Runtime::withSimulatedLegacyControllerContext()}
+     *
+     * Initially it was possible to mutate the current response of the active MVC controller though this getter.
+     *
+     * While *HIGHLY* internal behaviour and *ONLY* to be used by Neos.Fusion.Form or Neos.Neos:Plugin
+     * this legacy layer is in place still allows this functionality.
+     *
+     * @deprecated with Neos 9.0 can be removed with 10
+     * @internal THIS SHOULD NEVER BE CALLED ON USER-LAND
+     */
+    public function getResponse(): ActionResponse
+    {
+        // expose action response to be possibly mutated in neos forms or fusion plugins.
+        // this behaviour is highly internal and deprecated!
+        return $this->legacyActionResponseForCurrentRendering;
+    }
+
+    /**
+     * The method {@see ControllerContext::getArguments()} was removed without replacement.
+     */
+    // public function getArguments(): Arguments;
+}
diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 2d44aaac02e..d9755b60ef6 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -20,10 +20,7 @@
 use Neos\Flow\Configuration\Exception\InvalidConfigurationException;
 use Neos\Flow\Mvc\ActionRequest;
 use Neos\Flow\Mvc\ActionResponse;
-use Neos\Flow\Mvc\Controller\Arguments;
-use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\Mvc\Exception\StopActionException;
-use Neos\Flow\Mvc\Routing\UriBuilder;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 use Neos\Flow\Security\Exception as SecurityException;
 use Neos\Fusion\Core\Cache\RuntimeContentCache;
@@ -978,22 +975,7 @@ private function withSimulatedLegacyControllerContext(\Closure $renderer): Respo
     /**
      * The concept of the controller context inside Fusion has been deprecated.
      *
-     * To migrate the use case of fetching the active request, please look into {@see FusionGlobals::get()} instead.
-     * By convention, an {@see ActionRequest} will be available as `request`:
-     *
-     * ```php
-     * $actionRequest = $this->runtime->fusionGlobals->get('request');
-     * if (!$actionRequest instanceof ActionRequest) {
-     *     // fallback or error
-     * }
-     * ```
-     *
-     * To get an {@see UriBuilder} proceed with:
-     *
-     * ```php
-     * $uriBuilder = new UriBuilder();
-     * $uriBuilder->setRequest($actionRequest);
-     * ```
+     * For further information and migration strategies, please look into {@see LegacyFusionControllerContext}
      *
      * WARNING:
      *      Invoking this backwards-compatible layer is possibly unsafe, if the rendering was not started
@@ -1001,8 +983,9 @@ private function withSimulatedLegacyControllerContext(\Closure $renderer): Respo
      *
      * @deprecated with Neos 9.0
      * @internal
+     * @throws Exception if unsafe call
      */
-    public function getControllerContext(): ControllerContext
+    public function getControllerContext(): LegacyFusionControllerContext
     {
         // legacy controller context layer
         $actionRequest = $this->fusionGlobals->get('request');
@@ -1010,16 +993,11 @@ public function getControllerContext(): ControllerContext
             throw new Exception(sprintf('Fusions simulated legacy controller context is only available inside `Runtime::renderResponse` and when the Fusion global "request" is an ActionRequest.'), 1706458355);
         }
 
-        $uriBuilder = new UriBuilder();
-        $uriBuilder->setRequest($actionRequest);
-
-        return new ControllerContext(
+        return new LegacyFusionControllerContext(
             $actionRequest,
             // expose action response to be possibly mutated in neos forms or fusion plugins.
             // this behaviour is highly internal and deprecated!
-            $this->legacyActionResponseForCurrentRendering,
-            new Arguments([]),
-            $uriBuilder
+            $this->legacyActionResponseForCurrentRendering
         );
     }
 
diff --git a/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php b/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php
index 56ff4bed0a0..c20eca8bcda 100644
--- a/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php
+++ b/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php
@@ -19,6 +19,8 @@
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Exception as FlowException;
+use Neos\Flow\Mvc\Controller\Arguments;
+use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\Security\Authorization\PrivilegeManagerInterface;
 use Neos\Flow\Utility\Environment;
 use Neos\FluidAdaptor\View\StandaloneView;
@@ -129,7 +131,14 @@ protected function wrapHttpResponse(\Exception $exception, string $bodyContent):
     protected function prepareFluidView()
     {
         $fluidView = new StandaloneView();
-        $fluidView->setControllerContext($this->runtime->getControllerContext());
+        $fluidView->setControllerContext(
+            new ControllerContext(
+                $this->runtime->getControllerContext()->getRequest(),
+                $this->runtime->getControllerContext()->getResponse(),
+                new Arguments(),
+                $this->runtime->getControllerContext()->getUriBuilder()
+            )
+        );
         $fluidView->setFormat('html');
         $fluidView->setTemplatePathAndFilename('resource://Neos.Neos/Private/Templates/Error/NeosBackendMessage.html');
         $fluidView->setLayoutRootPath('resource://Neos.Neos/Private/Layouts/');
diff --git a/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php b/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
index e8aff26d8ea..be0cc8b83f8 100644
--- a/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
+++ b/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
@@ -119,6 +119,8 @@ public function responseHeadersDataProvider(): array
      */
     public function evaluateSetHeaderIntoParent(string $message, array $input, array $expected): void
     {
+        $this->markTestSkipped('TODO Doesnt test any thing really, has to be rewritten as behat test.');
+
         $this->pluginImplementation->method('buildPluginRequest')->willReturn($this->mockActionRequest);
 
         $parentResponse = new ActionResponse();

From 64c1a418e1c46881ea9cf268499d9013fd978d9a Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Thu, 22 Feb 2024 21:02:55 +0100
Subject: [PATCH 20/31] TASK: Fix passing `tags` to plugin

---
 Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php b/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
index be0cc8b83f8..3dc6fba48dc 100644
--- a/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
+++ b/Neos.Neos/Tests/Unit/Fusion/PluginImplementationTest.php
@@ -65,6 +65,8 @@ class PluginImplementationTest extends UnitTestCase
 
     public function setUp(): void
     {
+        $this->markTestSkipped('TODO Doesnt test any thing really, has to be rewritten as behat test.');
+
         $this->pluginImplementation = $this->getAccessibleMock(PluginImplementation::class, ['buildPluginRequest'], [], '', false);
 
         $this->mockHttpUri = $this->getMockBuilder(Uri::class)->disableOriginalConstructor()->getMock();
@@ -92,6 +94,11 @@ public function setUp(): void
      */
     public function responseHeadersDataProvider(): array
     {
+        /*
+         * Fyi (from christian) Multiple competing headers like that are a broken use case anyways.
+         * Headers by definition can appear multiple times, we can't really know if we should remove the first one and when not.
+         * IMHO the test is misleading the result might as well (correctly) be key => [value, value]
+         */
         return [
             [
                 'Plugin response key does already exist in parent with same value',
@@ -119,8 +126,6 @@ public function responseHeadersDataProvider(): array
      */
     public function evaluateSetHeaderIntoParent(string $message, array $input, array $expected): void
     {
-        $this->markTestSkipped('TODO Doesnt test any thing really, has to be rewritten as behat test.');
-
         $this->pluginImplementation->method('buildPluginRequest')->willReturn($this->mockActionRequest);
 
         $parentResponse = new ActionResponse();

From 35d06fb6d6ff48d399081b85299b56ddf8e6d159 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:21:42 +0100
Subject: [PATCH 21/31] !!! BUGFIX: Fusions `FusionView` will return
 `ResponseInterface` instead of `mixed`

This will make the `Neos.Fusion:Http.Message` prototype work out of the box.
This was also done to return a value allowed by the view:
`string|ActionResponse|ResponseInterface|StreamInterface|\Stringable`

Adjusts AbstractFusionObjectTest::buildView to the runtime directly.
We still use a `ViewInterface` here as this allows us to not rewrite all our tests :D
We will rewrite them either way in behat some time.
---
 Neos.Fusion/Classes/View/FusionView.php       | 28 ++----
 .../AbstractFusionObjectTest.php              | 88 ++++++++++++++++---
 .../FusionObjects/ReservedKeysTest.php        | 10 ++-
 .../View/Fixtures/Fusion/Root.fusion          |  4 +
 .../Tests/Functional/View/FusionViewTest.php  | 33 ++++++-
 5 files changed, 123 insertions(+), 40 deletions(-)

diff --git a/Neos.Fusion/Classes/View/FusionView.php b/Neos.Fusion/Classes/View/FusionView.php
index 1d300f57f49..f418bc7ec9e 100644
--- a/Neos.Fusion/Classes/View/FusionView.php
+++ b/Neos.Fusion/Classes/View/FusionView.php
@@ -22,7 +22,7 @@
 use Neos\Fusion\Core\Parser;
 use Neos\Fusion\Core\Runtime;
 use Neos\Fusion\Core\RuntimeFactory;
-use Neos\Fusion\Exception\RuntimeException;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * View for using Fusion for standard MVC controllers.
@@ -162,13 +162,16 @@ public function setFusionPathPatterns(array $pathPatterns)
     /**
      * Render the view
      *
-     * @return mixed The rendered view
+     * @return ResponseInterface The rendered view
      * @api
      */
-    public function render()
+    public function render(): ResponseInterface
     {
         $this->initializeFusionRuntime();
-        return $this->renderFusion();
+        return $this->fusionRuntime->renderResponse(
+            $this->getFusionPathForCurrentRequest(),
+            $this->variables
+        );
     }
 
     /**
@@ -298,23 +301,6 @@ protected function getFusionPathForCurrentRequest()
         return $this->fusionPath;
     }
 
-    /**
-     * Render the given Fusion and return the rendered page
-     * @return mixed
-     * @throws \Exception
-     */
-    protected function renderFusion()
-    {
-        $this->fusionRuntime->pushContextArray($this->variables);
-        try {
-            $output = $this->fusionRuntime->render($this->getFusionPathForCurrentRequest());
-        } catch (RuntimeException $exception) {
-            throw $exception->getPrevious();
-        }
-        $this->fusionRuntime->popContext();
-        return $output;
-    }
-
     private function getRequestFromFusionGlobals(): ?ActionRequest
     {
         /** @var FusionGlobals $fusionGlobals */
diff --git a/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php b/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
index 749af8fe021..94cfca2874d 100644
--- a/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
+++ b/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
@@ -11,10 +11,16 @@
  * source code.
  */
 
+use GuzzleHttp\Psr7\ServerRequest;
 use Neos\Flow\Mvc\ActionRequest;
+use Neos\Flow\Mvc\Controller\ControllerContext;
+use Neos\Flow\Mvc\View\ViewInterface;
 use Neos\Flow\Tests\FunctionalTestCase;
 use Neos\Fusion\Core\FusionGlobals;
-use Neos\Fusion\View\FusionView;
+use Neos\Fusion\Core\FusionSourceCodeCollection;
+use Neos\Fusion\Core\Runtime;
+use Neos\Fusion\Core\RuntimeFactory;
+use Neos\Fusion\Exception\RuntimeException;
 use Psr\Http\Message\ServerRequestFactoryInterface;
 
 /**
@@ -29,25 +35,81 @@ abstract class AbstractFusionObjectTest extends FunctionalTestCase
     protected $request;
 
     /**
-     * Helper to build a Fusion view object
+     * TODO THIS IS HACKY AS WE CREATE AN OWN VIEW
      *
-     * @return FusionView
+     * We do that as the FusionView (rightfully) does return mixed anymore.
+     *
+     * We could instead also rewrite all tests to use the Runtime instead.
+     *
+     * But that would be a lot of effort for nothing.
+     *
+     * Instead we want to refactor our tests to behat at some point.
+     *
+     * Thus the hack.
+     *
+     * @return ViewInterface
      */
     protected function buildView()
     {
-        $view = new FusionView();
-
         /** @var ServerRequestFactoryInterface $httpRequestFactory */
-        $httpRequestFactory = $this->objectManager->get(ServerRequestFactoryInterface::class);
-        $httpRequest = $httpRequestFactory->createServerRequest('GET', 'http://localhost/');
-        $this->request = ActionRequest::fromHttpRequest($httpRequest);
+        $this->request = ActionRequest::fromHttpRequest(new ServerRequest('GET', 'http://localhost/'));
+
+        $runtime = $this->objectManager->get(RuntimeFactory::class)->createFromSourceCode(
+            FusionSourceCodeCollection::fromFilePath(__DIR__ . '/Fixtures/Fusion/Root.fusion'),
+            FusionGlobals::fromArray(['request' => $this->request])
+        );
 
-        $view->setPackageKey('Neos.Fusion');
-        $view->setOption('fusionGlobals', FusionGlobals::fromArray(['request' => $this->request]));
-        $view->setFusionPathPattern(__DIR__ . '/Fixtures/Fusion');
-        $view->assign('fixtureDirectory', __DIR__ . '/Fixtures/');
+        $runtime->pushContext('fixtureDirectory', __DIR__ . '/Fixtures/');
 
-        return $view;
+        // todo rewrite everything as behat test :D
+        return new class($runtime) implements ViewInterface {
+            private string $fusionPath;
+            public function __construct(
+                private readonly Runtime $runtime
+            ) {
+            }
+            public function setFusionPath(string $fusionPath)
+            {
+                $this->fusionPath = $fusionPath;
+            }
+            public function assign($key, $value)
+            {
+                $this->runtime->pushContext($key, $value);
+            }
+            public function setOption($key, $value)
+            {
+                match ($key) {
+                    'enableContentCache' => $this->runtime->setEnableContentCache($value),
+                    'debugMode' => $this->runtime->setDebugMode($value)
+                };
+            }
+            public function assignMultiple(array $values)
+            {
+                foreach ($values as $key => $value) {
+                    $this->runtime->pushContext($key, $value);
+                }
+            }
+            public function render()
+            {
+                try {
+                    return $this->runtime->render($this->fusionPath);
+                } catch (RuntimeException $e) {
+                    throw $e->getWrappedException();
+                }
+            }
+            public static function createWithOptions(array $options)
+            {
+                throw new \BadMethodCallException();
+            }
+            public function setControllerContext(ControllerContext $controllerContext)
+            {
+                throw new \BadMethodCallException();
+            }
+            public function canRender(ControllerContext $controllerContext)
+            {
+                throw new \BadMethodCallException();
+            }
+        };
     }
 
     /**
diff --git a/Neos.Fusion/Tests/Functional/FusionObjects/ReservedKeysTest.php b/Neos.Fusion/Tests/Functional/FusionObjects/ReservedKeysTest.php
index d0789617ca2..cbf2d3b72e1 100644
--- a/Neos.Fusion/Tests/Functional/FusionObjects/ReservedKeysTest.php
+++ b/Neos.Fusion/Tests/Functional/FusionObjects/ReservedKeysTest.php
@@ -11,6 +11,9 @@
  * source code.
  */
 
+use Neos\Fusion\Core\FusionGlobals;
+use Neos\Fusion\Core\FusionSourceCodeCollection;
+use Neos\Fusion\Core\RuntimeFactory;
 use Neos\Fusion\Exception;
 
 /**
@@ -25,9 +28,10 @@ class ReservedKeysTest extends AbstractFusionObjectTest
     public function usingReservedKeysThrowsException()
     {
         $this->expectException(Exception::class);
-        $view = $this->buildView();
-        $view->setFusionPathPattern(__DIR__ . '/Fixtures/ReservedKeysFusion');
-        $view->render();
+        $this->objectManager->get(RuntimeFactory::class)->createFromSourceCode(
+            FusionSourceCodeCollection::fromFilePath(__DIR__ . '/Fixtures/ReservedKeysFusion/ReservedKeys.fusion'),
+            FusionGlobals::empty()
+        );
     }
 
     /**
diff --git a/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion
index b190f6bd5a0..fbcf0fc40a3 100644
--- a/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion
+++ b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/Root.fusion
@@ -1 +1,5 @@
 include: ./**/*.fusion
+include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/Join.fusion'
+include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/DataStructure.fusion'
+include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/Http.Message.fusion'
+include: 'resource://Neos.Fusion/Private/Fusion/Prototypes/Http.ResponseHead.fusion'
diff --git a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
index 1969b7ada0d..7ccace20963 100644
--- a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
+++ b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
@@ -15,6 +15,7 @@
 use Neos\Flow\Tests\FunctionalTestCase;
 use Neos\Fusion\Core\FusionGlobals;
 use Neos\Fusion\View\FusionView;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Testcase for the Fusion View
@@ -28,7 +29,7 @@ class FusionViewTest extends FunctionalTestCase
     public function fusionViewIsUsedForRendering()
     {
         $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
-        self::assertEquals('X', $view->render());
+        self::assertEquals('X', $view->render()->getBody()->getContents());
     }
 
     /**
@@ -38,7 +39,7 @@ public function fusionViewUsesGivenPathIfSet()
     {
         $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
         $view->setFusionPath('foo/bar');
-        self::assertEquals('Xfoobar', $view->render());
+        self::assertEquals('Xfoobar', $view->render()->getBody()->getContents());
     }
 
     /**
@@ -48,7 +49,33 @@ public function fusionViewOutputsVariable()
     {
         $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
         $view->assign('test', 'Hallo Welt');
-        self::assertEquals('XHallo Welt', $view->render());
+        self::assertEquals('XHallo Welt', $view->render()->getBody()->getContents());
+    }
+
+    /**
+     * @test
+     */
+    public function fusionVieReturnsHttpResponse()
+    {
+        $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
+        $view->assign('test', 'Hallo Welt');
+        $response = $view->render();
+        self::assertInstanceOf(ResponseInterface::class, $response);
+        self::assertEquals('XHallo Welt', $view->render()->getBody()->getContents());
+    }
+
+    /**
+     * @test
+     */
+    public function fusionViewReturnsHttpResponseFromHttpMessagePrototype()
+    {
+        $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
+        $view->setFusionPath('response');
+        $response = $view->render();
+        self::assertInstanceOf(ResponseInterface::class, $response);
+        self::assertSame('{"some":"json"}', $response->getBody()->getContents());
+        self::assertSame(404, $response->getStatusCode());
+        self::assertSame('application/json', $response->getHeaderLine('Content-Type'));
     }
 
     /**

From a24805e5672e6d9b567dfe4d5f95b09fa09c5bf3 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:22:50 +0100
Subject: [PATCH 22/31] TASK: `FusionExceptionView` handles psr response
 correctly

---
 .../Classes/View/FusionExceptionView.php      | 37 ++++---------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/Neos.Neos/Classes/View/FusionExceptionView.php b/Neos.Neos/Classes/View/FusionExceptionView.php
index 4feb70ea7c5..c70f22ee50f 100644
--- a/Neos.Neos/Classes/View/FusionExceptionView.php
+++ b/Neos.Neos/Classes/View/FusionExceptionView.php
@@ -22,9 +22,6 @@
 use Neos\Flow\Core\Bootstrap;
 use Neos\Flow\Http\RequestHandler as HttpRequestHandler;
 use Neos\Flow\Mvc\ActionRequest;
-use Neos\Flow\Mvc\ActionResponse;
-use Neos\Flow\Mvc\Controller\Arguments;
-use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\Mvc\Routing\UriBuilder;
 use Neos\Flow\Mvc\View\AbstractView;
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
@@ -90,14 +87,7 @@ class FusionExceptionView extends AbstractView
     #[Flow\Inject]
     protected DomainRepository $domainRepository;
 
-    /**
-     * @return mixed
-     * @throws \Neos\Flow\I18n\Exception\InvalidLocaleIdentifierException
-     * @throws \Neos\Fusion\Exception
-     * @throws \Neos\Neos\Domain\Exception
-     * @throws \Neos\Flow\Security\Exception
-     */
-    public function render()
+    public function render(): string
     {
         $requestHandler = $this->bootstrap->getActiveRequestHandler();
 
@@ -142,18 +132,12 @@ public function render()
         $request->setFormat('html');
         $uriBuilder = new UriBuilder();
         $uriBuilder->setRequest($request);
-        $controllerContext = new ControllerContext(
-            $request,
-            new ActionResponse(),
-            new Arguments([]),
-            $uriBuilder
-        );
 
         /** @var SecurityContext $securityContext */
         $securityContext = $this->objectManager->get(SecurityContext::class);
         $securityContext->setRequest($request);
 
-        $fusionRuntime = $this->getFusionRuntime($currentSiteNode, $controllerContext);
+        $fusionRuntime = $this->getFusionRuntime($currentSiteNode, $request);
 
         $this->setFallbackRuleFromDimension($dimensionSpacePoint);
 
@@ -175,16 +159,9 @@ public function render()
         return $httpResponse->getBody()->getContents();
     }
 
-    /**
-     * @param Node $currentSiteNode
-     * @param ControllerContext $controllerContext
-     * @return FusionRuntime
-     * @throws \Neos\Fusion\Exception
-     * @throws \Neos\Neos\Domain\Exception
-     */
     protected function getFusionRuntime(
         Node $currentSiteNode,
-        ControllerContext $controllerContext
+        ActionRequest $actionRequest
     ): FusionRuntime {
         if ($this->fusionRuntime === null) {
             $site = $this->siteRepository->findSiteBySiteNode($currentSiteNode);
@@ -192,7 +169,7 @@ protected function getFusionRuntime(
             $fusionConfiguration = $this->fusionService->createFusionConfigurationFromSite($site);
 
             $fusionGlobals = FusionGlobals::fromArray([
-                'request' => $controllerContext->getRequest(),
+                'request' => $actionRequest,
                 'renderingMode' => RenderingMode::createFrontend()
             ]);
             $this->fusionRuntime = $this->runtimeFactory->createFromConfiguration(
@@ -207,17 +184,19 @@ protected function getFusionRuntime(
         return $this->fusionRuntime;
     }
 
-    private function renderErrorWelcomeScreen(): mixed
+    private function renderErrorWelcomeScreen(): string
     {
         // in case no neos site being there or no site node we cannot continue with the fusion exception view,
         // as we wouldn't know the site and cannot get the site's root.fusion
         // instead we render the welcome screen directly
+        /** @var \Neos\Fusion\View\FusionView $view */
         $view = \Neos\Fusion\View\FusionView::createWithOptions([
             'fusionPath' => 'Neos/Fusion/NotFoundExceptions',
             'fusionPathPatterns' => ['resource://Neos.Neos/Private/Fusion/Error/Root.fusion'],
             'enableContentCache' => false,
         ]);
         $view->assignMultiple($this->variables);
-        return $view->render();
+        $output = $view->render();
+        return $output->getBody()->getContents();
     }
 }

From 9450f749e17290dfa1416fc65e9c50631f5c9972 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Fri, 23 Feb 2024 19:39:53 +0100
Subject: [PATCH 23/31] TASK: `Runtime::renderResponse` will try to
 jsonSerialize result if not a string

After a discussion with Christian we found it to be a more workable behaviour than throwing an exception.
---
 Neos.Fusion/Classes/Core/Runtime.php          |  25 ++-
 .../Fixtures/Fusion/JsonSerializesPath.fusion |   5 +
 .../Tests/Functional/View/FusionViewTest.php  |  14 ++
 Neos.Fusion/Tests/Unit/Core/RuntimeTest.php   | 171 ++++++++++++++++++
 4 files changed, 207 insertions(+), 8 deletions(-)
 create mode 100644 Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/JsonSerializesPath.fusion

diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index d9755b60ef6..4fae3e65256 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -13,7 +13,6 @@
 
 use GuzzleHttp\Psr7\Message;
 use GuzzleHttp\Psr7\Response;
-use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Message\ResponseInterface;
 use Neos\Eel\Utility as EelUtility;
 use Neos\Flow\Annotations as Flow;
@@ -265,6 +264,9 @@ public function getLastEvaluationStatus()
         return $this->lastEvaluationStatus;
     }
 
+    /**
+     * todo
+     */
     public function renderResponse(string $fusionPath, array $contextArray): ResponseInterface
     {
         /** Unlike pushContextArray, we don't allow to overrule fusion globals {@see self::pushContext} */
@@ -293,14 +295,21 @@ public function renderResponse(string $fusionPath, array $contextArray): Respons
                 return Message::parseResponse($output);
             }
 
-            $stream = match (true) {
-                is_string($output),
-                $output instanceof \Stringable => Utils::streamFor((string)$output),
-                $output === null, $output === false => Utils::streamFor(''),
-                default => throw new \RuntimeException(sprintf('Cannot render %s into http response body.', get_debug_type($output)), 1706454898)
-            };
+            if (is_string($output) || $output instanceof \Stringable || $output === null) {
+                return new Response(body: $output);
+            }
+
+            if (is_array($output) || $output instanceof \JsonSerializable || $output instanceof \stdClass || is_bool($output)) {
+                try {
+                    $jsonSerialized = json_encode($output, JSON_THROW_ON_ERROR);
+                } catch (\JsonException $e) {
+                    throw new \RuntimeException(sprintf('Cannot render %s into http response body.', get_debug_type($output)), 1708713158, $e);
+                }
+                $jsonResponse = new Response(body: $jsonSerialized);
+                return $jsonResponse->withHeader('Content-Type', 'application/json');
+            }
 
-            return new Response(body: $stream);
+            throw new \RuntimeException(sprintf('Cannot render %s into http response body.', get_debug_type($output)), 1706454898);
         });
     }
 
diff --git a/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/JsonSerializesPath.fusion b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/JsonSerializesPath.fusion
new file mode 100644
index 00000000000..ca59920f7d3
--- /dev/null
+++ b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/JsonSerializesPath.fusion
@@ -0,0 +1,5 @@
+
+jsonSerializeable = Neos.Fusion:DataStructure {
+  my = 'array'
+  with = 'values'
+}
diff --git a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
index 7ccace20963..6dd106eead3 100644
--- a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
+++ b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
@@ -78,6 +78,20 @@ public function fusionViewReturnsHttpResponseFromHttpMessagePrototype()
         self::assertSame('application/json', $response->getHeaderLine('Content-Type'));
     }
 
+    /**
+     * @test
+     */
+    public function fusionViewJsonSerializesOutputIfNotString()
+    {
+        $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
+        $view->setFusionPath('jsonSerializeable');
+        $response = $view->render();
+        self::assertInstanceOf(ResponseInterface::class, $response);
+        self::assertSame('{"my":"array","with":"values"}', $response->getBody()->getContents());
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('application/json', $response->getHeaderLine('Content-Type'));
+    }
+
     /**
      * Prepare a FusionView for testing that Mocks a request with the given controller and action names.
      *
diff --git a/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php b/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php
index bc9920a0140..d0c9dc88997 100644
--- a/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php
+++ b/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php
@@ -11,6 +11,7 @@
  * source code.
  */
 
+use GuzzleHttp\Psr7\Message;
 use Neos\Eel\EelEvaluatorInterface;
 use Neos\Eel\ProtectedContext;
 use Neos\Flow\Exception;
@@ -22,6 +23,7 @@
 use Neos\Fusion\Core\Runtime;
 use Neos\Fusion\Exception\RuntimeException;
 use Neos\Fusion\FusionObjects\ValueImplementation;
+use Psr\Http\Message\ResponseInterface;
 
 class RuntimeTest extends UnitTestCase
 {
@@ -207,6 +209,18 @@ public function pushContextIsNotAllowedToOverrideFusionGlobals()
         $runtime->pushContext('request', 'anything');
     }
 
+    /**
+     * @test
+     */
+    public function renderResponseIsNotAllowedToOverrideFusionGlobals()
+    {
+        $this->expectException(\Neos\Fusion\Exception::class);
+        $this->expectExceptionMessage('Overriding Fusion global variable "request" via @context is not allowed.');
+        $runtime = new Runtime(FusionConfiguration::fromArray([]), FusionGlobals::fromArray(['request' => 'fixed']));
+
+        $runtime->renderResponse('foo', ['request' =>'anything']);
+    }
+
     /**
      * Legacy compatible layer to possibly override fusion globals like "request".
      * This functionality is only allowed for internal packages.
@@ -222,4 +236,161 @@ public function pushContextArrayIsAllowedToOverrideFusionGlobals()
         $runtime->pushContextArray(['bing' => 'beer', 'request' => 'anything']);
         self::assertTrue(true);
     }
+
+    public static function renderResponseExamples(): iterable
+    {
+        yield 'simple string' => [
+            'rawValue' => 'my string',
+            'response' => <<<'TEXT'
+            HTTP/1.1 200 OK
+
+            my string
+            TEXT
+        ];
+
+        yield 'string cast object (\Stringable)' => [
+            'rawValue' => new class implements \Stringable, \JsonSerializable {
+                public function __toString()
+                {
+                    return 'my string karsten';
+                }
+                // __toString is preferred
+                public function jsonSerialize(): mixed
+                {
+                    return ['my string'];
+                }
+            },
+            'response' => <<<'TEXT'
+            HTTP/1.1 200 OK
+
+            my string karsten
+            TEXT
+        ];
+
+        yield 'empty string' => [
+            'rawValue' => '',
+            'response' => <<<'TEXT'
+            HTTP/1.1 200 OK
+
+
+            TEXT
+        ];
+
+        yield 'null value' => [
+            'rawValue' => null,
+            'response' => <<<'TEXT'
+            HTTP/1.1 200 OK
+
+
+            TEXT
+        ];
+
+        yield 'stringified http response string is upcasted' => [
+            'rawValue' => <<<'TEXT'
+            HTTP/1.1 418 OK
+            Content-Type: text/html
+            X-MyCustomHeader: marc
+
+            <!DOCTYPE html>
+            <head></head>
+            <body>Hello World</body>
+            TEXT,
+            'response' => <<<'TEXT'
+            HTTP/1.1 418 OK
+            Content-Type: text/html
+            X-MyCustomHeader: marc
+
+            <!DOCTYPE html>
+            <head></head>
+            <body>Hello World</body>
+            TEXT
+        ];
+
+        yield 'json serialize array' => [
+            'rawValue' => ['my' => 'array', 'with' => 'values'],
+            'response' => <<<'TEXT'
+            HTTP/1.1 200 OK
+            Content-Type: application/json
+
+            {"my":"array","with":"values"}
+            TEXT
+        ];
+
+        yield 'json serialize \stdClass' => [
+            'rawValue' => (object)[],
+            'response' => <<<'TEXT'
+            HTTP/1.1 200 OK
+            Content-Type: application/json
+
+            {}
+            TEXT
+        ];
+
+        yield 'json serialize object (\JsonSerializable)' => [
+            'rawValue' => new class implements \JsonSerializable {
+                public function jsonSerialize(): mixed
+                {
+                    return ['my' => 'object', 'with' => 'values'];
+                }
+            },
+            'response' => <<<'TEXT'
+            HTTP/1.1 200 OK
+            Content-Type: application/json
+
+            {"my":"object","with":"values"}
+            TEXT
+        ];
+
+        yield 'json serialize boolean' => [
+            'rawValue' => false,
+            'response' => <<<'TEXT'
+            HTTP/1.1 200 OK
+            Content-Type: application/json
+
+            false
+            TEXT
+        ];
+    }
+
+    /**
+     * @test
+     * @dataProvider renderResponseExamples
+     */
+    public function renderResponse(mixed $rawValue, string $expectedHttpResponseString)
+    {
+        $runtime = $this->getMockBuilder(Runtime::class)
+            ->setConstructorArgs([FusionConfiguration::fromArray([]), FusionGlobals::empty()])
+            ->onlyMethods(['render'])
+            ->getMock();
+
+        $runtime->expects(self::once())->method('render')->willReturn(
+            is_string($rawValue) ? str_replace("\n", "\r\n", $rawValue) : $rawValue
+        );
+
+        $response = $runtime->renderResponse('/path', []);
+
+        self::assertInstanceOf(ResponseInterface::class, $response);
+        self::assertSame(str_replace("\n", "\r\n", $expectedHttpResponseString), Message::toString($response));
+    }
+
+    /**
+     * @test
+     */
+    public function renderResponseThrowsIfNotStringableOrJsonSerializeable()
+    {
+        $illegalValue = new class {
+        };
+        $this->expectExceptionMessage('Cannot render class@anonymous into http response body.');
+
+        $runtime = $this->getMockBuilder(Runtime::class)
+            ->setConstructorArgs([FusionConfiguration::fromArray([]), FusionGlobals::empty()])
+            ->onlyMethods(['render'])
+            ->getMock();
+
+        $runtime->expects(self::once())->method('render')->willReturn(
+            $illegalValue
+        );
+
+        $runtime->renderResponse('/path', []);
+    }
 }

From 2e79a6ddc769d6f30757a187e4939953b13ad805 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 25 Feb 2024 11:11:07 +0100
Subject: [PATCH 24/31] TASK: Improve `fusionGlobals` handling in the Fusion
 `FusionView`

Initially introduced the option expected an actual instance of `FusionGlobals`. This is a flawed design as only primitives can be set for example via `Views.yaml`

Additionally, the `FusionView` is forward compatible for this change https://github.com/neos/flow-development-collection/pull/3286
The `fusionGlobals` must not be used for setting the request but rather

```
$view->assign('request"', $this->request)
```
---
 Neos.Fusion/Classes/View/FusionView.php       | 69 +++++++++----------
 .../Tests/Functional/View/FusionViewTest.php  |  3 +-
 2 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/Neos.Fusion/Classes/View/FusionView.php b/Neos.Fusion/Classes/View/FusionView.php
index f418bc7ec9e..1bb5439d0fc 100644
--- a/Neos.Fusion/Classes/View/FusionView.php
+++ b/Neos.Fusion/Classes/View/FusionView.php
@@ -44,7 +44,7 @@ class FusionView extends AbstractView
     protected $supportedOptions = [
         'fusionPathPatterns' => [['resource://@package/Private/Fusion'], 'Fusion files that will be loaded if directories are given the Root.fusion is used.', 'array'],
         'fusionPath' => [null, 'The Fusion path which should be rendered; derived from the controller and action names or set by the user.', 'string'],
-        'fusionGlobals' => [null, 'Additional global variables; merged together with the "request". Must only be specified at creation.', FusionGlobals::class],
+        'fusionGlobals' => [null, 'Additional Fusion global variables. The request must be assigned using `assign`. For regular variables please use `assign` as well.', 'array'],
         'packageKey' => [null, 'The package key where the Fusion should be loaded from. If not given, is automatically derived from the current request.', 'string'],
         'debugMode' => [false, 'Flag to enable debug mode of the Fusion runtime explicitly (overriding the global setting).', 'boolean'],
         'enableContentCache' => [false, 'Flag to enable content caching inside Fusion (overriding the global setting).', 'boolean']
@@ -82,6 +82,12 @@ class FusionView extends AbstractView
      */
     protected $fusionRuntime = null;
 
+    /**
+     * Via {@see assign} request using the "request" key,
+     * will be available also as Fusion global in the runtime.
+     */
+    protected ?ActionRequest $assignedActionRequest = null;
+
     /**
      * Reset runtime cache if an option is changed
      *
@@ -91,30 +97,37 @@ class FusionView extends AbstractView
      */
     public function setOption($optionName, $value)
     {
+        // todo do we want to allow to set the `fusionPathPatterns` after the first render?
         $this->fusionPath = null;
         parent::setOption($optionName, $value);
     }
 
+    public function assign($key, $value)
+    {
+        if ($key === 'request') {
+            // the request cannot be used as "normal" fusion variable and must be treated as FusionGlobal
+            // to for example not cache it accidentally
+            // additionally we need it for special request based handling in the view
+            $this->assignedActionRequest = $value;
+            return $this;
+        }
+        return parent::assign($key, $value);
+    }
+
     /**
-     * Legacy layer to make the `request` available in Fusion.
+     * Legacy layer to set the request for this view if not set already.
      *
-     * Please use {@see setOption} and {@see FusionGlobals} instead:
+     * Please use {@see assign} with "request" instead
      *
-     *     $view->setOption('fusionGlobals', FusionGlobals::fromArray(['request' => $this->request]))
+     *     $view->assign('request"', $this->request)
      *
      * @deprecated with Neos 9
      */
     public function setControllerContext(ControllerContext $controllerContext)
     {
-        /** @var FusionGlobals $fusionGlobals */
-        $fusionGlobals = $this->options['fusionGlobals'] ?? FusionGlobals::empty();
-        if ($fusionGlobals->has('request')) {
-            // no need for legacy layer as the request was already set.
-            return;
+        if (!$this->assignedActionRequest) {
+            $this->assignedActionRequest = $controllerContext->getRequest();
         }
-        $this->setOption('fusionGlobals', $fusionGlobals->merge(FusionGlobals::fromArray(
-            ['request' => $controllerContext->getRequest()]
-        )));
     }
 
     /**
@@ -185,14 +198,15 @@ public function initializeFusionRuntime()
     {
         if ($this->fusionRuntime === null) {
             $this->loadFusion();
-
-            $fusionGlobals = $this->options['fusionGlobals'] ?? FusionGlobals::empty();
-            if (!$fusionGlobals instanceof FusionGlobals) {
-                throw new \InvalidArgumentException('View option "fusionGlobals" must be of type FusionGlobals', 1694252923947);
+            $additionalGlobals = FusionGlobals::fromArray($this->options['fusionGlobals'] ?? []);
+            if ($additionalGlobals->has('request')) {
+                throw new \RuntimeException(sprintf('The request cannot be set using the additional fusion globals. Please use $view->assign("request", ...) instead.'), 1708854895);
             }
             $this->fusionRuntime = $this->runtimeFactory->createFromConfiguration(
                 $this->parsedFusion,
-                $fusionGlobals
+                $this->assignedActionRequest
+                    ? $additionalGlobals->merge(FusionGlobals::fromArray(['request' => $this->assignedActionRequest]))
+                    : $additionalGlobals
             );
         }
         if (isset($this->options['debugMode'])) {
@@ -265,11 +279,10 @@ protected function getPackageKey()
         if ($packageKey !== null) {
             return $packageKey;
         } else {
-            $request = $this->getRequestFromFusionGlobals();
-            if (!$request) {
+            if (!$this->assignedActionRequest) {
                 throw new \RuntimeException(sprintf('To resolve the @package in all fusionPathPatterns, either packageKey has to be specified, or the current request be available.'), 1708267874);
             }
-            return $request->getControllerPackageKey();
+            return $this->assignedActionRequest->getControllerPackageKey();
         }
     }
 
@@ -285,7 +298,7 @@ protected function getFusionPathForCurrentRequest()
             if ($fusionPath !== null) {
                 $this->fusionPath = $fusionPath;
             } else {
-                $request = $this->getRequestFromFusionGlobals();
+                $request = $this->assignedActionRequest;
                 if (!$request) {
                     throw new \RuntimeException(sprintf('The option `fusionPath` was not set. Could not fallback to the current request.'), 1708267857);
                 }
@@ -300,18 +313,4 @@ protected function getFusionPathForCurrentRequest()
         }
         return $this->fusionPath;
     }
-
-    private function getRequestFromFusionGlobals(): ?ActionRequest
-    {
-        /** @var FusionGlobals $fusionGlobals */
-        $fusionGlobals = $this->options['fusionGlobals'] ?? FusionGlobals::empty();
-        if (!$fusionGlobals instanceof FusionGlobals) {
-            throw new \InvalidArgumentException('View option "fusionGlobals" must be of type FusionGlobals', 1694252923947);
-        }
-        $actionRequest = $fusionGlobals->get('request');
-        if (!$actionRequest instanceof ActionRequest) {
-            return null;
-        }
-        return $actionRequest;
-    }
 }
diff --git a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
index 6dd106eead3..4d9f17426fc 100644
--- a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
+++ b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
@@ -13,7 +13,6 @@
 
 use Neos\Flow\Mvc\ActionRequest;
 use Neos\Flow\Tests\FunctionalTestCase;
-use Neos\Fusion\Core\FusionGlobals;
 use Neos\Fusion\View\FusionView;
 use Psr\Http\Message\ResponseInterface;
 
@@ -106,7 +105,7 @@ protected function buildView($controllerObjectName, $controllerActionName)
         $request->expects(self::any())->method('getControllerActionName')->will(self::returnValue($controllerActionName));
 
         $view = new FusionView();
-        $view->setOption('fusionGlobals', FusionGlobals::fromArray(['request' => $request]));
+        $view->assign('request', $request);
         $view->setFusionPathPattern(__DIR__ . '/Fixtures/Fusion');
 
         return $view;

From 4184042dd8af8804a6c87fa61e07f24a0860af7c Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 25 Feb 2024 11:46:56 +0100
Subject: [PATCH 25/31] TASK: Runtime remove magic fusion jsonSerialize again

This magic behaviour is not expected and will rather lead to bugs instead of help the integrator to use fusion.

The action controllers `renderView` would previously just silently ignore this case and render a blank page.

Instead, to force to write correct functioning entry points, we throw an exception like:

> Fusion entry path "root" is expected to render a compatible http response body: string|\Stringable|null. Got array instead.
---
 .../IllegalEntryFusionPathValueException.php  |   9 ++
 Neos.Fusion/Classes/Core/Runtime.php          |  41 +++----
 .../Fusion/IllegalEntryPointValue.fusion      |   4 +
 .../Fixtures/Fusion/JsonSerializesPath.fusion |   5 -
 .../Tests/Functional/View/FusionViewTest.php  |  14 +--
 Neos.Fusion/Tests/Unit/Core/RuntimeTest.php   | 102 +++++++-----------
 6 files changed, 78 insertions(+), 97 deletions(-)
 create mode 100644 Neos.Fusion/Classes/Core/IllegalEntryFusionPathValueException.php
 create mode 100644 Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/IllegalEntryPointValue.fusion
 delete mode 100644 Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/JsonSerializesPath.fusion

diff --git a/Neos.Fusion/Classes/Core/IllegalEntryFusionPathValueException.php b/Neos.Fusion/Classes/Core/IllegalEntryFusionPathValueException.php
new file mode 100644
index 00000000000..f5f57b8fb1f
--- /dev/null
+++ b/Neos.Fusion/Classes/Core/IllegalEntryFusionPathValueException.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\Fusion\Core;
+
+final class IllegalEntryFusionPathValueException extends \Neos\Fusion\Exception
+{
+}
diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index 4fae3e65256..fede8e27af6 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -265,51 +265,44 @@ public function getLastEvaluationStatus()
     }
 
     /**
-     * todo
+     * Entry point to render a Fusion path as HttpResponse.
+     *
+     * @param string $entryFusionPath the absolute fusion path to render (without leading slash)
+     * @param array $contextVariables the context variables that will be available during the rendering.
+     * @throws IllegalEntryFusionPathValueException The Fusion path rendered to a value that is not a compatible http response body: string|\Stringable|null
      */
-    public function renderResponse(string $fusionPath, array $contextArray): ResponseInterface
+    public function renderResponse(string $entryFusionPath, array $contextVariables): ResponseInterface
     {
-        /** Unlike pushContextArray, we don't allow to overrule fusion globals {@see self::pushContext} */
-        foreach ($contextArray as $key => $_) {
+        // Like in pushContext, we don't allow to overrule fusion globals
+        foreach ($contextVariables as $key => $_) {
             if ($this->fusionGlobals->has($key)) {
                 throw new Exception(sprintf('Overriding Fusion global variable "%s" via @context is not allowed.', $key), 1706452063);
             }
         }
-        $this->pushContextArray($contextArray);
+        // replace any previously assigned values
+        $this->pushContextArray($contextVariables);
 
-        return $this->withSimulatedLegacyControllerContext(function () use ($fusionPath) {
+        return $this->withSimulatedLegacyControllerContext(function () use ($entryFusionPath) {
             try {
-                $output = $this->render($fusionPath);
+                $output = $this->render($entryFusionPath);
             } catch (RuntimeException $exception) {
                 throw $exception->getWrappedException();
             } finally {
                 $this->popContext();
             }
 
-            /**
-             * parse potential raw http response possibly rendered via "Neos.Fusion:Http.Message"
-             * {@see \Neos\Fusion\FusionObjects\HttpResponseImplementation}
-             */
+            // Parse potential raw http response possibly rendered via "Neos.Fusion:Http.Message"
+            /** {@see \Neos\Fusion\FusionObjects\HttpResponseImplementation} */
             $outputStringHasHttpPreamble = is_string($output) && str_starts_with($output, 'HTTP/');
             if ($outputStringHasHttpPreamble) {
                 return Message::parseResponse($output);
             }
 
-            if (is_string($output) || $output instanceof \Stringable || $output === null) {
-                return new Response(body: $output);
-            }
-
-            if (is_array($output) || $output instanceof \JsonSerializable || $output instanceof \stdClass || is_bool($output)) {
-                try {
-                    $jsonSerialized = json_encode($output, JSON_THROW_ON_ERROR);
-                } catch (\JsonException $e) {
-                    throw new \RuntimeException(sprintf('Cannot render %s into http response body.', get_debug_type($output)), 1708713158, $e);
-                }
-                $jsonResponse = new Response(body: $jsonSerialized);
-                return $jsonResponse->withHeader('Content-Type', 'application/json');
+            if (!is_string($output) && !$output instanceof \Stringable && $output !== null) {
+                throw new IllegalEntryFusionPathValueException(sprintf('Fusion entry path "%s" is expected to render a compatible http response body: string|\Stringable|null. Got %s instead.', $entryFusionPath, get_debug_type($output)), 1706454898);
             }
 
-            throw new \RuntimeException(sprintf('Cannot render %s into http response body.', get_debug_type($output)), 1706454898);
+            return new Response(body: $output);
         });
     }
 
diff --git a/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/IllegalEntryPointValue.fusion b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/IllegalEntryPointValue.fusion
new file mode 100644
index 00000000000..03a1c95fa61
--- /dev/null
+++ b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/IllegalEntryPointValue.fusion
@@ -0,0 +1,4 @@
+
+illegalEntryPointValue = Neos.Fusion:DataStructure {
+  my = 'array'
+}
diff --git a/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/JsonSerializesPath.fusion b/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/JsonSerializesPath.fusion
deleted file mode 100644
index ca59920f7d3..00000000000
--- a/Neos.Fusion/Tests/Functional/View/Fixtures/Fusion/JsonSerializesPath.fusion
+++ /dev/null
@@ -1,5 +0,0 @@
-
-jsonSerializeable = Neos.Fusion:DataStructure {
-  my = 'array'
-  with = 'values'
-}
diff --git a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
index 4d9f17426fc..f59dad2cf69 100644
--- a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
+++ b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
@@ -13,6 +13,7 @@
 
 use Neos\Flow\Mvc\ActionRequest;
 use Neos\Flow\Tests\FunctionalTestCase;
+use Neos\Fusion\Core\IllegalEntryFusionPathValueException;
 use Neos\Fusion\View\FusionView;
 use Psr\Http\Message\ResponseInterface;
 
@@ -80,15 +81,14 @@ public function fusionViewReturnsHttpResponseFromHttpMessagePrototype()
     /**
      * @test
      */
-    public function fusionViewJsonSerializesOutputIfNotString()
+    public function fusionViewCannotRenderNonStringableValue()
     {
+        $this->expectException(IllegalEntryFusionPathValueException::class);
+        $this->expectExceptionMessage('Fusion entry path "illegalEntryPointValue" is expected to render a compatible http response body: string|\Stringable|null. Got array instead.');
+
         $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
-        $view->setFusionPath('jsonSerializeable');
-        $response = $view->render();
-        self::assertInstanceOf(ResponseInterface::class, $response);
-        self::assertSame('{"my":"array","with":"values"}', $response->getBody()->getContents());
-        self::assertSame(200, $response->getStatusCode());
-        self::assertSame('application/json', $response->getHeaderLine('Content-Type'));
+        $view->setFusionPath('illegalEntryPointValue');
+        $view->render();
     }
 
     /**
diff --git a/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php b/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php
index d0c9dc88997..4716d1f6cbd 100644
--- a/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php
+++ b/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php
@@ -20,6 +20,7 @@
 use Neos\Fusion\Core\ExceptionHandlers\ThrowingHandler;
 use Neos\Fusion\Core\FusionConfiguration;
 use Neos\Fusion\Core\FusionGlobals;
+use Neos\Fusion\Core\IllegalEntryFusionPathValueException;
 use Neos\Fusion\Core\Runtime;
 use Neos\Fusion\Exception\RuntimeException;
 use Neos\Fusion\FusionObjects\ValueImplementation;
@@ -38,9 +39,9 @@ public function renderHandlesExceptionDuringRendering()
         $runtimeException = new RuntimeException('I am a parent exception', 123, new Exception('I am a previous exception'), 'root');
         $runtime = $this->getMockBuilder(Runtime::class)->onlyMethods(['evaluate', 'handleRenderingException'])->disableOriginalConstructor()->getMock();
         $runtime->expects(self::any())->method('evaluate')->will(self::throwException($runtimeException));
-        $runtime->expects(self::once())->method('handleRenderingException')->with('/foo/bar', $runtimeException)->will(self::returnValue('Exception Message'));
+        $runtime->expects(self::once())->method('handleRenderingException')->with('foo/bar', $runtimeException)->will(self::returnValue('Exception Message'));
 
-        $output = $runtime->render('/foo/bar');
+        $output = $runtime->render('foo/bar');
 
         self::assertEquals('Exception Message', $output);
     }
@@ -65,7 +66,7 @@ public function handleRenderingExceptionThrowsException()
         $objectManager->expects(self::once())->method('isRegistered')->with($exceptionHandlerSetting)->will(self::returnValue(true));
         $objectManager->expects(self::once())->method('get')->with($exceptionHandlerSetting)->will(self::returnValue(new ThrowingHandler()));
 
-        $runtime->handleRenderingException('/foo/bar', $runtimeException);
+        $runtime->handleRenderingException('foo/bar', $runtimeException);
     }
 
     /**
@@ -121,7 +122,7 @@ public function renderRethrowsSecurityExceptions()
         $runtime = $this->getMockBuilder(Runtime::class)->onlyMethods(['evaluate', 'handleRenderingException'])->disableOriginalConstructor()->getMock();
         $runtime->expects(self::any())->method('evaluate')->will(self::throwException($securityException));
 
-        $runtime->render('/foo/bar');
+        $runtime->render('foo/bar');
     }
 
     /**
@@ -249,16 +250,11 @@ public static function renderResponseExamples(): iterable
         ];
 
         yield 'string cast object (\Stringable)' => [
-            'rawValue' => new class implements \Stringable, \JsonSerializable {
+            'rawValue' => new class implements \Stringable {
                 public function __toString()
                 {
                     return 'my string karsten';
                 }
-                // __toString is preferred
-                public function jsonSerialize(): mixed
-                {
-                    return ['my string'];
-                }
             },
             'response' => <<<'TEXT'
             HTTP/1.1 200 OK
@@ -305,51 +301,6 @@ public function jsonSerialize(): mixed
             <body>Hello World</body>
             TEXT
         ];
-
-        yield 'json serialize array' => [
-            'rawValue' => ['my' => 'array', 'with' => 'values'],
-            'response' => <<<'TEXT'
-            HTTP/1.1 200 OK
-            Content-Type: application/json
-
-            {"my":"array","with":"values"}
-            TEXT
-        ];
-
-        yield 'json serialize \stdClass' => [
-            'rawValue' => (object)[],
-            'response' => <<<'TEXT'
-            HTTP/1.1 200 OK
-            Content-Type: application/json
-
-            {}
-            TEXT
-        ];
-
-        yield 'json serialize object (\JsonSerializable)' => [
-            'rawValue' => new class implements \JsonSerializable {
-                public function jsonSerialize(): mixed
-                {
-                    return ['my' => 'object', 'with' => 'values'];
-                }
-            },
-            'response' => <<<'TEXT'
-            HTTP/1.1 200 OK
-            Content-Type: application/json
-
-            {"my":"object","with":"values"}
-            TEXT
-        ];
-
-        yield 'json serialize boolean' => [
-            'rawValue' => false,
-            'response' => <<<'TEXT'
-            HTTP/1.1 200 OK
-            Content-Type: application/json
-
-            false
-            TEXT
-        ];
     }
 
     /**
@@ -367,20 +318,49 @@ public function renderResponse(mixed $rawValue, string $expectedHttpResponseStri
             is_string($rawValue) ? str_replace("\n", "\r\n", $rawValue) : $rawValue
         );
 
-        $response = $runtime->renderResponse('/path', []);
+        $response = $runtime->renderResponse('path', []);
 
         self::assertInstanceOf(ResponseInterface::class, $response);
         self::assertSame(str_replace("\n", "\r\n", $expectedHttpResponseString), Message::toString($response));
     }
 
+    public static function renderResponseIllegalValueExamples(): iterable
+    {
+        yield 'array' => [
+            'rawValue' => ['my' => 'array', 'with' => 'values']
+        ];
+
+        yield '\stdClass' => [
+            'rawValue' => (object)[]
+        ];
+
+        yield '\JsonSerializable' => [
+            'rawValue' => new class implements \JsonSerializable {
+                public function jsonSerialize(): mixed
+                {
+                    return 123;
+                }
+            }
+        ];
+
+        yield 'any class' => [
+            'rawValue' => new class {
+            }
+        ];
+
+        yield 'boolean' => [
+            'rawValue' => false
+        ];
+    }
+
     /**
+     * @dataProvider renderResponseIllegalValueExamples
      * @test
      */
-    public function renderResponseThrowsIfNotStringableOrJsonSerializeable()
+    public function renderResponseThrowsIfNotStringable(mixed $illegalValue)
     {
-        $illegalValue = new class {
-        };
-        $this->expectExceptionMessage('Cannot render class@anonymous into http response body.');
+        $this->expectException(IllegalEntryFusionPathValueException::class);
+        $this->expectExceptionMessage(sprintf('Fusion entry path "path" is expected to render a compatible http response body: string|\Stringable|null. Got %s instead.', get_debug_type($illegalValue)));
 
         $runtime = $this->getMockBuilder(Runtime::class)
             ->setConstructorArgs([FusionConfiguration::fromArray([]), FusionGlobals::empty()])
@@ -391,6 +371,6 @@ public function renderResponseThrowsIfNotStringableOrJsonSerializeable()
             $illegalValue
         );
 
-        $runtime->renderResponse('/path', []);
+        $runtime->renderResponse('path', []);
     }
 }

From 3f4089ae8ab01cb0d4c5dec44bb990f19fa787bb Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 25 Feb 2024 12:00:52 +0100
Subject: [PATCH 26/31] TASK: Refine fusion inline docs

---
 .../Core/Cache/FusionContextSerializer.php    |  2 +-
 Neos.Fusion/Classes/Core/FusionGlobals.php    | 33 ++++++++++++-----
 Neos.Fusion/Classes/Core/RuntimeFactory.php   |  5 +--
 .../Cache/NeosFusionContextSerializer.php     | 16 ++++----
 Neos.Neos/Classes/View/FusionView.php         | 37 +++++++++++++++++--
 5 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/Cache/FusionContextSerializer.php b/Neos.Fusion/Classes/Core/Cache/FusionContextSerializer.php
index 57c06ff3006..60040ff33f0 100644
--- a/Neos.Fusion/Classes/Core/Cache/FusionContextSerializer.php
+++ b/Neos.Fusion/Classes/Core/Cache/FusionContextSerializer.php
@@ -9,7 +9,7 @@
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
- * Serializer for Fusion's [at]cache.context values
+ * Serializer for Fusion's \@cache.context values
  *
  * Uses the Flows's property mapper as implementation.
  * It relies on a converter being available from the context value type to string and reverse.
diff --git a/Neos.Fusion/Classes/Core/FusionGlobals.php b/Neos.Fusion/Classes/Core/FusionGlobals.php
index 3c1e26ca277..0b81b7f27bb 100644
--- a/Neos.Fusion/Classes/Core/FusionGlobals.php
+++ b/Neos.Fusion/Classes/Core/FusionGlobals.php
@@ -5,21 +5,31 @@
 namespace Neos\Fusion\Core;
 
 /**
- * Fusion allows to add variable to the context either via
- * \@context.foo = "bar" or by leveraging the php api {@see Runtime::pushContext()}.
+ * Fusion differentiates between dynamic context variables and fixed Fusion globals.
  *
- * Those approaches are highly dynamic and don't guarantee the existence of variables,
+ * Context variables are allowed to be set via Fusion's \@context.foo = "bar"
+ * or by leveraging the php api {@see Runtime::pushContext()}.
+ *
+ * Context variables are highly dynamic and don't guarantee the existence of a specific variables,
  * as they have to be explicitly preserved in uncached \@cache segments,
  * or might accidentally be popped from the stack.
  *
- * The Fusion runtime is instantiated with a set of global variables which contain the EEL helper definitions
- * or functions like FlowQuery. Also, variables like "request" are made available via it.
+ * The Fusion globals are immutable and part of the runtime's constructor.
+ * A fixed set of global variables which might contain the EEL helper definitions
+ * or functions like FlowQuery can be passed this way.
+ *
+ * Additionally, also special variables like "request" are made available.
  *
- * The "${request}" special case: To make the request available in uncached segments, it would need to be serialized,
- * but we don't allow this currently and despite that, it would be absurd to cache a random request.
+ * The speciality with "request" and similar is that they should be always available but never cached.
+ * Regular context variables must be serialized to be available in uncached segments,
+ * but the current request must not be serialized into the cache as it contains user specific information.
  * This is avoided by always exposing the current action request via the global variable.
  *
  * Overriding Fusion globals is disallowed via \@context and {@see Runtime::pushContext()}.
+ *
+ * Fusion globals are case-sensitive, though it's not recommend to leverage this behaviour.
+ *
+ * @internal The globals will be set inside the FusionView as declared
  */
 final readonly class FusionGlobals
 {
@@ -45,8 +55,13 @@ public static function fromArray(array $variables): self
     }
 
     /**
-     * You can access the current request like via this getter:
-     * `$runtime->fusionGlobals->get('request')`
+     * Access the possible current request or other globals:
+     *
+     *     $actionRequest = $this->runtime->fusionGlobals->get('request');
+     *     if (!$actionRequest instanceof ActionRequest) {
+     *         // fallback or error
+     *     }
+     *
      */
     public function get(string $name): mixed
     {
diff --git a/Neos.Fusion/Classes/Core/RuntimeFactory.php b/Neos.Fusion/Classes/Core/RuntimeFactory.php
index 252c45170df..fc5d84bd757 100644
--- a/Neos.Fusion/Classes/Core/RuntimeFactory.php
+++ b/Neos.Fusion/Classes/Core/RuntimeFactory.php
@@ -45,16 +45,15 @@ public function create(array $fusionConfiguration, ControllerContext $controller
         $defaultContextVariables = EelUtility::getDefaultContextVariables(
             $this->defaultContextConfiguration ?? []
         );
-        $runtime = new Runtime(
+        return new Runtime(
             FusionConfiguration::fromArray($fusionConfiguration),
             FusionGlobals::fromArray(
                 [
+                    ...$defaultContextVariables,
                     'request' => $controllerContext?->getRequest() ?? ActionRequest::fromHttpRequest(ServerRequest::fromGlobals()),
-                    ...$defaultContextVariables
                 ]
             )
         );
-        return $runtime;
     }
 
     public function createFromConfiguration(
diff --git a/Neos.Neos/Classes/Fusion/Cache/NeosFusionContextSerializer.php b/Neos.Neos/Classes/Fusion/Cache/NeosFusionContextSerializer.php
index 0e50845b659..03ca0a2352f 100644
--- a/Neos.Neos/Classes/Fusion/Cache/NeosFusionContextSerializer.php
+++ b/Neos.Neos/Classes/Fusion/Cache/NeosFusionContextSerializer.php
@@ -16,18 +16,16 @@
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
- * Serializer for Fusion's [at]cache.context values
+ * Serializer for Fusion's \@cache.context values
  *
  * Implements special handing for serializing {@see Node} objects in fusions cache context:
  *
- * ```
- * [at]cache {
- *   mode = 'uncached'
- *   context {
- *     1 = 'node'
- *   }
- * }
- * ```
+ *     \@cache {
+ *       mode = 'uncached'
+ *       context {
+ *         1 = 'node'
+ *       }
+ *     }
  *
  * The property mapper cannot be relied upon to serialize nodes, as this is willingly not implemented.
  *
diff --git a/Neos.Neos/Classes/View/FusionView.php b/Neos.Neos/Classes/View/FusionView.php
index 446771cae37..629760b14b7 100644
--- a/Neos.Neos/Classes/View/FusionView.php
+++ b/Neos.Neos/Classes/View/FusionView.php
@@ -18,6 +18,8 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Mvc\ActionRequest;
+use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\Mvc\View\AbstractView;
 use Neos\Flow\Security\Context;
 use Neos\Fusion\Core\FusionGlobals;
@@ -52,6 +54,12 @@ class FusionView extends AbstractView
     #[Flow\Inject]
     protected RenderingModeService $renderingModeService;
 
+    /**
+     * Via {@see assign} request using the "request" key,
+     * will be available also as Fusion global in the runtime.
+     */
+    protected ?ActionRequest $assignedActionRequest = null;
+
     /**
      * Renders the view
      *
@@ -198,10 +206,10 @@ protected function getFusionRuntime(Node $currentSiteNode)
 
             $renderingMode = $this->renderingModeService->findByName($this->getOption('renderingModeName'));
 
-            $fusionGlobals = FusionGlobals::fromArray([
-                'request' => $this->controllerContext->getRequest(),
+            $fusionGlobals = FusionGlobals::fromArray(array_filter([
+                'request' => $this->assignedActionRequest,
                 'renderingMode' => $renderingMode
-            ]);
+            ]));
             $this->fusionRuntime = $this->runtimeFactory->createFromConfiguration(
                 $fusionConfiguration,
                 $fusionGlobals
@@ -222,7 +230,30 @@ protected function getFusionRuntime(Node $currentSiteNode)
      */
     public function assign($key, $value): AbstractView
     {
+        if ($key === 'request') {
+            // the request cannot be used as "normal" fusion variable and must be treated as FusionGlobal
+            // to for example not cache it accidentally
+            // additionally we need it for special request based handling in the view
+            $this->assignedActionRequest = $value;
+            return $this;
+        }
         $this->fusionRuntime = null;
         return parent::assign($key, $value);
     }
+
+    /**
+     * Legacy layer to set the request for this view if not set already.
+     *
+     * Please use {@see assign} with "request" instead
+     *
+     *     $view->assign('request"', $this->request)
+     *
+     * @deprecated with Neos 9
+     */
+    public function setControllerContext(ControllerContext $controllerContext)
+    {
+        if (!$this->assignedActionRequest) {
+            $this->assignedActionRequest = $controllerContext->getRequest();
+        }
+    }
 }

From 51fb7f7850ef2d24e09ab82d600898820c55627a Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Fri, 15 Mar 2024 09:44:58 +0100
Subject: [PATCH 27/31] TASK: Adjust views to stricter return types

---
 .../Classes/View/FusionExceptionView.php      | 19 ++++++-------------
 .../Classes/View/Service/AssetJsonView.php    |  7 ++++---
 .../Classes/View/Service/NodeJsonView.php     |  7 ++++---
 .../View/Service/WorkspaceJsonView.php        |  7 ++++---
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/Neos.Neos/Classes/View/FusionExceptionView.php b/Neos.Neos/Classes/View/FusionExceptionView.php
index c70f22ee50f..821c25eb275 100644
--- a/Neos.Neos/Classes/View/FusionExceptionView.php
+++ b/Neos.Neos/Classes/View/FusionExceptionView.php
@@ -36,6 +36,8 @@
 use Neos\Neos\Domain\Service\SiteNodeUtility;
 use Neos\Neos\FrontendRouting\SiteDetection\SiteDetectionFailedException;
 use Neos\Neos\FrontendRouting\SiteDetection\SiteDetectionResult;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
 class FusionExceptionView extends AbstractView
 {
@@ -87,7 +89,7 @@ class FusionExceptionView extends AbstractView
     #[Flow\Inject]
     protected DomainRepository $domainRepository;
 
-    public function render(): string
+    public function render(): ResponseInterface|StreamInterface
     {
         $requestHandler = $this->bootstrap->getActiveRequestHandler();
 
@@ -141,7 +143,7 @@ public function render(): string
 
         $this->setFallbackRuleFromDimension($dimensionSpacePoint);
 
-        $httpResponse = $fusionRuntime->renderResponse('error', array_merge(
+        return $fusionRuntime->renderResponse('error', array_merge(
             $this->variables,
             [
                 'node' => $currentSiteNode,
@@ -149,14 +151,6 @@ public function render(): string
                 'site' => $currentSiteNode
             ]
         ));
-
-        /**
-         * Workaround: The http status code will already be sent and
-         * Flow's {@see \Neos\Flow\Error\DebugExceptionHandler::echoExceptionWeb()}
-         * expects a view to return a string to be echo'd.
-         * Thus, we unwrap the repose here:
-         */
-        return $httpResponse->getBody()->getContents();
     }
 
     protected function getFusionRuntime(
@@ -184,7 +178,7 @@ protected function getFusionRuntime(
         return $this->fusionRuntime;
     }
 
-    private function renderErrorWelcomeScreen(): string
+    private function renderErrorWelcomeScreen(): ResponseInterface|StreamInterface
     {
         // in case no neos site being there or no site node we cannot continue with the fusion exception view,
         // as we wouldn't know the site and cannot get the site's root.fusion
@@ -196,7 +190,6 @@ private function renderErrorWelcomeScreen(): string
             'enableContentCache' => false,
         ]);
         $view->assignMultiple($this->variables);
-        $output = $view->render();
-        return $output->getBody()->getContents();
+        return $view->render();
     }
 }
diff --git a/Neos.Neos/Classes/View/Service/AssetJsonView.php b/Neos.Neos/Classes/View/Service/AssetJsonView.php
index bb15b6306e5..c56c0c596ec 100644
--- a/Neos.Neos/Classes/View/Service/AssetJsonView.php
+++ b/Neos.Neos/Classes/View/Service/AssetJsonView.php
@@ -16,12 +16,15 @@
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\View\JsonView;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * A view specialised on a JSON representation of Assets.
  *
  * This view is used by the service controllers in Neos\Neos\Controller\Service\
  *
+ * @deprecated with Neos 9, the JsonView should not be used
+ * @internal only to be used internally
  * @Flow\Scope("prototype")
  */
 class AssetJsonView extends JsonView
@@ -29,10 +32,8 @@ class AssetJsonView extends JsonView
     /**
      * Configures rendering according to the set variable(s) and calls
      * render on the parent.
-     *
-     * @return string
      */
-    public function render()
+    public function render(): ResponseInterface
     {
         if (isset($this->variables['assets'])) {
             $this->setConfiguration(
diff --git a/Neos.Neos/Classes/View/Service/NodeJsonView.php b/Neos.Neos/Classes/View/Service/NodeJsonView.php
index 24ce05ea747..b4a10ca6ff8 100644
--- a/Neos.Neos/Classes/View/Service/NodeJsonView.php
+++ b/Neos.Neos/Classes/View/Service/NodeJsonView.php
@@ -16,12 +16,15 @@
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\View\JsonView;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * A view specialised on a JSON representation of Nodes.
  *
  * This view is used by the service controllers in Neos\Neos\Controller\Service\
  *
+ * @deprecated with Neos 9, the JsonView should not be used
+ * @internal only to be used internally
  * @Flow\Scope("prototype")
  */
 class NodeJsonView extends JsonView
@@ -29,10 +32,8 @@ class NodeJsonView extends JsonView
     /**
      * Configures rendering according to the set variable(s) and calls
      * render on the parent.
-     *
-     * @return string
      */
-    public function render()
+    public function render(): ResponseInterface
     {
         if (isset($this->variables['nodes'])) {
             $this->setConfiguration(
diff --git a/Neos.Neos/Classes/View/Service/WorkspaceJsonView.php b/Neos.Neos/Classes/View/Service/WorkspaceJsonView.php
index 52c8b1e261e..04dd5467ad8 100644
--- a/Neos.Neos/Classes/View/Service/WorkspaceJsonView.php
+++ b/Neos.Neos/Classes/View/Service/WorkspaceJsonView.php
@@ -16,12 +16,15 @@
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\View\JsonView;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * A view specialised on a JSON representation of Workspaces.
  *
  * This view is used by the service controllers in Neos\Neos\Controller\Service\
  *
+ * @deprecated with Neos 9, the JsonView should not be used
+ * @internal only to be used internally
  * @Flow\Scope("prototype")
  */
 class WorkspaceJsonView extends JsonView
@@ -29,10 +32,8 @@ class WorkspaceJsonView extends JsonView
     /**
      * Configures rendering according to the set variable(s) and calls
      * render on the parent.
-     *
-     * @return string
      */
-    public function render()
+    public function render(): ResponseInterface
     {
         if (isset($this->variables['workspaces'])) {
             $this->setConfiguration(

From e1a2678b1f0c76c7c958193a753af7fc45d49112 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Fri, 15 Mar 2024 11:06:06 +0100
Subject: [PATCH 28/31] TASK: Return `ResponseInterface` or `StreamInterface`
 in fusion view

- this will make the change less breaking due to allowing an implicit string cast
- adjust to fluidViews will now return a stream
---
 Neos.Fusion/Classes/Core/Runtime.php          | 40 +++++++++----
 .../FusionObjects/TemplateImplementation.php  |  2 +-
 Neos.Fusion/Classes/View/FusionView.php       | 10 ++--
 .../AbstractFusionObjectTest.php              | 18 +-----
 .../Tests/Functional/View/FusionViewTest.php  | 13 ++--
 Neos.Fusion/Tests/Unit/Core/RuntimeTest.php   | 59 +++++++++++--------
 .../Fusion/ExceptionHandlers/PageHandler.php  |  2 +-
 .../Classes/View/FusionExceptionView.php      |  2 +-
 Neos.Neos/Classes/View/FusionView.php         |  9 +--
 .../ViewHelpers/StandaloneViewViewHelper.php  |  2 +-
 10 files changed, 87 insertions(+), 70 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index fede8e27af6..f9fca878474 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -13,6 +13,7 @@
 
 use GuzzleHttp\Psr7\Message;
 use GuzzleHttp\Psr7\Response;
+use Neos\Http\Factories\StreamFactoryTrait;
 use Psr\Http\Message\ResponseInterface;
 use Neos\Eel\Utility as EelUtility;
 use Neos\Flow\Annotations as Flow;
@@ -33,6 +34,7 @@
 use Neos\Utility\Arrays;
 use Neos\Utility\ObjectAccess;
 use Neos\Utility\PositionalArraySorter;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Fusion Runtime
@@ -58,6 +60,8 @@
  */
 class Runtime
 {
+    use StreamFactoryTrait;
+
     /**
      * Internal constants defining how evaluate should work in case of an error
      */
@@ -265,13 +269,18 @@ public function getLastEvaluationStatus()
     }
 
     /**
-     * Entry point to render a Fusion path as HttpResponse.
+     * Entry point to render a Fusion path with the context.
+     *
+     * A ResponseInterface will be returned, if a Neos.Fusion:Http.Message was defined in the entry path,
+     * or if Neos.Fusion.Form or Neos.Neos:Plugin were used in the path.
+     *
+     * In all other simple cases a StreamInterface will be returned.
      *
      * @param string $entryFusionPath the absolute fusion path to render (without leading slash)
      * @param array $contextVariables the context variables that will be available during the rendering.
      * @throws IllegalEntryFusionPathValueException The Fusion path rendered to a value that is not a compatible http response body: string|\Stringable|null
      */
-    public function renderResponse(string $entryFusionPath, array $contextVariables): ResponseInterface
+    public function renderEntryPathWithContext(string $entryFusionPath, array $contextVariables): ResponseInterface|StreamInterface
     {
         // Like in pushContext, we don't allow to overrule fusion globals
         foreach ($contextVariables as $key => $_) {
@@ -298,11 +307,16 @@ public function renderResponse(string $entryFusionPath, array $contextVariables)
                 return Message::parseResponse($output);
             }
 
+            if ($output instanceof StreamInterface) {
+                // if someone manages to return a stream *g
+                return $output;
+            }
+
             if (!is_string($output) && !$output instanceof \Stringable && $output !== null) {
                 throw new IllegalEntryFusionPathValueException(sprintf('Fusion entry path "%s" is expected to render a compatible http response body: string|\Stringable|null. Got %s instead.', $entryFusionPath, get_debug_type($output)), 1706454898);
             }
 
-            return new Response(body: $output);
+            return $this->createStream((string)$output);
         });
     }
 
@@ -944,9 +958,9 @@ protected function throwExceptionForUnrenderablePathIfNeeded($fusionPath, $fusio
      * While HIGHLY internal behaviour and ONLY to be used by Neos.Fusion.Form or Neos.Neos:Plugin
      * this legacy layer is in place still allows this functionality.
      *
-     * @param \Closure(): ResponseInterface $renderer
+     * @param \Closure(): (ResponseInterface|StreamInterface) $renderer
      */
-    private function withSimulatedLegacyControllerContext(\Closure $renderer): ResponseInterface
+    private function withSimulatedLegacyControllerContext(\Closure $renderer): ResponseInterface|StreamInterface
     {
         if ($this->legacyActionResponseForCurrentRendering !== null) {
             throw new Exception('Recursion detected in `Runtime::renderResponse`. This entry point is only allowed to be invoked once per rendering.', 1706993940);
@@ -955,7 +969,7 @@ private function withSimulatedLegacyControllerContext(\Closure $renderer): Respo
 
         // actual rendering
         try {
-            $httpResponse = $renderer();
+            $httpResponseOrStream = $renderer();
         } finally {
             $toBeMergedLegacyActionResponse = $this->legacyActionResponseForCurrentRendering;
             // reset for next render
@@ -964,14 +978,20 @@ private function withSimulatedLegacyControllerContext(\Closure $renderer): Respo
 
         // transfer possible headers that have been set dynamically
         foreach ($toBeMergedLegacyActionResponse->buildHttpResponse()->getHeaders() as $name => $values) {
-            $httpResponse = $httpResponse->withAddedHeader($name, $values);
+            if ($httpResponseOrStream instanceof StreamInterface) {
+                $httpResponseOrStream = new Response(body: $httpResponseOrStream);
+            }
+            $httpResponseOrStream = $httpResponseOrStream->withAddedHeader($name, $values);
         }
         // if the status code is 200 we assume it's the default and will not overrule it
         if ($toBeMergedLegacyActionResponse->getStatusCode() !== 200) {
-            $httpResponse = $httpResponse->withStatus($toBeMergedLegacyActionResponse->getStatusCode());
+            if ($httpResponseOrStream instanceof StreamInterface) {
+                $httpResponseOrStream = new Response(body: $httpResponseOrStream);
+            }
+            $httpResponseOrStream = $httpResponseOrStream->withStatus($toBeMergedLegacyActionResponse->getStatusCode());
         }
 
-        return $httpResponse;
+        return $httpResponseOrStream;
     }
 
     /**
@@ -981,7 +1001,7 @@ private function withSimulatedLegacyControllerContext(\Closure $renderer): Respo
      *
      * WARNING:
      *      Invoking this backwards-compatible layer is possibly unsafe, if the rendering was not started
-     *      in {@see self::renderResponse()} or no `request` global is available. This will raise an exception.
+     *      in {@see self::renderEntryPathWithContext()} or no `request` global is available. This will raise an exception.
      *
      * @deprecated with Neos 9.0
      * @internal
diff --git a/Neos.Fusion/Classes/FusionObjects/TemplateImplementation.php b/Neos.Fusion/Classes/FusionObjects/TemplateImplementation.php
index 4ccc72f2381..edec81b35c9 100644
--- a/Neos.Fusion/Classes/FusionObjects/TemplateImplementation.php
+++ b/Neos.Fusion/Classes/FusionObjects/TemplateImplementation.php
@@ -140,7 +140,7 @@ public function evaluate()
         if ($sectionName !== null) {
             return $fluidTemplate->renderSection($sectionName);
         } else {
-            return $fluidTemplate->render();
+            return $fluidTemplate->render()->getContents();
         }
     }
 
diff --git a/Neos.Fusion/Classes/View/FusionView.php b/Neos.Fusion/Classes/View/FusionView.php
index 1bb5439d0fc..358b8f65b65 100644
--- a/Neos.Fusion/Classes/View/FusionView.php
+++ b/Neos.Fusion/Classes/View/FusionView.php
@@ -23,6 +23,7 @@
 use Neos\Fusion\Core\Runtime;
 use Neos\Fusion\Core\RuntimeFactory;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * View for using Fusion for standard MVC controllers.
@@ -173,15 +174,16 @@ public function setFusionPathPatterns(array $pathPatterns)
     }
 
     /**
-     * Render the view
+     * Render the view to a full response in case a Neos.Fusion:Http.Message was used.
+     * If the fusion path contains a simple string a stream will be rendered.
      *
-     * @return ResponseInterface The rendered view
+     * @return ResponseInterface|StreamInterface
      * @api
      */
-    public function render(): ResponseInterface
+    public function render(): ResponseInterface|StreamInterface
     {
         $this->initializeFusionRuntime();
-        return $this->fusionRuntime->renderResponse(
+        return $this->fusionRuntime->renderEntryPathWithContext(
             $this->getFusionPathForCurrentRequest(),
             $this->variables
         );
diff --git a/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php b/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
index 94cfca2874d..d750745cf49 100644
--- a/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
+++ b/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
@@ -13,8 +13,6 @@
 
 use GuzzleHttp\Psr7\ServerRequest;
 use Neos\Flow\Mvc\ActionRequest;
-use Neos\Flow\Mvc\Controller\ControllerContext;
-use Neos\Flow\Mvc\View\ViewInterface;
 use Neos\Flow\Tests\FunctionalTestCase;
 use Neos\Fusion\Core\FusionGlobals;
 use Neos\Fusion\Core\FusionSourceCodeCollection;
@@ -46,8 +44,6 @@ abstract class AbstractFusionObjectTest extends FunctionalTestCase
      * Instead we want to refactor our tests to behat at some point.
      *
      * Thus the hack.
-     *
-     * @return ViewInterface
      */
     protected function buildView()
     {
@@ -62,7 +58,7 @@ protected function buildView()
         $runtime->pushContext('fixtureDirectory', __DIR__ . '/Fixtures/');
 
         // todo rewrite everything as behat test :D
-        return new class($runtime) implements ViewInterface {
+        return new class($runtime) {
             private string $fusionPath;
             public function __construct(
                 private readonly Runtime $runtime
@@ -97,18 +93,6 @@ public function render()
                     throw $e->getWrappedException();
                 }
             }
-            public static function createWithOptions(array $options)
-            {
-                throw new \BadMethodCallException();
-            }
-            public function setControllerContext(ControllerContext $controllerContext)
-            {
-                throw new \BadMethodCallException();
-            }
-            public function canRender(ControllerContext $controllerContext)
-            {
-                throw new \BadMethodCallException();
-            }
         };
     }
 
diff --git a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
index f59dad2cf69..9c7025c36a0 100644
--- a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
+++ b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
@@ -16,6 +16,7 @@
 use Neos\Fusion\Core\IllegalEntryFusionPathValueException;
 use Neos\Fusion\View\FusionView;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * Testcase for the Fusion View
@@ -29,7 +30,7 @@ class FusionViewTest extends FunctionalTestCase
     public function fusionViewIsUsedForRendering()
     {
         $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
-        self::assertEquals('X', $view->render()->getBody()->getContents());
+        self::assertEquals('X', $view->render()->getContents());
     }
 
     /**
@@ -39,7 +40,7 @@ public function fusionViewUsesGivenPathIfSet()
     {
         $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
         $view->setFusionPath('foo/bar');
-        self::assertEquals('Xfoobar', $view->render()->getBody()->getContents());
+        self::assertEquals('Xfoobar', $view->render()->getContents());
     }
 
     /**
@@ -49,19 +50,19 @@ public function fusionViewOutputsVariable()
     {
         $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
         $view->assign('test', 'Hallo Welt');
-        self::assertEquals('XHallo Welt', $view->render()->getBody()->getContents());
+        self::assertEquals('XHallo Welt', $view->render()->getContents());
     }
 
     /**
      * @test
      */
-    public function fusionVieReturnsHttpResponse()
+    public function fusionVieReturnsStreamInterface()
     {
         $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
         $view->assign('test', 'Hallo Welt');
         $response = $view->render();
-        self::assertInstanceOf(ResponseInterface::class, $response);
-        self::assertEquals('XHallo Welt', $view->render()->getBody()->getContents());
+        self::assertInstanceOf(StreamInterface::class, $response);
+        self::assertEquals('XHallo Welt', $response->getContents());
     }
 
     /**
diff --git a/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php b/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php
index 4716d1f6cbd..17125933372 100644
--- a/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php
+++ b/Neos.Fusion/Tests/Unit/Core/RuntimeTest.php
@@ -25,6 +25,7 @@
 use Neos\Fusion\Exception\RuntimeException;
 use Neos\Fusion\FusionObjects\ValueImplementation;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
 class RuntimeTest extends UnitTestCase
 {
@@ -219,7 +220,7 @@ public function renderResponseIsNotAllowedToOverrideFusionGlobals()
         $this->expectExceptionMessage('Overriding Fusion global variable "request" via @context is not allowed.');
         $runtime = new Runtime(FusionConfiguration::fromArray([]), FusionGlobals::fromArray(['request' => 'fixed']));
 
-        $runtime->renderResponse('foo', ['request' =>'anything']);
+        $runtime->renderEntryPathWithContext('foo', ['request' =>'anything']);
     }
 
     /**
@@ -238,15 +239,11 @@ public function pushContextArrayIsAllowedToOverrideFusionGlobals()
         self::assertTrue(true);
     }
 
-    public static function renderResponseExamples(): iterable
+    public static function renderStreamExamples(): iterable
     {
         yield 'simple string' => [
             'rawValue' => 'my string',
-            'response' => <<<'TEXT'
-            HTTP/1.1 200 OK
-
-            my string
-            TEXT
+            'streamContents' => 'my string'
         ];
 
         yield 'string cast object (\Stringable)' => [
@@ -256,31 +253,22 @@ public function __toString()
                     return 'my string karsten';
                 }
             },
-            'response' => <<<'TEXT'
-            HTTP/1.1 200 OK
-
-            my string karsten
-            TEXT
+            'streamContents' => 'my string karsten'
         ];
 
         yield 'empty string' => [
             'rawValue' => '',
-            'response' => <<<'TEXT'
-            HTTP/1.1 200 OK
-
-
-            TEXT
+            'streamContents' => ''
         ];
 
         yield 'null value' => [
             'rawValue' => null,
-            'response' => <<<'TEXT'
-            HTTP/1.1 200 OK
-
-
-            TEXT
+            'streamContents' => ''
         ];
+    }
 
+    public function renderResponseExamples(): iterable
+    {
         yield 'stringified http response string is upcasted' => [
             'rawValue' => <<<'TEXT'
             HTTP/1.1 418 OK
@@ -303,11 +291,32 @@ public function __toString()
         ];
     }
 
+    /**
+     * @test
+     * @dataProvider renderStreamExamples
+     */
+    public function renderEntryPathStream(mixed $rawValue, string $expectedStreamContents)
+    {
+        $runtime = $this->getMockBuilder(Runtime::class)
+            ->setConstructorArgs([FusionConfiguration::fromArray([]), FusionGlobals::empty()])
+            ->onlyMethods(['render'])
+            ->getMock();
+
+        $runtime->expects(self::once())->method('render')->willReturn(
+            $rawValue
+        );
+
+        $response = $runtime->renderEntryPathWithContext('path', []);
+
+        self::assertInstanceOf(StreamInterface::class, $response);
+        self::assertSame($expectedStreamContents, $response->getContents());
+    }
+
     /**
      * @test
      * @dataProvider renderResponseExamples
      */
-    public function renderResponse(mixed $rawValue, string $expectedHttpResponseString)
+    public function renderEntryPathResponse(mixed $rawValue, string $expectedHttpResponseString)
     {
         $runtime = $this->getMockBuilder(Runtime::class)
             ->setConstructorArgs([FusionConfiguration::fromArray([]), FusionGlobals::empty()])
@@ -318,7 +327,7 @@ public function renderResponse(mixed $rawValue, string $expectedHttpResponseStri
             is_string($rawValue) ? str_replace("\n", "\r\n", $rawValue) : $rawValue
         );
 
-        $response = $runtime->renderResponse('path', []);
+        $response = $runtime->renderEntryPathWithContext('path', []);
 
         self::assertInstanceOf(ResponseInterface::class, $response);
         self::assertSame(str_replace("\n", "\r\n", $expectedHttpResponseString), Message::toString($response));
@@ -371,6 +380,6 @@ public function renderResponseThrowsIfNotStringable(mixed $illegalValue)
             $illegalValue
         );
 
-        $runtime->renderResponse('path', []);
+        $runtime->renderEntryPathWithContext('path', []);
     }
 }
diff --git a/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php b/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php
index c20eca8bcda..bf47fbeea60 100644
--- a/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php
+++ b/Neos.Neos/Classes/Fusion/ExceptionHandlers/PageHandler.php
@@ -105,7 +105,7 @@ protected function handle($fusionPath, \Exception $exception, $referenceCode)
             'node' => $node
         ]);
 
-        return $this->wrapHttpResponse($exception, $fluidView->render());
+        return $this->wrapHttpResponse($exception, $fluidView->render()->getContents());
     }
 
     /**
diff --git a/Neos.Neos/Classes/View/FusionExceptionView.php b/Neos.Neos/Classes/View/FusionExceptionView.php
index 821c25eb275..eb675b7310d 100644
--- a/Neos.Neos/Classes/View/FusionExceptionView.php
+++ b/Neos.Neos/Classes/View/FusionExceptionView.php
@@ -143,7 +143,7 @@ public function render(): ResponseInterface|StreamInterface
 
         $this->setFallbackRuleFromDimension($dimensionSpacePoint);
 
-        return $fusionRuntime->renderResponse('error', array_merge(
+        return $fusionRuntime->renderEntryPathWithContext('error', array_merge(
             $this->variables,
             [
                 'node' => $currentSiteNode,
diff --git a/Neos.Neos/Classes/View/FusionView.php b/Neos.Neos/Classes/View/FusionView.php
index 629760b14b7..8c21bf35eca 100644
--- a/Neos.Neos/Classes/View/FusionView.php
+++ b/Neos.Neos/Classes/View/FusionView.php
@@ -33,6 +33,7 @@
 use Neos\Neos\Exception;
 use Neos\Neos\Utility\NodeTypeWithFallbackProvider;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * A Fusion view for Neos
@@ -61,13 +62,13 @@ class FusionView extends AbstractView
     protected ?ActionRequest $assignedActionRequest = null;
 
     /**
-     * Renders the view
+     * Render the view to a full response in case a Neos.Fusion:Http.Message was used.
+     * If the fusion path contains a simple string a stream will be rendered.
      *
-     * @return ResponseInterface The rendered view
      * @throws \Exception if no node is given
      * @api
      */
-    public function render(): ResponseInterface
+    public function render(): ResponseInterface|StreamInterface
     {
         $currentNode = $this->getCurrentNode();
 
@@ -82,7 +83,7 @@ public function render(): ResponseInterface
 
         $this->setFallbackRuleFromDimension($currentNode->subgraphIdentity->dimensionSpacePoint);
 
-        return $fusionRuntime->renderResponse($this->fusionPath, [
+        return $fusionRuntime->renderEntryPathWithContext($this->fusionPath, [
             'node' => $currentNode,
             'documentNode' => $this->getClosestDocumentNode($currentNode) ?: $currentNode,
             'site' => $currentSiteNode
diff --git a/Neos.Neos/Classes/ViewHelpers/StandaloneViewViewHelper.php b/Neos.Neos/Classes/ViewHelpers/StandaloneViewViewHelper.php
index 8408f9a5cb6..4851341cf56 100644
--- a/Neos.Neos/Classes/ViewHelpers/StandaloneViewViewHelper.php
+++ b/Neos.Neos/Classes/ViewHelpers/StandaloneViewViewHelper.php
@@ -74,6 +74,6 @@ public function render(): string
     {
         $standaloneView = new StandaloneView($this->controllerContext->getRequest());
         $standaloneView->setTemplatePathAndFilename($this->arguments['templatePathAndFilename']);
-        return $standaloneView->assignMultiple($this->arguments['arguments'])->render();
+        return $standaloneView->assignMultiple($this->arguments['arguments'])->render()->getContents();
     }
 }

From a99de6ca9569e32d5ff8153acbccd15832bca391 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 17 Mar 2024 22:39:15 +0100
Subject: [PATCH 29/31] TASK: Adjust to strict types in `ViewInterface`

---
 Neos.Fusion/Classes/View/FusionView.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Neos.Fusion/Classes/View/FusionView.php b/Neos.Fusion/Classes/View/FusionView.php
index 358b8f65b65..d6c9c407ac2 100644
--- a/Neos.Fusion/Classes/View/FusionView.php
+++ b/Neos.Fusion/Classes/View/FusionView.php
@@ -103,7 +103,10 @@ public function setOption($optionName, $value)
         parent::setOption($optionName, $value);
     }
 
-    public function assign($key, $value)
+    /**
+     * @return $this for chaining
+     */
+    public function assign(string $key, mixed $value): self
     {
         if ($key === 'request') {
             // the request cannot be used as "normal" fusion variable and must be treated as FusionGlobal

From 716e6a8c35059fed38c595c446ee3386b8e5affa Mon Sep 17 00:00:00 2001
From: Marc Henry Schultz <85400359+mhsdesign@users.noreply.github.com>
Date: Fri, 19 Apr 2024 16:42:27 +0200
Subject: [PATCH 30/31] Fix typos

Co-authored-by: Wilhelm Behncke <2522299+grebaldi@users.noreply.github.com>
---
 Neos.Fusion/Classes/Core/LegacyFusionControllerContext.php   | 4 ++--
 Neos.Fusion/Classes/Core/Runtime.php                         | 5 +++--
 .../Functional/FusionObjects/AbstractFusionObjectTest.php    | 2 +-
 Neos.Fusion/Tests/Functional/View/FusionViewTest.php         | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Neos.Fusion/Classes/Core/LegacyFusionControllerContext.php b/Neos.Fusion/Classes/Core/LegacyFusionControllerContext.php
index 07d02d0e6f1..1196724b5b1 100644
--- a/Neos.Fusion/Classes/Core/LegacyFusionControllerContext.php
+++ b/Neos.Fusion/Classes/Core/LegacyFusionControllerContext.php
@@ -105,10 +105,10 @@ public function getFlashMessageContainer(): FlashMessageContainer
      *
      * Gives access to the legacy mutable action response simulation {@see Runtime::withSimulatedLegacyControllerContext()}
      *
-     * Initially it was possible to mutate the current response of the active MVC controller though this getter.
+     * Initially it was possible to mutate the current response of the active MVC controller through this getter.
      *
      * While *HIGHLY* internal behaviour and *ONLY* to be used by Neos.Fusion.Form or Neos.Neos:Plugin
-     * this legacy layer is in place still allows this functionality.
+     * this legacy layer is in place to still allow this functionality.
      *
      * @deprecated with Neos 9.0 can be removed with 10
      * @internal THIS SHOULD NEVER BE CALLED ON USER-LAND
diff --git a/Neos.Fusion/Classes/Core/Runtime.php b/Neos.Fusion/Classes/Core/Runtime.php
index f9fca878474..76f12b0d016 100644
--- a/Neos.Fusion/Classes/Core/Runtime.php
+++ b/Neos.Fusion/Classes/Core/Runtime.php
@@ -954,9 +954,9 @@ protected function throwExceptionForUnrenderablePathIfNeeded($fusionPath, $fusio
     /**
      * Implements the legacy controller context simulation {@see self::getControllerContext()}
      *
-     * Initially it was possible to mutate the current response of the active MVC controller though $response.
+     * Initially it was possible to mutate the current response of the active MVC controller through $response.
      * While HIGHLY internal behaviour and ONLY to be used by Neos.Fusion.Form or Neos.Neos:Plugin
-     * this legacy layer is in place still allows this functionality.
+     * this legacy layer is in place to still allow this functionality.
      *
      * @param \Closure(): (ResponseInterface|StreamInterface) $renderer
      */
@@ -968,6 +968,7 @@ private function withSimulatedLegacyControllerContext(\Closure $renderer): Respo
         $this->legacyActionResponseForCurrentRendering = new ActionResponse();
 
         // actual rendering
+        $httpResponseOrStream = null;
         try {
             $httpResponseOrStream = $renderer();
         } finally {
diff --git a/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php b/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
index d750745cf49..fabf9962426 100644
--- a/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
+++ b/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
@@ -35,7 +35,7 @@ abstract class AbstractFusionObjectTest extends FunctionalTestCase
     /**
      * TODO THIS IS HACKY AS WE CREATE AN OWN VIEW
      *
-     * We do that as the FusionView (rightfully) does return mixed anymore.
+     * We do that as the FusionView (rightfully) doesn't return mixed anymore.
      *
      * We could instead also rewrite all tests to use the Runtime instead.
      *
diff --git a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
index 9c7025c36a0..e15f978159a 100644
--- a/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
+++ b/Neos.Fusion/Tests/Functional/View/FusionViewTest.php
@@ -56,7 +56,7 @@ public function fusionViewOutputsVariable()
     /**
      * @test
      */
-    public function fusionVieReturnsStreamInterface()
+    public function fusionViewReturnsStreamInterface()
     {
         $view = $this->buildView('Foo\Bar\Controller\TestController', 'index');
         $view->assign('test', 'Hallo Welt');

From 2cf100f5aee0d3fbdecfb3abd648618cdd5407a8 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Mon, 22 Apr 2024 10:07:24 +0200
Subject: [PATCH 31/31] TASK: Introduce `TestingViewForFusionRuntime` for
 testing instead of using a hacky anonymous class

---
 .../AbstractFusionObjectTest.php              | 61 ++---------------
 .../TestingViewForFusionRuntime.php           | 67 +++++++++++++++++++
 .../Functional/Fusion/NodeHelperTest.php      |  3 +-
 3 files changed, 73 insertions(+), 58 deletions(-)
 create mode 100644 Neos.Fusion/Tests/Functional/FusionObjects/TestingViewForFusionRuntime.php

diff --git a/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php b/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
index fabf9962426..452b61d6e6e 100644
--- a/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
+++ b/Neos.Fusion/Tests/Functional/FusionObjects/AbstractFusionObjectTest.php
@@ -16,10 +16,7 @@
 use Neos\Flow\Tests\FunctionalTestCase;
 use Neos\Fusion\Core\FusionGlobals;
 use Neos\Fusion\Core\FusionSourceCodeCollection;
-use Neos\Fusion\Core\Runtime;
 use Neos\Fusion\Core\RuntimeFactory;
-use Neos\Fusion\Exception\RuntimeException;
-use Psr\Http\Message\ServerRequestFactoryInterface;
 
 /**
  * Testcase for the Fusion View
@@ -32,22 +29,8 @@ abstract class AbstractFusionObjectTest extends FunctionalTestCase
      */
     protected $request;
 
-    /**
-     * TODO THIS IS HACKY AS WE CREATE AN OWN VIEW
-     *
-     * We do that as the FusionView (rightfully) doesn't return mixed anymore.
-     *
-     * We could instead also rewrite all tests to use the Runtime instead.
-     *
-     * But that would be a lot of effort for nothing.
-     *
-     * Instead we want to refactor our tests to behat at some point.
-     *
-     * Thus the hack.
-     */
-    protected function buildView()
+    protected function buildView(): TestingViewForFusionRuntime
     {
-        /** @var ServerRequestFactoryInterface $httpRequestFactory */
         $this->request = ActionRequest::fromHttpRequest(new ServerRequest('GET', 'http://localhost/'));
 
         $runtime = $this->objectManager->get(RuntimeFactory::class)->createFromSourceCode(
@@ -55,45 +38,9 @@ protected function buildView()
             FusionGlobals::fromArray(['request' => $this->request])
         );
 
-        $runtime->pushContext('fixtureDirectory', __DIR__ . '/Fixtures/');
-
-        // todo rewrite everything as behat test :D
-        return new class($runtime) {
-            private string $fusionPath;
-            public function __construct(
-                private readonly Runtime $runtime
-            ) {
-            }
-            public function setFusionPath(string $fusionPath)
-            {
-                $this->fusionPath = $fusionPath;
-            }
-            public function assign($key, $value)
-            {
-                $this->runtime->pushContext($key, $value);
-            }
-            public function setOption($key, $value)
-            {
-                match ($key) {
-                    'enableContentCache' => $this->runtime->setEnableContentCache($value),
-                    'debugMode' => $this->runtime->setDebugMode($value)
-                };
-            }
-            public function assignMultiple(array $values)
-            {
-                foreach ($values as $key => $value) {
-                    $this->runtime->pushContext($key, $value);
-                }
-            }
-            public function render()
-            {
-                try {
-                    return $this->runtime->render($this->fusionPath);
-                } catch (RuntimeException $e) {
-                    throw $e->getWrappedException();
-                }
-            }
-        };
+        $view = new TestingViewForFusionRuntime($runtime);
+        $view->assign('fixtureDirectory', __DIR__ . '/Fixtures/');
+        return $view;
     }
 
     /**
diff --git a/Neos.Fusion/Tests/Functional/FusionObjects/TestingViewForFusionRuntime.php b/Neos.Fusion/Tests/Functional/FusionObjects/TestingViewForFusionRuntime.php
new file mode 100644
index 00000000000..aa03688ce27
--- /dev/null
+++ b/Neos.Fusion/Tests/Functional/FusionObjects/TestingViewForFusionRuntime.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\Fusion\Tests\Functional\FusionObjects;
+
+use Neos\Fusion\Core\Runtime;
+use Neos\Fusion\Exception\RuntimeException;
+
+/**
+ * TODO THIS IS HACKY AS WE CREATE A SHALLOW ABSTRACTION FOR TESTING
+ *
+ * We do that as the FusionView (rightfully) doesn't return mixed anymore - but we test arbitrary data.
+ * {@see https://github.com/neos/neos-development-collection/pull/4856}
+ *
+ * We could instead also rewrite all tests to use the Runtime natively.
+ * But that would be a lot of effort and diff for nothing.
+ *
+ * Instead we want to refactor our fusion tests to behat at some point.
+ *
+ * Thus the (temporary) hack / abstraction.
+ *
+ * @deprecated todo rewrite everything as behat test :D
+ */
+class TestingViewForFusionRuntime
+{
+    private string $fusionPath;
+
+    public function __construct(
+        private readonly Runtime $runtime
+    ) {
+    }
+
+    public function setFusionPath(string $fusionPath)
+    {
+        $this->fusionPath = $fusionPath;
+    }
+
+    public function assign($key, $value)
+    {
+        $this->runtime->pushContext($key, $value);
+    }
+
+    public function setOption($key, $value)
+    {
+        match ($key) {
+            'enableContentCache' => $this->runtime->setEnableContentCache($value),
+            'debugMode' => $this->runtime->setDebugMode($value)
+        };
+    }
+
+    public function assignMultiple(array $values)
+    {
+        foreach ($values as $key => $value) {
+            $this->runtime->pushContext($key, $value);
+        }
+    }
+
+    public function render()
+    {
+        try {
+            return $this->runtime->render($this->fusionPath);
+        } catch (RuntimeException $e) {
+            throw $e->getWrappedException();
+        }
+    }
+}
diff --git a/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php b/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php
index 9952d6a776b..fc7b35fd719 100644
--- a/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php
+++ b/Neos.Neos/Tests/Functional/Fusion/NodeHelperTest.php
@@ -30,6 +30,7 @@
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepository\TestSuite\Unit\NodeSubjectProvider;
 use Neos\Fusion\Tests\Functional\FusionObjects\AbstractFusionObjectTest;
+use Neos\Fusion\Tests\Functional\FusionObjects\TestingViewForFusionRuntime;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
@@ -107,7 +108,7 @@ public function crop()
         self::assertEquals('Some -', (string)$view->render());
     }
 
-    protected function buildView()
+    protected function buildView(): TestingViewForFusionRuntime
     {
         $view = parent::buildView();