faeez/mxmbsocket
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Repo. Project Releases Wiki Activity

[WAMP] callError bugfix

Browse Source 
callError accepts `$errorUri` as per the specification
It has previously, erroneously, been changed to $topic
Now loosely accepts a URI but can be any data structure that can be json'd

If it is given a topic, as they're to be URIs according to the spec
it will be transformed to a string
This commit is contained in:
Chris Boden 2012-07-22 15:17:34 -04:00
parent 002ae9419c
commit 226ec07b02
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Ratchet/Wamp/WampConnection.php
View File

@ -29,24 +29,28 @@ class WampConnection extends AbstractConnectionDecorator {
* @param array An array of data to return to the client * @param array An array of data to return to the client
*/ */
public function callResult($id, array $data = array()) { public function callResult($id, array $data = array()) {
$this->send(json_encode(array(WAMP::MSG_CALL_RESULT, $id, $data))); return $this->send(json_encode(array(WAMP::MSG_CALL_RESULT, $id, $data)));
} }
/** /**
* Respond with an error to a client call * Respond with an error to a client call
* @param string The unique ID given by the client to respond to * @param string The unique ID given by the client to respond to
* @param string The URI given by the client ot respond to * @param string The URI given to identify the specific error
* @param string A developer-oriented description of the error * @param string A developer-oriented description of the error
* @param string|null An optional human readable detail message to send back * @param string|null An optional human readable detail message to send back
*/ */
public function callError($id, $topic, $desc = '', $details = null) { public function callError($id, $errorUri, $desc = '', $details = null) {
$data = array(WAMP::MSG_CALL_ERROR, $id, (string)$topic, $desc); if ($errorUri instanceof Topic) {
$errorUri = (string)$errorUri;
}
$data = array(WAMP::MSG_CALL_ERROR, $id, $errorUri, $desc);
if (null !== $details) { if (null !== $details) {
$data[] = $details; $data[] = $details;
} }
$this->send(json_encode($data)); return $this->send(json_encode($data));
} }
/** /**
@ -54,7 +58,7 @@ class WampConnection extends AbstractConnectionDecorator {
* @param mixed Data to send with the event. Anything that is json'able * @param mixed Data to send with the event. Anything that is json'able
*/ */
public function event($topic, $msg) { public function event($topic, $msg) {
$this->send(json_encode(array(WAMP::MSG_EVENT, (string)$topic, $msg))); return $this->send(json_encode(array(WAMP::MSG_EVENT, (string)$topic, $msg)));
} }
/** /**
@ -63,7 +67,8 @@ class WampConnection extends AbstractConnectionDecorator {
*/ */
public function prefix($curie, $uri) { public function prefix($curie, $uri) {
$this->WAMP->prefixes[$curie] = (string)$uri; $this->WAMP->prefixes[$curie] = (string)$uri;
$this->send(json_encode(array(WAMP::MSG_PREFIX, $curie, (string)$uri)));
return $this->send(json_encode(array(WAMP::MSG_PREFIX, $curie, (string)$uri)));
} }
/** /**
@ -80,6 +85,8 @@ class WampConnection extends AbstractConnectionDecorator {
*/ */
public function send($data) { public function send($data) {
$this->getConnection()->send($data); $this->getConnection()->send($data);
return $this;
} }
/** /**