TASK: Adjust to ViewInterface change in Neos.Flow and Neos.Neos

see neos/flow-development-collection#3286 see neos/neos-development-collection#4856
neos · Mar 17, 2024 · a7b193d · a7b193d
1 parent 98ecd6b
commit a7b193d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 20 deletions.
diff --git a/Classes/Domain/Model/Feedback/Operations/ReloadContentOutOfBand.php b/Classes/Domain/Model/Feedback/Operations/ReloadContentOutOfBand.php
@@ -132,7 +132,7 @@ public function serializePayload(ControllerContext $controllerContext): array
     /**
      * Render the node
      */
-    protected function renderContent(ControllerContext $controllerContext): string|ResponseInterface
+    protected function renderContent(ControllerContext $controllerContext): string
     {
         if (!is_null($this->node)) {
             $cacheTags = $this->cachingHelper->nodeTag($this->getNode());
@@ -150,7 +150,12 @@ protected function renderContent(ControllerContext $controllerContext): string|R
                 $view->assign('value', $this->node);
                 $view->setRenderingEntryPoint($this->nodeDomAddress->getFusionPathForContentRendering());
 
-                return $view->render();
+                $content = $view->render();
+                if ($content instanceof ResponseInterface) {
+                    // todo should not happen, as we never render a full Neos.Neos:Page here?
+                    return $content->getBody()->getContents();
+                }
+                return $content->getContents();
             }
         }
 

diff --git a/Classes/Domain/Model/Feedback/Operations/RenderContentOutOfBand.php b/Classes/Domain/Model/Feedback/Operations/RenderContentOutOfBand.php
@@ -175,7 +175,7 @@ public function serializePayload(ControllerContext $controllerContext): array
     /**
      * Render the node
      */
-    protected function renderContent(ControllerContext $controllerContext): string|ResponseInterface
+    protected function renderContent(ControllerContext $controllerContext): string
     {
         if (is_null($this->node)) {
             return '';
@@ -199,7 +199,12 @@ protected function renderContent(ControllerContext $controllerContext): string|R
                 $view->assign('value', $parentNode);
                 $view->setRenderingEntryPoint($parentDomAddress->getFusionPath());
 
-                return $view->render();
+                $content = $view->render();
+                if ($content instanceof ResponseInterface) {
+                    // todo should not happen, as we never render a full Neos.Neos:Page here?
+                    return $content->getBody()->getContents();
+                }
+                return $content->getContents();
             }
         }
 

diff --git a/Classes/Fusion/ExceptionHandler/PageExceptionHandler.php b/Classes/Fusion/ExceptionHandler/PageExceptionHandler.php
@@ -14,13 +14,15 @@
 use GuzzleHttp\Psr7\Message;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Exception;
+use Neos\Flow\Mvc\Controller\Arguments;
+use Neos\Flow\Mvc\Controller\ControllerContext;
 use Neos\Flow\Mvc\View\ViewInterface;
 use Neos\Flow\Utility\Environment;
 use Neos\FluidAdaptor\View\StandaloneView;
 use Neos\Fusion\Core\ExceptionHandlers\AbstractRenderingExceptionHandler;
 use Neos\Fusion\Core\ExceptionHandlers\HtmlMessageHandler;
 use Psr\Http\Message\ResponseFactoryInterface;
-use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * A page exception handler for the new UI.
@@ -37,12 +39,6 @@ class PageExceptionHandler extends AbstractRenderingExceptionHandler
      */
     protected $responseFactory;
 
-    /**
-     * @Flow\Inject
-     * @var StreamFactoryInterface
-     */
-    protected $contentFactory;
-
     /**
      * @Flow\Inject
      * @var Environment
@@ -78,13 +74,11 @@ protected function handle($fusionPath, \Exception $exception, $referenceCode): s
      * Renders an actual HTTP response including the correct status and cache control header.
      *
      * @param \Exception $exception the exception
-     * @param string $bodyContent
-     * @return string
      */
-    protected function wrapHttpResponse(\Exception $exception, string $bodyContent): string
+    protected function wrapHttpResponse(\Exception $exception, StreamInterface $bodyContent): string
     {
         $response = $this->responseFactory->createResponse($exception instanceof Exception ? $exception->getStatusCode() : 500)
-            ->withBody($this->contentFactory->createStream($bodyContent))
+            ->withBody($bodyContent)
             ->withHeader('Cache-Control', 'no-store');
 
         return Message::toString($response);
@@ -99,13 +93,20 @@ protected function wrapHttpResponse(\Exception $exception, string $bodyContent):
     protected function prepareFluidView(): ViewInterface
     {
         $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.Ui/Private/Templates/Error/ErrorMessage.html');
 
         $guestNotificationScript = new StandaloneView();
         $guestNotificationScript->setTemplatePathAndFilename('resource://Neos.Neos.Ui/Private/Templates/Backend/GuestNotificationScript.html');
-        $fluidView->assign('guestNotificationScript', $guestNotificationScript->render());
+        $fluidView->assign('guestNotificationScript', $guestNotificationScript->render()->getContents());
 
         return $fluidView;
     }

diff --git a/Classes/Presentation/ApplicationView.php b/Classes/Presentation/ApplicationView.php
@@ -19,8 +19,10 @@
 use Neos\Flow\Mvc\View\AbstractView;
 use Neos\Flow\ResourceManagement\ResourceManager;
 use Neos\Flow\Security\Context as SecurityContext;
+use Neos\Http\Factories\StreamFactoryTrait;
 use Neos\Neos\Service\UserService;
 use Neos\Neos\Ui\Domain\Service\StyleAndJavascriptInclusionService;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * @internal This view is meant to be used exclusively in conjunction with
@@ -30,6 +32,8 @@
 #[Flow\Scope("singleton")]
 final class ApplicationView extends AbstractView
 {
+    use StreamFactoryTrait;
+
     #[Flow\Inject]
     protected UserService $userService;
 
@@ -54,7 +58,7 @@ final class ApplicationView extends AbstractView
         'title' => [null, 'The application title which will be used as the HTML <title>.', 'string'],
     ];
 
-    public function render(): string
+    public function render(): StreamInterface
     {
         $result = '<!DOCTYPE html>';
         $result .= '<html lang="' . $this->renderLang() . '">';
@@ -66,7 +70,7 @@ public function render(): string
         $result .= '</body>';
         $result .= '</html>';
 
-        return $result;
+        return $this->createStream($result);
     }
 
     private function renderLang(): string

diff --git a/Classes/View/OutOfBandRenderingCapable.php b/Classes/View/OutOfBandRenderingCapable.php
@@ -15,6 +15,7 @@
 namespace Neos\Neos\Ui\View;
 
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
 
 /**
  * The interface for views capable of out-of-band rendering by accepting string serialized entry points
@@ -27,5 +28,5 @@ interface OutOfBandRenderingCapable
      */
     public function setRenderingEntryPoint(string $renderingEntryPoint): void;
 
-    public function render(): string|ResponseInterface;
+    public function render(): ResponseInterface|StreamInterface;
 }