Support React v0.4 (while preserving BC)

Fixes #4

Author: clue

composer.json

@@ -15,8 +15,8 @@
     },
     "require": {
         "php": ">=5.3",
-        "react/socket-client": "0.3.*",
-        "react/event-loop": "0.3.*",
-        "react/promise": "~1.0"
+        "react/socket-client": "0.3.*|0.4.*",
+        "react/event-loop": "0.3.*|0.4.*",
+        "react/promise": "~1.0|~2.0"
     }
 }

src/ConnectionManagerReject.php

@@ -3,14 +3,16 @@
 namespace ConnectionManager\Extra;
 
 use React\SocketClient\ConnectorInterface;
-use React\Promise\When;
+use React\Promise\Deferred;
 use \Exception;
 
 // a simple connection manager that rejects every single connection attempt
 class ConnectionManagerReject implements ConnectorInterface
 {
     public function create($host, $port)
     {
-        return When::reject(new Exception('Connection rejected'));
+        $deferred = new Deferred();
+        $deferred->reject(new Exception('Connection rejected'));
+        return $deferred->promise();
     }
 }

src/Multiple/ConnectionManagerConsecutive.php

@@ -3,25 +3,25 @@
 namespace ConnectionManager\Extra\Multiple;
 
 use React\SocketClient\ConnectorInterface;
-use React\Promise\When;
+use React\Promise\Deferred;
 use \UnderflowException;
 
 class ConnectionManagerConsecutive implements ConnectorInterface
 {
     protected $managers = array();
-    
+
     public function addConnectionManager(ConnectorInterface $connectionManager)
     {
         $this->managers []= $connectionManager;
     }
-    
+
     public function create($host, $port)
     {
-        return $this->tryConnection($this->managers, $host, $port);   
+        return $this->tryConnection($this->managers, $host, $port);
     }
-    
+
     /**
-     * 
+     *
      * @param ConnectorInterface[] $managers
      * @param string $host
      * @param int $port
@@ -31,7 +31,9 @@ public function create($host, $port)
     public function tryConnection(array $managers, $host, $port)
     {
         if (!$managers) {
-            return When::reject(new UnderflowException('No more managers to try to connect through'));
+            $deferred = new Deferred();
+            $deferred->reject(new UnderflowException('No more managers to try to connect through'));
+            return $deferred->promise();
         }
         $manager = array_shift($managers);
         $that = $this;

src/Multiple/ConnectionManagerSelective.php

@@ -3,7 +3,7 @@
 namespace ConnectionManager\Extra\Multiple;
 
 use React\SocketClient\ConnectorInterface;
-use React\Promise\When;
+use React\Promise\Deferred;
 use \UnderflowException;
 use \InvalidArgumentException;
 
@@ -19,7 +19,9 @@ public function create($host, $port)
             $cm = $this->getConnectionManagerFor($host, $port);
         }
         catch (UnderflowException $e) {
-            return When::reject($e);
+            $deferred = new Deferred();
+            $deferred->reject($e);
+            return $deferred->promise();
         }
         return $cm->create($host, $port);
     }

tests/bootstrap.php

@@ -1,6 +1,6 @@
 <?php
 
-use React\Promise\When;
+use React\Promise\Deferred;
 
 require __DIR__ . '/../vendor/autoload.php';
 
@@ -62,10 +62,13 @@ protected function createConnectionManagerMock($ret)
             ->disableOriginalConstructor()
             ->getMock();
 
+        $deferred = new Deferred();
+        $deferred->resolve($ret);
+
         $mock
             ->expects($this->any())
             ->method('create')
-            ->will($this->returnValue(When::resolve($ret)));
+            ->will($this->returnValue($deferred->promise()));
 
         return $mock;
     }