Merge pull request #11087 from cakephp/issue-11084

Fix response headers set in templates not be sent.

src/Controller/Controller.php

@@ -621,7 +621,8 @@ public function render($view = null, $layout = null)
         }
 
         $this->View = $this->createView();
-        $this->response->body($this->View->render($view, $layout));
+        $contents = $this->View->render($view, $layout);
+        $this->response = $this->View->response->withStringBody($contents);
 
         return $this->response;
     }

src/Http/ActionDispatcher.php

@@ -122,15 +122,16 @@ protected function _invoke(Controller $controller)
         }
 
         if (!$response && $controller->autoRender) {
-            $response = $controller->render();
-        } elseif (!$response) {
-            $response = $controller->response;
+            $controller->render();
         }
 
         $result = $controller->shutdownProcess();
         if ($result instanceof Response) {
             return $result;
         }
+        if (!$response) {
+            $response = $controller->response;
+        }
 
         return $response;
     }

tests/TestCase/Controller/ControllerTest.php

@@ -403,6 +403,25 @@ public function testRender()
         $this->assertRegExp('/this is the test element/', (string)$result);
     }
 
+    /**
+     * test view rendering changing response
+     *
+     * @return void
+     */
+    public function testRenderViewChangesResponse()
+    {
+        $request = new ServerRequest('controller_posts/index');
+        $request->params['action'] = 'header';
+
+        $controller = new Controller($request, new Response());
+        $controller->viewBuilder()->templatePath('Posts');
+
+        $result = $controller->render('header');
+        $this->assertContains('header template', (string)$result);
+        $this->assertTrue($controller->response->hasHeader('X-view-template'));
+        $this->assertSame('yes', $controller->response->getHeaderLine('X-view-template'));
+    }
+
     /**
      * test that a component beforeRender can change the controller view class.
      *

tests/TestCase/Routing/DispatcherFactoryTest.php

@@ -121,12 +121,16 @@ public function testCreateDispatchWithFilters()
         $response = $this->getMockBuilder('Cake\Http\Response')
             ->setMethods(['send'])
             ->getMock();
+
+        $response->expects($this->once())
+            ->method('send')
+            ->will($this->returnSelf());
+
         DispatcherFactory::add('ControllerFactory');
         DispatcherFactory::add('Append');
 
         $dispatcher = DispatcherFactory::create();
         $result = $dispatcher->dispatch($url, $response);
-        $this->assertNull($result);
-        $this->assertEquals('posts index appended content', $response->body());
+        $this->assertEquals('posts index appended content', $result->body());
     }
 }

tests/TestCase/Routing/DispatcherTest.php

@@ -160,7 +160,9 @@ public function testDispatchBasic()
                 'pass' => ['extract'],
             ]
         ]);
-        $response = $this->getMockBuilder('Cake\Http\Response')->getMock();
+        $response = $this->getMockBuilder('Cake\Http\Response')
+            ->setMethods(['send'])
+            ->getMock();
         $response->expects($this->once())
             ->method('send');
 

tests/test_app/TestApp/Template/Posts/header.ctp

@@ -0,0 +1,4 @@
+<?php
+$this->response = $this->response->withHeader('X-view-template', 'yes');
+?>
+header template