TASK: Adjust StopActionException::createForResponse to use psr resp…

…onse
neos · Feb 6, 2024 · 41315e0 · 41315e0
1 parent 09c24f5
commit 41315e0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/Neos.Flow/Classes/Mvc/Controller/AbstractController.php b/Neos.Flow/Classes/Mvc/Controller/AbstractController.php
@@ -333,7 +333,7 @@ protected function redirectToUri(string|UriInterface $uri, int $delay = 0, int $
             $this->response->setStatusCode($statusCode);
             $this->response->setContent('<html><head><meta http-equiv="refresh" content="' . (int)$delay . ';url=' . $uri . '"/></head></html>');
         }
-        throw StopActionException::createForResponse($this->response, '');
+        throw StopActionException::createForResponse($this->response->buildHttpResponse(), '');
     }
 
     /**
@@ -358,7 +358,7 @@ protected function throwStatus(int $statusCode, $statusMessage = null, $content
             );
         }
         $this->response->setContent($content);
-        throw StopActionException::createForResponse($this->response, $content);
+        throw StopActionException::createForResponse($this->response->buildHttpResponse(), $content);
     }
 
     /**

diff --git a/Neos.Flow/Classes/Mvc/Controller/RestController.php b/Neos.Flow/Classes/Mvc/Controller/RestController.php
@@ -12,6 +12,7 @@
  */
 
 use GuzzleHttp\Psr7\Uri;
+use GuzzleHttp\Psr7\Utils;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\ActionRequest;
 use Neos\Flow\Mvc\ActionResponse;
@@ -134,7 +135,7 @@ protected function redirectToUri(string|UriInterface $uri, int $delay = 0, int $
             parent::redirectToUri($uri, $delay, $statusCode);
         } catch (StopActionException $exception) {
             if ($this->request->getFormat() === 'json') {
-                $exception->response->setContent('');
+                throw StopActionException::createForResponse($exception->response->withBody(Utils::streamFor('')), '');
             }
             throw $exception;
         }

diff --git a/Neos.Flow/Classes/Mvc/Exception/StopActionException.php b/Neos.Flow/Classes/Mvc/Exception/StopActionException.php
@@ -41,18 +41,17 @@ private function __construct(string $message, int $code, ?\Throwable $previous,
     }
 
     /**
-     * @deprecated
-     * @param ActionResponse $response The response to be received by the MVC Dispatcher.
+     * @param ResponseInterface $response The response to be received by the MVC Dispatcher.
      * @param string $details Additional details just for this exception, in case it is logged (the regular exception message).
      */
-    public static function createForResponse(ActionResponse $response, string $details): self
+    public static function createForResponse(ResponseInterface $response, string $details): self
     {
         if (empty($details)) {
             $details = sprintf(
                 'Stop action with %s response.',
                 $response->getStatusCode()
             );
         }
-        return new self($details, 1558088618, null, $response->buildHttpResponse());
+        return new self($details, 1558088618, null, $response);
     }
 }
diff --git a/Neos.Flow/Tests/Unit/Mvc/DispatcherTest.php b/Neos.Flow/Tests/Unit/Mvc/DispatcherTest.php
@@ -156,7 +156,7 @@ public function dispatchIgnoresStopExceptionsForFirstLevelActionRequests()
         $this->mockParentRequest->expects(self::exactly(2))->method('isDispatched')->willReturnOnConsecutiveCalls(false, true);
         $this->mockParentRequest->expects(self::once())->method('isMainRequest')->willReturn(true);
 
-        $this->mockController->expects(self::atLeastOnce())->method('processRequest')->will(self::throwException(StopActionException::createForResponse(new ActionResponse(), '')));
+        $this->mockController->expects(self::atLeastOnce())->method('processRequest')->will(self::throwException(StopActionException::createForResponse(new Response(), '')));
 
         $this->dispatcher->dispatch($this->mockParentRequest);
     }
@@ -169,7 +169,7 @@ public function dispatchCatchesStopExceptionOfActionRequestsAndRollsBackToThePar
         $this->mockActionRequest->expects(self::atLeastOnce())->method('isDispatched')->willReturn(false);
         $this->mockParentRequest->expects(self::atLeastOnce())->method('isDispatched')->willReturn(true);
 
-        $this->mockController->expects(self::atLeastOnce())->method('processRequest')->will(self::throwException(StopActionException::createForResponse(new ActionResponse(), '')));
+        $this->mockController->expects(self::atLeastOnce())->method('processRequest')->will(self::throwException(StopActionException::createForResponse(new Response(), '')));
 
         $this->dispatcher->dispatch($this->mockActionRequest, $this->actionResponse);
     }
@@ -188,7 +188,7 @@ public function dispatchContinuesWithNextRequestFoundInAForwardException()
 
         $this->mockController->expects(self::exactly(2))->method('processRequest')
             ->withConsecutive([$this->mockActionRequest], [$this->mockParentRequest])
-            ->willReturnOnConsecutiveCalls(self::throwException(StopActionException::createForResponse(new ActionResponse(), '')), self::throwException($forwardException));
+            ->willReturnOnConsecutiveCalls(self::throwException(StopActionException::createForResponse(new Response(), '')), self::throwException($forwardException));
 
         $this->dispatcher->dispatch($this->mockActionRequest);
     }