Merge pull request #26 from clue-labs/port

Automatically assume default SOCKS port (1080) if not given explicitly

Author: clue

README.md

@@ -131,6 +131,12 @@ $loop = \React\EventLoop\Factory::create();
 $client = new Client('127.0.0.1:1080', $loop);
 ```
 
+You can omit the port if you're using the default SOCKS port 1080:
+
+```php
+$client = new Client('127.0.0.1', $loop);
+```
+
 If you need custom connector settings (DNS resolution, timeouts etc.), you can explicitly pass a
 custom instance of the [`ConnectorInterface`](https://github.com/reactphp/socket-client#connectorinterface):
 

src/Client.php

@@ -55,10 +55,15 @@ public function __construct($socksUri, LoopInterface $loop, ConnectorInterface $
 
         // parse URI into individual parts
         $parts = parse_url($socksUri);
-        if (!$parts || !isset($parts['scheme'], $parts['host'], $parts['port'])) {
+        if (!$parts || !isset($parts['scheme'], $parts['host'])) {
             throw new \InvalidArgumentException('Invalid SOCKS server URI "' . $socksUri . '"');
         }
 
+        // assume default port
+        if (!isset($parts['port'])) {
+            $parts['port'] = 1080;
+        }
+
         if ($resolver === null) {
             // default to using Google's public DNS server
             $dnsResolverFactory = new DnsFactory();

tests/ClientTest.php

@@ -25,12 +25,17 @@ public function testCtorAcceptsUriWithScheme()
         $client = new Client('socks://127.0.0.1:9050', $this->loop);
     }
 
+    public function testCtorAcceptsUriWithHostOnlyAssumesDefaultPort()
+    {
+        $client = new Client('127.0.0.1', $this->loop);
+    }
+
     /**
      * @expectedException InvalidArgumentException
      */
     public function testCtorThrowsForInvalidUri()
     {
-        new Client('12345', $this->loop);
+        new Client('////', $this->loop);
     }
 
     /**