Merge pull request #87 from claudiosdc/Fix

Converts "wss" scheme into "https" scheme

Author: mbonneau

src/Connector.php

@@ -119,11 +119,7 @@ protected function generateRequest($url, array $subProtocols, array $headers) {
             throw new \InvalidArgumentException(sprintf('Cannot connect to invalid URL (%s)', $url));
         }
 
-        $uri = $uri->withScheme('HTTP');
-
-        if (!$uri->getPort()) {
-            $uri = $uri->withPort('wss' === $scheme ? 443 : 80);
-        }
+        $uri = $uri->withScheme('wss' === $scheme ? 'HTTPS' : 'HTTP');
 
         $headers += ['User-Agent' => 'Ratchet-Pawl/0.3'];
 

tests/unit/RequestUriTest.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Created by claudio on 2018-12-31
+ */
+
+use PHPUnit\Framework\TestCase;
+use React\EventLoop\Factory;
+use Ratchet\Client\Connector;
+use Psr\Http\Message\RequestInterface;
+
+class RequestUriTest extends TestCase {
+    protected static function getPrivateClassMethod($className, $methodName) {
+        $class = new ReflectionClass($className);
+        $method = $class->getMethod($methodName);
+        $method->setAccessible(true);
+        return $method;
+    }
+
+    function uriDataProvider() {
+        return [
+            ['ws://127.0.0.1/bla', 'http://127.0.0.1/bla'],
+            ['wss://127.0.0.1/bla', 'https://127.0.0.1/bla'],
+            ['ws://127.0.0.1:1234/bla', 'http://127.0.0.1:1234/bla'],
+            ['wss://127.0.0.1:4321/bla', 'https://127.0.0.1:4321/bla']
+        ];
+    }
+
+    /**
+     * @dataProvider uriDataProvider
+     */
+    function testGeneratedRequestUri($uri, $expectedRequestUri) {
+        $loop = Factory::create();
+
+        $connector = new Connector($loop);
+
+        $generateRequest = self::getPrivateClassMethod('\Ratchet\Client\Connector', 'generateRequest');
+        $request = $generateRequest->invokeArgs($connector, [$uri, [], []]);
+
+        $this->assertEquals((string)$request->getUri(), $expectedRequestUri);
+    }
+}