Merge pull request #3407 from mhsdesign/bugfix/mvc-dispatcher-refacto…

…ring-followup BUGFIX: Fix use of `$this->response->set...` in controllers
neos · Oct 28, 2024 · f1d1bb9 · f1d1bb9
2 parents c02e067 + 96958c2
commit f1d1bb9
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/Neos.Flow/Classes/Mvc/ActionRequest.php b/Neos.Flow/Classes/Mvc/ActionRequest.php
@@ -105,12 +105,6 @@ class ActionRequest
      */
     protected $format = '';
 
-    /**
-     * If this request has been changed and needs to be dispatched again
-     * @var boolean
-     */
-    protected $dispatched = false;
-
     /**
      * The parent request – either another sub ActionRequest a main ActionRequest or null
      * @var ?ActionRequest
@@ -656,14 +650,6 @@ public function getFormat(): string
         return $this->format;
     }
 
-    /**
-     * Resets the dispatched status to false
-     */
-    public function __clone()
-    {
-        $this->dispatched = false;
-    }
-
     /**
      * We provide our own __sleep method, where we serialize all properties *except* the parentRequest if it is
      * a HTTP request -- as this one contains $_SERVER etc.
@@ -672,7 +658,7 @@ public function __clone()
      */
     public function __sleep()
     {
-        $properties = ['controllerPackageKey', 'controllerSubpackageKey', 'controllerName', 'controllerActionName', 'arguments', 'internalArguments', 'pluginArguments', 'argumentNamespace', 'format', 'dispatched'];
+        $properties = ['controllerPackageKey', 'controllerSubpackageKey', 'controllerName', 'controllerActionName', 'arguments', 'internalArguments', 'pluginArguments', 'argumentNamespace', 'format'];
         if ($this->parentRequest instanceof ActionRequest) {
             $properties[] = 'parentRequest';
         }

diff --git a/Neos.Flow/Classes/Mvc/Controller/ActionController.php b/Neos.Flow/Classes/Mvc/Controller/ActionController.php
@@ -257,7 +257,7 @@ public function processRequest(ActionRequest $request): ResponseInterface
             $this->initializeView($this->view);
         }
 
-        $httpResponse = $this->callActionMethod($request, $this->arguments, $response->buildHttpResponse());
+        $httpResponse = $this->callActionMethod($request, $this->arguments, $response);
 
         if (!$httpResponse->hasHeader('Content-Type')) {
             $httpResponse = $httpResponse->withHeader('Content-Type', $this->negotiatedMediaType);
@@ -512,9 +512,9 @@ protected function initializeAction()
      *
      * @param ActionRequest $request
      * @param Arguments $arguments
-     * @param ResponseInterface $httpResponse The most likely empty response, previously available as $this->response
+     * @param ActionResponse $response The most likely empty response, previously available as $this->response
      */
-    protected function callActionMethod(ActionRequest $request, Arguments $arguments, ResponseInterface $httpResponse): ResponseInterface
+    protected function callActionMethod(ActionRequest $request, Arguments $arguments, ActionResponse $response): ResponseInterface
     {
         $preparedArguments = [];
         foreach ($arguments as $argument) {
@@ -555,6 +555,9 @@ protected function callActionMethod(ActionRequest $request, Arguments $arguments
             }
         }
 
+        // freeze $response previously available as $this->response
+        $httpResponse = $response->buildHttpResponse();
+
         if ($actionResult instanceof ResponseInterface) {
             return $actionResult;
         }

diff --git a/Neos.Flow/Tests/Functional/Mvc/ActionControllerTest.php b/Neos.Flow/Tests/Functional/Mvc/ActionControllerTest.php
@@ -129,6 +129,16 @@ public function defaultTemplateIsResolvedAndUsedAccordingToConventions()
         self::assertEquals('Fourth action <b>[email protected]</b>', $response->getBody()->getContents());
     }
 
+    /**
+     * @test
+     */
+    public function requestAndResponseAreAvailableInTheAction()
+    {
+        $response = $this->browser->request('http://localhost/test/mvc/actioncontrollertesta/fifth?argument=the-value');
+        self::assertEquals('Fifth action (fifth) with: "the-value"', $response->getBody()->getContents());
+        self::assertEquals('Hello World', $response->getHeaderLine('X-Foo'));
+    }
+
     /**
      * Bug #36913
      *

diff --git a/Neos.Flow/Tests/Functional/Mvc/Fixtures/Controller/ActionControllerTestAController.php b/Neos.Flow/Tests/Functional/Mvc/Fixtures/Controller/ActionControllerTestAController.php
@@ -65,6 +65,15 @@ public function fourthAction($emailAddress)
         $this->view->assign('emailAddress', $emailAddress);
     }
 
+    /**
+     * Tests response and request
+     */
+    public function fifthAction()
+    {
+        $this->response->setHttpHeader('X-Foo', 'Hello World');
+        return sprintf('Fifth action (%s) with: "%s"', $this->request->getControllerActionName(), $this->request->getArgument('argument'));
+    }
+
     /**
      * @param string $putArgument
      * @param string $getArgument