Merge pull request FriendsOfSymfony#298 from borisguery/headers-in-view

Fix headers in View (FriendsOfSymfony#292)
mwoerlein · Sep 23, 2012 · aa6ffae · aa6ffae
2 parents 20546ea + 29a47ea
commit aa6ffae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/Tests/View/ViewTest.php b/Tests/View/ViewTest.php
@@ -120,6 +120,14 @@ public function testSetHeaders()
         $this->assertEquals($expected, $view->getHeaders());
     }
 
+    public function testHeadersInConstructorAreAssignedToResponseObject()
+    {
+        $headers = array('foo' => 'bar');
+        $expected = array('foo' => array('bar'), 'cache-control' => array('no-cache'));
+        $view = new View(null, null, $headers);
+        $this->assertEquals($expected, $view->getHeaders());
+    }
+
     public function testSetStatusCode()
     {
         $view = new View();

diff --git a/View/View.php b/View/View.php
@@ -32,11 +32,6 @@ class View
      */
     private $statusCode;
 
-    /**
-     * @var array
-     */
-    private $headers;
-
     /**
      * @var string|TemplateReference
      */
@@ -112,8 +107,8 @@ public function __construct($data = null, $statusCode = null, array $headers = a
     {
         $this->data = $data;
         $this->statusCode = $statusCode;
-        $this->headers = $headers;
         $this->templateVar = 'data';
+        $this->getResponse()->headers->replace($headers);
     }
 
     /**
@@ -298,7 +293,7 @@ public function setRoute($route)
     /**
      * set the response
      *
-     * @param Response $response
+     * @param  Response $response
      * @return View
      */
     public function setResponse(Response $response)
@@ -335,7 +330,7 @@ public function getStatusCode()
      */
     public function getHeaders()
     {
-        return $this->response->headers->all();
+        return $this->getResponse()->headers->all();
     }
 
     /**