From 4255dcdf6b0d4142621ec89c737d9a80fb4eaf27 Mon Sep 17 00:00:00 2001
From: Pkarc <pkarc@2stripes.org>
Date: Mon, 19 Nov 2012 01:48:59 -0500
Subject: [PATCH 1/3] Update tests/ZendTest/Json/Server/ResponseTest.php

---
 test/Server/ResponseTest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/Server/ResponseTest.php b/test/Server/ResponseTest.php
index 865d8619a..646a75bd4 100644
--- a/test/Server/ResponseTest.php
+++ b/test/Server/ResponseTest.php
@@ -66,7 +66,14 @@ public function testShouldBeAbleToRetrieveErrorObject()
         $this->response->setError($error);
         $this->assertSame($error, $this->response->getError());
     }
-
+    
+    public function testErrorAccesorsShouldWorkWithNullInput()
+    {
+        $this->response->setError(null);
+        $this->assertNull($this->response->getError());
+        $this->assertFalse($this->response->isError());
+    }
+    
     public function testIdShouldBeNullByDefault()
     {
         $this->assertNull($this->response->getId());

From 10108490e5eedafb62fdf9214cd26a0dbdfd73a2 Mon Sep 17 00:00:00 2001
From: Pkarc <pkarc@2stripes.org>
Date: Mon, 19 Nov 2012 08:50:26 -0500
Subject: [PATCH 2/3] Update library/Zend/Json/Server/Response.php

---
 src/Server/Response.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Server/Response.php b/src/Server/Response.php
index 332d8a994..3c30b6be4 100644
--- a/src/Server/Response.php
+++ b/src/Server/Response.php
@@ -121,7 +121,7 @@ public function getResult()
      * @param  mixed $error
      * @return Response
      */
-    public function setError($error)
+    public function setError(Error $error = null)
     {
         $this->error = $error;
         return $this;

From 96263421c05568d61b712f4c08b6977fa893ae3c Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Mon, 19 Nov 2012 15:32:30 -0600
Subject: [PATCH 3/3] [zendframework/zf2#3011] CS fixes

- trailing whitespace
---
 test/Server/ResponseTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Server/ResponseTest.php b/test/Server/ResponseTest.php
index 646a75bd4..2cca7b5d2 100644
--- a/test/Server/ResponseTest.php
+++ b/test/Server/ResponseTest.php
@@ -66,14 +66,14 @@ public function testShouldBeAbleToRetrieveErrorObject()
         $this->response->setError($error);
         $this->assertSame($error, $this->response->getError());
     }
-    
+
     public function testErrorAccesorsShouldWorkWithNullInput()
     {
         $this->response->setError(null);
         $this->assertNull($this->response->getError());
         $this->assertFalse($this->response->isError());
     }
-    
+
     public function testIdShouldBeNullByDefault()
     {
         $this->assertNull($this->response->getId());