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

Factory new Request Url from url, instead path only: keep original request host, scheme, etc.

Browse Source
This commit is contained in:
samizdam 2016-11-25 20:59:11 +03:00
parent b5ccecad93
commit 56c07ce4b8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ratchet/Http/Router.php
View File

@ -55,7 +55,7 @@ class Router implements HttpServerInterface {
} }
$parameters = array_merge($parameters, $request->getQuery()->getAll()); $parameters = array_merge($parameters, $request->getQuery()->getAll());
$url = Url::factory($request->getPath()); $url = Url::factory($request->getUrl());
$url->setQuery($parameters); $url->setQuery($parameters);
$request->setUrl($url); $request->setUrl($url);

3
tests/unit/Http/RouterTest.php
View File

@ -127,6 +127,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase {
); );
$conn = $this->getMock('Ratchet\Mock\Connection'); $conn = $this->getMock('Ratchet\Mock\Connection');
/**@var $request \Guzzle\Http\Message\Request */
$request = $this->getMock('Guzzle\Http\Message\Request', array('getPath'), array('GET', ''), '', false); $request = $this->getMock('Guzzle\Http\Message\Request', array('getPath'), array('GET', ''), '', false);
$request->setHeaderFactory($this->getMock('Guzzle\Http\Message\Header\HeaderFactoryInterface')); $request->setHeaderFactory($this->getMock('Guzzle\Http\Message\Header\HeaderFactoryInterface'));
@ -136,5 +137,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase {
$router->onOpen($conn, $request); $router->onOpen($conn, $request);
$this->assertEquals(array('foo' => 'nope', 'baz' => 'qux', 'hello' => 'world'), $request->getQuery()->getAll()); $this->assertEquals(array('foo' => 'nope', 'baz' => 'qux', 'hello' => 'world'), $request->getQuery()->getAll());
$this->assertEquals('ws', $request->getScheme());
$this->assertEquals('doesnt.matter', $request->getHost());
} }
} }