Update Zend\View to latest Zend\Http changes

Jurian Sluiman · Jurian Sluiman · commit de83270692c8 · 2012-06-30T18:07:00.000+02:00
diff --git a/src/Helper/Json.php b/src/Helper/Json.php
@@ -41,8 +41,8 @@ class Json extends AbstractHelper
 
     /**
      * Set the response object
-     * 
-     * @param  Response $response 
+     *
+     * @param  Response $response
      * @return Json
      */
     public function setResponse(Response $response)
@@ -63,7 +63,7 @@ public function __invoke($data, array $jsonOptions = array())
         $data = JsonFormatter::encode($data, null, $jsonOptions);
 
         if ($this->response instanceof Response) {
-            $headers = $this->response->headers();
+            $headers = $this->response->getHeaders();
             $headers->addHeaderLine('Content-Type', 'application/json');
         }
 
diff --git a/src/Strategy/FeedStrategy.php b/src/Strategy/FeedStrategy.php
@@ -110,7 +110,7 @@ public function selectRenderer(ViewEvent $e)
             return;
         }
 
-        $headers = $request->headers();
+        $headers = $request->getHeaders();
         if ($headers->has('accept')) {
             $accept  = $headers->get('accept');
             foreach ($accept->getPrioritized() as $mediaType) {
@@ -165,7 +165,7 @@ public function injectResponse(ViewEvent $e)
         // Populate response
         $response = $e->getResponse();
         $response->setContent($result);
-        $headers = $response->headers();
+        $headers = $response->getHeaders();
         $headers->addHeaderLine('content-type', $feedType);
     }
 }
diff --git a/src/Strategy/JsonStrategy.php b/src/Strategy/JsonStrategy.php
@@ -109,7 +109,7 @@ public function selectRenderer(ViewEvent $e)
             return;
         }
 
-        $headers = $request->headers();
+        $headers = $request->getHeaders();
         if ($headers->has('accept')) {
             $accept  = $headers->get('Accept');
             foreach ($accept->getPrioritized() as $mediaType) {
@@ -119,7 +119,7 @@ public function selectRenderer(ViewEvent $e)
                 }
                 if (0 === strpos($mediaType, 'application/javascript')) {
                     // application/javascript Accept header found
-                    if (false != ($callback = $request->query()->get('callback'))) {
+                    if (false != ($callback = $request->getQuery()->get('callback'))) {
                         $this->renderer->setJsonpCallback($callback);
                     }
                     return $this->renderer;
@@ -154,7 +154,7 @@ public function injectResponse(ViewEvent $e)
         // Populate response
         $response = $e->getResponse();
         $response->setContent($result);
-        $headers = $response->headers();
+        $headers = $response->getHeaders();
         if ($this->renderer->hasJsonpCallback()) {
             $headers->addHeaderLine('content-type', 'application/javascript');
         } else {
diff --git a/test/Helper/JsonTest.php b/test/Helper/JsonTest.php
@@ -55,7 +55,7 @@ public function setUp()
 
     public function verifyJsonHeader()
     {
-        $headers = $this->response->headers();
+        $headers = $this->response->getHeaders();
         $this->assertTrue($headers->has('Content-Type'));
         $header = $headers->get('Content-Type');
         $this->assertEquals('application/json', $header->getFieldValue());
diff --git a/test/Strategy/FeedStrategyTest.php b/test/Strategy/FeedStrategyTest.php
@@ -60,7 +60,7 @@ public function testFeedModelSelectsFeedStrategy()
     public function testRssAcceptHeaderSelectsFeedStrategy()
     {
         $request = new HttpRequest();
-        $request->headers()->addHeaderLine('Accept', 'application/rss+xml');
+        $request->getHeaders()->addHeaderLine('Accept', 'application/rss+xml');
         $this->event->setRequest($request);
         $result = $this->strategy->selectRenderer($this->event);
         $this->assertSame($this->renderer, $result);
@@ -69,7 +69,7 @@ public function testRssAcceptHeaderSelectsFeedStrategy()
     public function testAtomAcceptHeaderSelectsFeedStrategy()
     {
         $request = new HttpRequest();
-        $request->headers()->addHeaderLine('Accept', 'application/atom+xml');
+        $request->getHeaders()->addHeaderLine('Accept', 'application/atom+xml');
         $this->event->setRequest($request);
         $result = $this->strategy->selectRenderer($this->event);
         $this->assertSame($this->renderer, $result);
@@ -85,7 +85,7 @@ public function testLackOfFeedModelOrAcceptHeaderDoesNotSelectFeedStrategy()
     protected function assertResponseNotInjected()
     {
         $content = $this->response->getContent();
-        $headers = $this->response->headers();
+        $headers = $this->response->getHeaders();
         $this->assertTrue(empty($content));
         $this->assertFalse($headers->has('content-type'));
     }
@@ -125,7 +125,7 @@ public function testMatchingRendererAndStringResultInjectsResponse()
 
         $this->strategy->injectResponse($this->event);
         $content = $this->response->getContent();
-        $headers = $this->response->headers();
+        $headers = $this->response->getHeaders();
         $this->assertEquals($expected, $content);
         $this->assertTrue($headers->has('content-type'));
         $this->assertEquals('application/atom+xml', $headers->get('content-type')->getFieldValue());
@@ -182,7 +182,7 @@ public function testMatchingRendererAndFeedResultInjectsResponse()
 
         $this->strategy->injectResponse($this->event);
         $content = $this->response->getContent();
-        $headers = $this->response->headers();
+        $headers = $this->response->getHeaders();
         $this->assertEquals($expected->export('atom'), $content);
         $this->assertTrue($headers->has('content-type'));
         $this->assertEquals('application/atom+xml', $headers->get('content-type')->getFieldValue());
@@ -198,7 +198,7 @@ public function testResponseContentTypeIsBasedOnFeedType()
 
         $this->strategy->injectResponse($this->event);
         $content = $this->response->getContent();
-        $headers = $this->response->headers();
+        $headers = $this->response->getHeaders();
         $this->assertEquals($expected->export('rss'), $content);
         $this->assertTrue($headers->has('content-type'));
         $this->assertEquals('application/rss+xml', $headers->get('content-type')->getFieldValue());
diff --git a/test/Strategy/JsonStrategyTest.php b/test/Strategy/JsonStrategyTest.php
@@ -60,7 +60,7 @@ public function testJsonModelSelectsJsonStrategy()
     public function testJsonAcceptHeaderSelectsJsonStrategy()
     {
         $request = new HttpRequest();
-        $request->headers()->addHeaderLine('Accept', 'application/json');
+        $request->getHeaders()->addHeaderLine('Accept', 'application/json');
         $this->event->setRequest($request);
         $result = $this->strategy->selectRenderer($this->event);
         $this->assertSame($this->renderer, $result);
@@ -69,7 +69,7 @@ public function testJsonAcceptHeaderSelectsJsonStrategy()
     public function testJavascriptAcceptHeaderSelectsJsonStrategy()
     {
         $request = new HttpRequest();
-        $request->headers()->addHeaderLine('Accept', 'application/javascript');
+        $request->getHeaders()->addHeaderLine('Accept', 'application/javascript');
         $this->event->setRequest($request);
         $result = $this->strategy->selectRenderer($this->event);
         $this->assertSame($this->renderer, $result);
@@ -79,7 +79,7 @@ public function testJavascriptAcceptHeaderSelectsJsonStrategy()
     public function testJavascriptAcceptHeaderSelectsJsonStrategyAndSetsJsonpCallback()
     {
         $request = new HttpRequest();
-        $request->headers()->addHeaderLine('Accept', 'application/javascript');
+        $request->getHeaders()->addHeaderLine('Accept', 'application/javascript');
         $request->setQuery(new Parameters(array('callback' => 'foo')));
         $this->event->setRequest($request);
         $result = $this->strategy->selectRenderer($this->event);
@@ -97,7 +97,7 @@ public function testLackOfJsonModelOrAcceptHeaderDoesNotSelectJsonStrategy()
     protected function assertResponseNotInjected()
     {
         $content = $this->response->getContent();
-        $headers = $this->response->headers();
+        $headers = $this->response->getHeaders();
         $this->assertTrue(empty($content));
         $this->assertFalse($headers->has('content-type'));
     }
@@ -136,7 +136,7 @@ public function testMatchingRendererAndStringResultInjectsResponse()
 
         $this->strategy->injectResponse($this->event);
         $content = $this->response->getContent();
-        $headers = $this->response->headers();
+        $headers = $this->response->getHeaders();
         $this->assertEquals($expected, $content);
         $this->assertTrue($headers->has('content-type'));
         $this->assertEquals('application/json', $headers->get('content-type')->getFieldValue());
@@ -152,7 +152,7 @@ public function testMatchingRendererAndStringResultInjectsResponseJsonp()
 
         $this->strategy->injectResponse($this->event);
         $content = $this->response->getContent();
-        $headers = $this->response->headers();
+        $headers = $this->response->getHeaders();
         $this->assertEquals($expected, $content);
         $this->assertTrue($headers->has('content-type'));
         $this->assertEquals('application/javascript', $headers->get('content-type')->getFieldValue());
diff --git a/test/Strategy/PhpRendererStrategyTest.php b/test/Strategy/PhpRendererStrategyTest.php
@@ -60,7 +60,7 @@ public function testSelectRendererAlwaysSelectsPhpRenderer()
     protected function assertResponseNotInjected()
     {
         $content = $this->response->getContent();
-        $headers = $this->response->headers();
+        $headers = $this->response->getHeaders();
         $this->assertTrue(empty($content));
         $this->assertFalse($headers->has('content-type'));
     }
@@ -79,7 +79,7 @@ public function testNonMatchingRendererDoesNotInjectResponse()
         $this->strategy->injectResponse($this->event);
         $this->assertResponseNotInjected();
     }
-    
+
     public function testResponseContentSetToContentPlaceholderWhenResultAndArticlePlaceholderAreEmpty()
     {
         $this->renderer->placeholder('content')->set('Content');
@@ -152,7 +152,7 @@ public function testAttachesListenersAtExpectedPriorities()
             $this->assertTrue($found, 'Listener not found');
         }
     }
-    
+
     public function testCanAttachListenersAtSpecifiedPriority()
     {
         $events = new EventManager();

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public function selectRenderer(ViewEvent $e)`
`110`	`110`	`return;`
`111`	`111`	`}`
`112`	`112`
`113`		`- $headers = $request->headers();`
	`113`	`+ $headers = $request->getHeaders();`
`114`	`114`	`if ($headers->has('accept')) {`
`115`	`115`	`$accept = $headers->get('accept');`
`116`	`116`	`foreach ($accept->getPrioritized() as $mediaType) {`
`@@ -165,7 +165,7 @@ public function injectResponse(ViewEvent $e)`
`165`	`165`	`// Populate response`
`166`	`166`	`$response = $e->getResponse();`
`167`	`167`	`$response->setContent($result);`
`168`		`- $headers = $response->headers();`
	`168`	`+ $headers = $response->getHeaders();`
`169`	`169`	`$headers->addHeaderLine('content-type', $feedType);`
`170`	`170`	`}`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function setUp()`
`55`	`55`
`56`	`56`	`public function verifyJsonHeader()`
`57`	`57`	`{`
`58`		`- $headers = $this->response->headers();`
	`58`	`+ $headers = $this->response->getHeaders();`
`59`	`59`	`$this->assertTrue($headers->has('Content-Type'));`
`60`	`60`	`$header = $headers->get('Content-Type');`
`61`	`61`	`$this->assertEquals('application/json', $header->getFieldValue());`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function testSelectRendererAlwaysSelectsPhpRenderer()`
`60`	`60`	`protected function assertResponseNotInjected()`
`61`	`61`	`{`
`62`	`62`	`$content = $this->response->getContent();`
`63`		`- $headers = $this->response->headers();`
	`63`	`+ $headers = $this->response->getHeaders();`
`64`	`64`	`$this->assertTrue(empty($content));`
`65`	`65`	`$this->assertFalse($headers->has('content-type'));`
`66`	`66`	`}`
`@@ -79,7 +79,7 @@ public function testNonMatchingRendererDoesNotInjectResponse()`
`79`	`79`	`$this->strategy->injectResponse($this->event);`
`80`	`80`	`$this->assertResponseNotInjected();`
`81`	`81`	`}`
`82`		`-`
	`82`	`+`
`83`	`83`	`public function testResponseContentSetToContentPlaceholderWhenResultAndArticlePlaceholderAreEmpty()`
`84`	`84`	`{`
`85`	`85`	`$this->renderer->placeholder('content')->set('Content');`
`@@ -152,7 +152,7 @@ public function testAttachesListenersAtExpectedPriorities()`
`152`	`152`	`$this->assertTrue($found, 'Listener not found');`
`153`	`153`	`}`
`154`	`154`	`}`
`155`		`-`
	`155`	`+`
`156`	`156`	`public function testCanAttachListenersAtSpecifiedPriority()`
`157`	`157`	`{`
`158`	`158`	`$events = new EventManager();`