fixes issue ZF-5916. added explicit null for error in response. also added explicit null for result in error.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@18638 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Json/Server/Response.php

@@ -173,13 +173,15 @@ class Zend_Json_Server_Response
     {
         if ($this->isError()) {
             $response = array(
-                'error' => $this->getError()->toArray(),
-                'id'    => $this->getId(),
+            	'result' => null,
+                'error'  => $this->getError()->toArray(),
+                'id'     => $this->getId(),
             );
         } else {
             $response = array(
                 'result' => $this->getResult(),
                 'id'     => $this->getId(),
+            	'error'  => null,
             );
         }
 

tests/Zend/Json/Server/ResponseTest.php

@@ -146,7 +146,7 @@ class Zend_Json_Server_ResponseTest extends PHPUnit_Framework_TestCase
 
         $this->assertTrue(is_array($test));
         $this->assertTrue(array_key_exists('result', $test));
-        $this->assertFalse(array_key_exists('error', $test));
+        $this->assertTrue(array_key_exists('error', $test));
         $this->assertTrue(array_key_exists('id', $test));
         $this->assertTrue(array_key_exists('jsonrpc', $test));
 
@@ -167,7 +167,7 @@ class Zend_Json_Server_ResponseTest extends PHPUnit_Framework_TestCase
         $test = Zend_Json::decode($json);
 
         $this->assertTrue(is_array($test));
-        $this->assertFalse(array_key_exists('result', $test));
+        $this->assertTrue(array_key_exists('result', $test));
         $this->assertTrue(array_key_exists('id', $test));
         $this->assertFalse(array_key_exists('jsonrpc', $test));
 
@@ -185,7 +185,7 @@ class Zend_Json_Server_ResponseTest extends PHPUnit_Framework_TestCase
 
         $this->assertTrue(is_array($test));
         $this->assertTrue(array_key_exists('result', $test));
-        $this->assertFalse(array_key_exists('error', $test));
+        $this->assertTrue(array_key_exists('error', $test));
         $this->assertTrue(array_key_exists('id', $test));
         $this->assertFalse(array_key_exists('jsonrpc', $test));