Merge pull request #12 from clue-labs/lists

clue · clue · commit e13bf3de9898 · 2016-06-01T13:54:57.000+02:00
Move all connector lists to the constructor
diff --git a/README.md b/README.md
@@ -97,16 +97,37 @@ simplify exchanging the actual `ConnectionManager` during runtime (`->setConnect
 The `ConnectionManagerConsecutive($connectors)` establishs connections by trying to connect through
 any of the given `ConnectionManager`s in consecutive order until the first one succeeds.
 
+```php
+$consecutive = new ConnectionManagerConsecutive(array(
+    $connector1,
+    $connector2
+));
+```
+
 ### Random
 
 The `ConnectionManagerRandom($connectors)` works much like `ConnectionManagerConsecutive` but instead
 of using a fixed order, it always uses a randomly shuffled order.
 
+```php
+$random = new ConnectionManagerRandom(array(
+    $connector1,
+    $connector2
+));
+```
+
 ### Concurrent
 
 The `ConnectionManagerConcurrent($connectors)` establishes connections by trying to connect through
 ALL of the given `ConnectionManager`s at once, until the first one succeeds.
 
+```php
+$concurrent = new ConnectionManagerConcurrent(array(
+    $connector1,
+    $connector2
+));
+```
+
 ### Selective
 
 The `ConnectionManagerSelective($connectors)` manages a list of `Connector`s and
diff --git a/src/Multiple/ConnectionManagerConcurrent.php b/src/Multiple/ConnectionManagerConcurrent.php
@@ -10,10 +10,6 @@ class ConnectionManagerConcurrent extends ConnectionManagerConsecutive
 {
     public function create($host, $port)
     {
-        if (!$this->managers) {
-            return Promise\reject(new \UnderflowException('No managers to try to connect through'));
-        }
-
         $all = array();
         foreach ($this->managers as $connector) {
             /* @var $connection Connector */
diff --git a/src/Multiple/ConnectionManagerConsecutive.php b/src/Multiple/ConnectionManagerConsecutive.php
@@ -9,11 +9,18 @@
 
 class ConnectionManagerConsecutive implements ConnectorInterface
 {
-    protected $managers = array();
+    protected $managers;
 
-    public function addConnectionManager(ConnectorInterface $connectionManager)
+    /**
+     *
+     * @param ConnectorInterface[] $managers
+     */
+    public function __construct(array $managers)
     {
-        $this->managers []= $connectionManager;
+        if (!$managers) {
+            throw new \InvalidArgumentException('List of connectors must not be empty');
+        }
+        $this->managers = $managers;
     }
 
     public function create($host, $port)
diff --git a/tests/Multiple/ConnectionManagerConcurrentTest.php b/tests/Multiple/ConnectionManagerConcurrentTest.php
@@ -5,13 +5,12 @@
 
 class ConnectionManagerConcurrentTest extends TestCase
 {
-    public function testEmptyRejects()
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testEmptyListsThrows()
     {
-        $connector = new ConnectionManagerConcurrent();
-
-        $promise = $connector->create('google.com', 80);
-
-        $this->assertPromiseReject($promise);
+        new ConnectionManagerConcurrent(array());
     }
 
     public function testWillForwardToInnerConnector()
@@ -21,8 +20,7 @@ public function testWillForwardToInnerConnector()
         $only = $this->getMock('React\SocketClient\ConnectorInterface');
         $only->expects($this->once())->method('create')->with('google.com', 80)->willReturn($pending);
 
-        $connector = new ConnectionManagerConcurrent();
-        $connector->addConnectionManager($only);
+        $connector = new ConnectionManagerConcurrent(array($only));
 
         $promise = $connector->create('google.com', 80);
 
@@ -39,9 +37,7 @@ public function testWillCancelOtherIfOneResolves()
         $second = $this->getMock('React\SocketClient\ConnectorInterface');
         $second->expects($this->once())->method('create')->with('google.com', 80)->willReturn($pending);
 
-        $connector = new ConnectionManagerConcurrent();
-        $connector->addConnectionManager($first);
-        $connector->addConnectionManager($second);
+        $connector = new ConnectionManagerConcurrent(array($first, $second));
 
         $promise = $connector->create('google.com', 80);
 
@@ -59,9 +55,7 @@ public function testWillCloseOtherIfOneResolves()
         $second = $this->getMock('React\SocketClient\ConnectorInterface');
         $second->expects($this->once())->method('create')->with('google.com', 80)->willReturn(Promise\resolve($slower));
 
-        $connector = new ConnectionManagerConcurrent();
-        $connector->addConnectionManager($first);
-        $connector->addConnectionManager($second);
+        $connector = new ConnectionManagerConcurrent(array($first, $second));
 
         $promise = $connector->create('google.com', 80);
 
diff --git a/tests/Multiple/ConnectionManagerConsecutiveTest.php b/tests/Multiple/ConnectionManagerConsecutiveTest.php
@@ -6,23 +6,19 @@
 
 class ConnectionManagerConsecutiveTest extends TestCase
 {
-    public function testEmpty()
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testEmptyListThrows()
     {
-        $cm = new ConnectionManagerConsecutive();
-
-        $promise = $cm->create('www.google.com', 80);
-
-        $this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
-
-        $promise->then($this->expectCallableNever(), $this->expectCallableOnce());
+        new ConnectionManagerConsecutive(array());
     }
 
     public function testReject()
     {
         $wont = new ConnectionManagerReject();
 
-        $cm = new ConnectionManagerConsecutive();
-        $cm->addConnectionManager($wont);
+        $cm = new ConnectionManagerConsecutive(array($wont));
 
         $promise = $cm->create('www.google.com', 80);
 
@@ -38,9 +34,7 @@ public function testWillTryAllIfEachRejects()
         $connector = $this->getMock('React\SocketClient\ConnectorInterface');
         $connector->expects($this->exactly(2))->method('create')->with('google.com', 80)->willReturn($rejected);
 
-        $cm = new ConnectionManagerConsecutive();
-        $cm->addConnectionManager($connector);
-        $cm->addConnectionManager($connector);
+        $cm = new ConnectionManagerConsecutive(array($connector, $connector));
 
         $promise = $cm->create('google.com', 80);
 
@@ -54,9 +48,7 @@ public function testCancellationWillNotStartAnyFurtherConnections()
         $connector = $this->getMock('React\SocketClient\ConnectorInterface');
         $connector->expects($this->once())->method('create')->with('google.com', 80)->willReturn($pending);
 
-        $cm = new ConnectionManagerConsecutive();
-        $cm->addConnectionManager($connector);
-        $cm->addConnectionManager($connector);
+        $cm = new ConnectionManagerConsecutive(array($connector, $connector));
 
         $promise = $cm->create('google.com', 80);
         $promise->cancel();
diff --git a/tests/Multiple/ConnectionManagerRandomTest.php b/tests/Multiple/ConnectionManagerRandomTest.php
@@ -6,23 +6,19 @@
 
 class ConnectionManagerRandomTest extends TestCase
 {
-    public function testEmpty()
+    /**
+     * @expectedException InvalidArgumentException
+     */
+    public function testEmptyListThrows()
     {
-        $cm = new ConnectionManagerRandom();
-
-        $promise = $cm->create('www.google.com', 80);
-
-        $this->assertInstanceOf('React\Promise\PromiseInterface', $promise);
-
-        $promise->then($this->expectCallableNever(), $this->expectCallableOnce());
+        new ConnectionManagerRandom(array());
     }
 
     public function testReject()
     {
         $wont = new ConnectionManagerReject();
 
-        $cm = new ConnectionManagerRandom();
-        $cm->addConnectionManager($wont);
+        $cm = new ConnectionManagerRandom(array($wont));
 
         $promise = $cm->create('www.google.com', 80);
 
@@ -38,9 +34,7 @@ public function testWillTryAllIfEachRejects()
         $connector = $this->getMock('React\SocketClient\ConnectorInterface');
         $connector->expects($this->exactly(2))->method('create')->with('google.com', 80)->willReturn($rejected);
 
-        $cm = new ConnectionManagerRandom();
-        $cm->addConnectionManager($connector);
-        $cm->addConnectionManager($connector);
+        $cm = new ConnectionManagerRandom(array($connector, $connector));
 
         $promise = $cm->create('google.com', 80);
 
@@ -54,9 +48,7 @@ public function testCancellationWillNotStartAnyFurtherConnections()
         $connector = $this->getMock('React\SocketClient\ConnectorInterface');
         $connector->expects($this->once())->method('create')->with('google.com', 80)->willReturn($pending);
 
-        $cm = new ConnectionManagerRandom();
-        $cm->addConnectionManager($connector);
-        $cm->addConnectionManager($connector);
+        $cm = new ConnectionManagerRandom(array($connector, $connector));
 
         $promise = $cm->create('google.com', 80);
         $promise->cancel();

Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,6 @@ class ConnectionManagerConcurrent extends ConnectionManagerConsecutive`
`10`	`10`	`{`
`11`	`11`	`public function create($host, $port)`
`12`	`12`	`{`
`13`		`- if (!$this->managers) {`
`14`		`- return Promise\reject(new \UnderflowException('No managers to try to connect through'));`
`15`		`- }`
`16`		`-`
`17`	`13`	`$all = array();`
`18`	`14`	`foreach ($this->managers as $connector) {`
`19`	`15`	`/* @var $connection Connector */`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,18 @@`
`9`	`9`
`10`	`10`	`class ConnectionManagerConsecutive implements ConnectorInterface`
`11`	`11`	`{`
`12`		`- protected $managers = array();`
	`12`	`+ protected $managers;`
`13`	`13`
`14`		`- public function addConnectionManager(ConnectorInterface $connectionManager)`
	`14`	`+ /**`
	`15`	`+ *`
	`16`	`+ * @param ConnectorInterface[] $managers`
	`17`	`+ */`
	`18`	`+ public function __construct(array $managers)`
`15`	`19`	`{`
`16`		`- $this->managers []= $connectionManager;`
	`20`	`+ if (!$managers) {`
	`21`	`+ throw new \InvalidArgumentException('List of connectors must not be empty');`
	`22`	`+ }`
	`23`	`+ $this->managers = $managers;`
`17`	`24`	`}`
`18`	`25`
`19`	`26`	`public function create($host, $port)`