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

testPrefix passing

Browse Source
This commit is contained in:
Ben Connito 2014-08-07 12:34:00 -04:00
parent 72b1a44e38
commit 29e22a0a2e
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,14 +82,15 @@ class WampConnection extends AbstractConnectionDecorator {
* @return string
*/
public function getUri($uri) {
$seperator = ':';
$curieSeperator = ':';
$fullSeperator = '#';
if(preg_match('/http(s*)\:\/\//', $uri) === false){
if(strpos($uri, $seperator) !== false){
list($prefix, $action) = explode(':', $uri);
if(preg_match('/http(s*)\:\/\//', $uri) == false){
if(strpos($uri, $curieSeperator) !== false){
list($prefix, $action) = explode($curieSeperator, $uri);
$expandedPrefix = isset($this->WAMP->prefixes[$prefix]) ? $this->WAMP->prefixes[$prefix] : $prefix;
return $expandedPrefix . '#' . $action;
return $expandedPrefix . $fullSeperator . $action;
}
}

11
tests/unit/Wamp/ServerProtocolTest.php
View File

@ -211,13 +211,14 @@ class ServerProtocolTest extends \PHPUnit_Framework_TestCase {
$conn = new WampConnection($this->newConn());
$this->_comp->onOpen($conn);
$shortIn = 'incoming';
$longIn = 'http://example.com/incoming/';
$prefix = 'incoming';
$fullURI = "http://example.com/$prefix";
$method = 'call';
$this->_comp->onMessage($conn, json_encode(array(1, $shortIn, $longIn)));
$this->_comp->onMessage($conn, json_encode(array(1, $prefix, $fullURI)));
$this->assertEquals($longIn, $conn->WAMP->prefixes[$shortIn]);
$this->assertEquals($longIn, $conn->getUri($shortIn));
$this->assertEquals($fullURI, $conn->WAMP->prefixes[$prefix]);
$this->assertEquals("$fullURI#$method", $conn->getUri("$prefix:$method"));
}
public function testMessageMustBeJson() {