Merge pull request #4569 from neos/bugfix/fusionExceptionViewUsesWron…

…gRequestWithoutControllerContext BUGFIX: FusionExceptionView must use mocked controller context
neos · Sep 29, 2023 · 4de3469 · 4de3469
2 parents bdeb74b + a50a672
commit 4de3469
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/Neos.Neos/Classes/View/FusionExceptionView.php b/Neos.Neos/Classes/View/FusionExceptionView.php
@@ -102,9 +102,12 @@ class FusionExceptionView extends AbstractView
     public function render()
     {
         $requestHandler = $this->bootstrap->getActiveRequestHandler();
-        $httpRequest = $requestHandler instanceof HttpRequestHandler
-            ? $requestHandler->getHttpRequest()
-            : ServerRequest::fromGlobals();
+
+        if (!$requestHandler instanceof HttpRequestHandler) {
+            throw new \RuntimeException('The FusionExceptionView only works in web requests.', 1695975353);
+        }
+
+        $httpRequest = $requestHandler->getHttpRequest();
 
         $siteDetectionResult = SiteDetectionResult::fromRequest($httpRequest);
         $contentRepository = $this->contentRepositoryRegistry->get($siteDetectionResult->contentRepositoryId);
@@ -204,14 +207,14 @@ protected function getFusionRuntime(
             $fusionConfiguration = $this->fusionService->createFusionConfigurationFromSite($site);
 
             $fusionGlobals = FusionGlobals::fromArray([
-                'request' => $this->controllerContext->getRequest(),
+                'request' => $controllerContext->getRequest(),
                 'renderingModeName' => RenderingMode::FRONTEND
             ]);
             $this->fusionRuntime = $this->runtimeFactory->createFromConfiguration(
                 $fusionConfiguration,
                 $fusionGlobals
             );
-            $this->fusionRuntime->setControllerContext($this->controllerContext);
+            $this->fusionRuntime->setControllerContext($controllerContext);
 
             if (isset($this->options['enableContentCache']) && $this->options['enableContentCache'] !== null) {
                 $this->fusionRuntime->setEnableContentCache($this->options['enableContentCache']);