equal
deleted
inserted
replaced
13 * to license@zend.com so we can send you a copy immediately. |
13 * to license@zend.com so we can send you a copy immediately. |
14 * |
14 * |
15 * @category Zend |
15 * @category Zend |
16 * @package Zend_Json |
16 * @package Zend_Json |
17 * @subpackage Server |
17 * @subpackage Server |
18 * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) |
18 * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) |
19 * @license http://framework.zend.com/license/new-bsd New BSD License |
19 * @license http://framework.zend.com/license/new-bsd New BSD License |
20 * @version $Id: Response.php 20096 2010-01-06 02:05:09Z bkarwin $ |
20 * @version $Id: Response.php 24807 2012-05-15 12:10:42Z adamlundrigan $ |
21 */ |
21 */ |
22 |
22 |
23 /** |
23 /** |
24 * @category Zend |
24 * @category Zend |
25 * @package Zend_Json |
25 * @package Zend_Json |
26 * @subpackage Server |
26 * @subpackage Server |
27 * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com) |
27 * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com) |
28 * @license http://framework.zend.com/license/new-bsd New BSD License |
28 * @license http://framework.zend.com/license/new-bsd New BSD License |
29 */ |
29 */ |
30 class Zend_Json_Server_Response |
30 class Zend_Json_Server_Response |
31 { |
31 { |
32 /** |
32 /** |
142 * @param string $version |
142 * @param string $version |
143 * @return Zend_Json_Server_Response |
143 * @return Zend_Json_Server_Response |
144 */ |
144 */ |
145 public function setVersion($version) |
145 public function setVersion($version) |
146 { |
146 { |
147 $version = (string) $version; |
147 $version = is_array($version) |
148 if ('2.0' == $version) { |
148 ? implode(' ', $version) |
|
149 : $version; |
|
150 if ((string)$version == '2.0') { |
149 $this->_version = '2.0'; |
151 $this->_version = '2.0'; |
150 } else { |
152 } else { |
151 $this->_version = null; |
153 $this->_version = null; |
152 } |
154 } |
153 |
|
154 return $this; |
155 return $this; |
155 } |
156 } |
156 |
157 |
157 /** |
158 /** |
158 * Retrieve JSON-RPC version |
159 * Retrieve JSON-RPC version |
171 */ |
172 */ |
172 public function toJson() |
173 public function toJson() |
173 { |
174 { |
174 if ($this->isError()) { |
175 if ($this->isError()) { |
175 $response = array( |
176 $response = array( |
176 'result' => null, |
|
177 'error' => $this->getError()->toArray(), |
177 'error' => $this->getError()->toArray(), |
178 'id' => $this->getId(), |
178 'id' => $this->getId(), |
179 ); |
179 ); |
180 } else { |
180 } else { |
181 $response = array( |
181 $response = array( |
182 'result' => $this->getResult(), |
182 'result' => $this->getResult(), |
183 'id' => $this->getId(), |
183 'id' => $this->getId(), |
184 'error' => null, |
|
185 ); |
184 ); |
186 } |
185 } |
187 |
186 |
188 if (null !== ($version = $this->getVersion())) { |
187 if (null !== ($version = $this->getVersion())) { |
189 $response['jsonrpc'] = $version; |
188 $response['jsonrpc'] = $version; |