Merge pull request #19 from clue-labs/invalid-uri

Reject promise for invalid URI passed to ConnectionManagerSelective

Author: clue

src/Multiple/ConnectionManagerSelective.php

@@ -65,19 +65,20 @@ public function __construct(array $managers)
 
     public function connect($uri)
     {
-        try {
-            $parts = parse_url('tcp://' . $uri);
-            if (!isset($parts) || !isset($parts['scheme'], $parts['host'], $parts['port'])) {
-                throw new InvalidArgumentException('Invalid URI');
-            }
+        $parts = parse_url('tcp://' . $uri);
+        if (!isset($parts) || !isset($parts['scheme'], $parts['host'], $parts['port'])) {
+            return Promise\reject(new InvalidArgumentException('Invalid URI'));
+        }
 
-            $connector = $this->getConnectorForTarget(
-                trim($parts['host'], '[]'),
-                $parts['port']
-            );
-        } catch (UnderflowException $e) {
-            return Promise\reject($e);
+        $connector = $this->getConnectorForTarget(
+            trim($parts['host'], '[]'),
+            $parts['port']
+        );
+
+        if ($connector === null) {
+            return Promise\reject(new UnderflowException('No connector for given target found'));
         }
+
         return $connector->connect($uri);
     }
 
@@ -105,6 +106,6 @@ private function getConnectorForTarget($targetHost, $targetPort)
             }
         }
 
-        throw new UnderflowException('No connector for given target found');
+        return null;
     }
 }

tests/Multiple/ConnectionManagerSelectiveTest.php

@@ -13,6 +13,14 @@ public function testEmptyWillAlwaysReject()
         $this->assertPromiseReject($promise);
     }
 
+    public function testInvalidUriWillAlwaysReject()
+    {
+        $cm = new ConnectionManagerSelective(array());
+
+        $promise = $cm->connect('////');
+        $this->assertPromiseReject($promise);
+    }
+
     /**
      * @expectedException InvalidArgumentException
      */