Make sure only the host and scheme are used when using HTTP Requests

phpro · Feb 4, 2015 · 6f3838b · 6f3838b
1 parent 51c912e
commit 6f3838b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -19,4 +19,4 @@
             </exclude>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>
diff --git a/src/Phpro/EncodingCom/Factory/RouteAssemblerFactory.php b/src/Phpro/EncodingCom/Factory/RouteAssemblerFactory.php
@@ -36,13 +36,18 @@ public function createService(ServiceLocatorInterface $serviceLocator)
      */
     protected function parseUri($serviceLocator, $localTunnelConfig)
     {
+        $endpoint = null;
         $request = $serviceLocator->get('Request');
-        $uri = ($request instanceof HttpRequest) ? $request->getUri() : new HttpUri();
+
+        if ($request instanceof HttpRequest) {
+            $uri = $request->getUri();
+            $endpoint = $uri->getScheme().'://'.$uri->getHost();
+        }
 
         if ($localTunnelConfig->isEnabled()) {
-            $uri = new HttpUri('http://'.$localTunnelConfig->getHost());
+            $endpoint = 'http://'.$localTunnelConfig->getHost();
         }
 
-        return $uri;
+        return new HttpUri($endpoint);
     }
 }