From 60e3bb85dddc0970633bcd7ed2be5cb5af314bdc Mon Sep 17 00:00:00 2001
From: samizdam <samizdam@inbox.ru>
Date: Fri, 25 Nov 2016 20:59:11 +0300
Subject: [PATCH 1/2] Factory new Request Url from url, instead path only: keep
 original request host, scheme, etc.

---
 src/Ratchet/Http/Router.php    | 2 +-
 tests/unit/Http/RouterTest.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Ratchet/Http/Router.php b/src/Ratchet/Http/Router.php
index e4aa790..7839295 100644
--- a/src/Ratchet/Http/Router.php
+++ b/src/Ratchet/Http/Router.php
@@ -55,7 +55,7 @@ class Router implements HttpServerInterface {
         }
         $parameters = array_merge($parameters, $request->getQuery()->getAll());
 
-        $url = Url::factory($request->getPath());
+        $url = Url::factory($request->getUrl());
         $url->setQuery($parameters);
         $request->setUrl($url);
 
diff --git a/tests/unit/Http/RouterTest.php b/tests/unit/Http/RouterTest.php
index 5a1128e..2b07cf7 100644
--- a/tests/unit/Http/RouterTest.php
+++ b/tests/unit/Http/RouterTest.php
@@ -127,6 +127,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase {
         );
 
         $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->setHeaderFactory($this->getMock('Guzzle\Http\Message\Header\HeaderFactoryInterface'));
@@ -136,5 +137,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase {
         $router->onOpen($conn, $request);
 
         $this->assertEquals(array('foo' => 'nope', 'baz' => 'qux', 'hello' => 'world'), $request->getQuery()->getAll());
+        $this->assertEquals('ws', $request->getScheme());
+        $this->assertEquals('doesnt.matter', $request->getHost());
     }
 }

From 19a0a5b3e386e4ed00a04164b25509c624356b57 Mon Sep 17 00:00:00 2001
From: samizdam <samizdam@inbox.ru>
Date: Sat, 3 Mar 2018 00:29:11 +0300
Subject: [PATCH 2/2] Use phpunit from vendor in Makefile.

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a2526c0..8054867 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@
 # Users do not need to use `make`; Ratchet does not need to be compiled
 
 test:
-	phpunit
+	vendor/bin/phpunit
 
 cover:
-	phpunit --coverage-text --coverage-html=reports/coverage
+	vendor/bin/phpunit --coverage-text --coverage-html=reports/coverage
 
 abtests:
 	ulimit -n 2048 && php tests/autobahn/bin/fuzzingserver.php 8001 LibEvent &