Require URL when creating client

Author: clue

README.md

@@ -124,9 +124,6 @@ The `$amiUrl` contains the host and optional port to connect to:
 $factory->createClient('127.0.0.1:5038');
 ```
 
-> If the `$amiUrl` is `null` (or omitted) this method defaults to connecting
-  to your local host (`127.0.0.1:5038`).
-
 The above examples to not pass any authentication details, so you may have to
 call `ActionSender::login()` after connecting or use the recommended shortcut
 to pass a username and secret for your AMI login details like this:

src/Factory.php

@@ -24,19 +24,19 @@ public function __construct(LoopInterface $loop, ConnectorInterface $connector =
         $this->connector = $connector;
     }
 
-    public function createClient($address = null)
+    public function createClient($url)
     {
-        try {
-            $parts = $this->parseUrl($address);
-        } catch (\Exception $e) {
-            return Promise\reject($e);
+        $parts = parse_url((strpos($url, '://') === false ? 'tcp://' : '') . $url);
+        if (!$parts || !isset($parts['scheme'], $parts['host'])) {
+            return Promise\reject(new InvalidArgumentException('Given URL "' . $url . '" can not be parsed'));
         }
 
-        if (isset($parts['scheme']) && $parts['scheme'] !== 'tcp') {
-            $parts['host'] = 'tls://' . $parts['host'];
+        // use default port 5038
+        if (!isset($parts['port'])) {
+            $parts['port'] = 5038;
         }
 
-        $promise = $this->connector->connect($parts['host'] . ':' . $parts['port'])->then(function (ConnectionInterface $stream) {
+        $promise = $this->connector->connect($parts['scheme'] . '://' . $parts['host'] . ':' . $parts['port'])->then(function (ConnectionInterface $stream) {
             return new Client($stream);
         });
 
@@ -58,25 +58,4 @@ function ($error) use ($client) {
 
         return $promise;
     }
-
-    private function parseUrl($target)
-    {
-        if ($target === null) {
-            $target = 'tcp://127.0.0.1';
-        }
-        if (strpos($target, '://') === false) {
-            $target = 'tcp://' . $target;
-        }
-
-        $parts = parse_url($target);
-        if ($parts === false || !isset($parts['host'])) {
-            throw new InvalidArgumentException('Given URL can not be parsed');
-        }
-
-        if (!isset($parts['port'])) {
-            $parts['port'] = '5038';
-        }
-
-        return $parts;
-    }
 }

tests/FactoryTest.php

@@ -22,18 +22,10 @@ public function testDefaultCtor()
         $this->factory = new Factory($this->loop);
     }
 
-    public function testCreateClientUsesTcpConnectorWithDefaultLocation()
-    {
-        $promise = new Promise(function () { });
-        $this->tcp->expects($this->once())->method('connect')->with('127.0.0.1:5038')->willReturn($promise);
-
-        $this->factory->createClient();
-    }
-
     public function testCreateClientUsesDefaultPortForTcpConnection()
     {
         $promise = new Promise(function () { });
-        $this->tcp->expects($this->once())->method('connect')->with('localhost:5038')->willReturn($promise);
+        $this->tcp->expects($this->once())->method('connect')->with('tcp://localhost:5038')->willReturn($promise);
 
         $this->factory->createClient('localhost');
     }