Support React PHP v0.4 and react/promise v2 (fixes #6)

This does not break BC and keeps compatibility with React v0.3

Author: clue

composer.json

@@ -11,9 +11,9 @@
         }
     ],
     "require": {
-        "react/promise": "~1",
-        "react/socket-client": "0.3.*",
-        "react/event-loop": "0.3.*",
+        "react/promise": "1.*|2.*",
+        "react/socket-client": "0.3.*|0.4.*",
+        "react/event-loop": "0.3.*|0.4.*",
         "clue/redis-protocol": "0.3.*"
     },
     "autoload": {

composer.lock

@@ -10,7 +10,6 @@
 use Clue\Redis\Protocol\Serializer\SerializerInterface;
 use Clue\Redis\Protocol\Factory as ProtocolFactory;
 use Clue\React\Redis\Request;
-use React\Promise\When;
 use UnderflowException;
 use RuntimeException;
 
@@ -69,7 +68,13 @@ public function __construct(Stream $stream, ParserInterface $parser = null, Seri
     public function __call($name, $args)
     {
         if ($this->ending) {
-            return When::reject(new RuntimeException('Connection closed'));
+            $e = new RuntimeException('Connection closed');
+
+            if (class_exists('React\Promise\When')) {
+                return \React\Promise\When::reject($e);
+            } else {
+                return \React\Promise\reject($e);
+            }
         }
 
         $this->stream->write($this->serializer->getRequestMessage($name, $args));

src/Client.php

@@ -3,7 +3,6 @@
 namespace Clue\React\Redis;
 
 use React\Socket\Server as ServerSocket;
-use React\Promise\When;
 use React\SocketClient\ConnectorInterface;
 use React\Stream\Stream;
 use Clue\React\Redis\Client;
@@ -39,23 +38,39 @@ public function createClient($target = null)
         $db   = $this->getDatabaseFromTarget($target);
         $protocol = $this->protocol;
 
-        return $this->connect($target)->then(function (Stream $stream) use ($auth, $db, $protocol) {
-            $client = new Client($stream, $protocol->createResponseParser(), $protocol->createSerializer());
-
-            return When::all(
-                array(
-                    ($auth !== null ? $client->auth($auth) : null),
-                    ($db   !== null ? $client->select($db) : null)
-                ),
-                function() use ($client) {
-                    return $client;
-                },
-                function($error) use ($client) {
-                    $client->close();
-                    throw $error;
-                }
-            );
+        $promise = $this->connect($target)->then(function (Stream $stream) use ($protocol) {
+            return new Client($stream, $protocol->createResponseParser(), $protocol->createSerializer());
         });
+
+        if ($auth !== null) {
+            $promise = $promise->then(function (Client $client) use ($auth) {
+                return $client->auth($auth)->then(
+                    function () use ($client) {
+                        return $client;
+                    },
+                    function ($error) use ($client) {
+                        $client->close();
+                        throw $error;
+                    }
+                );
+            });
+        }
+
+        if ($db !== null) {
+            $promise = $promise->then(function (Client $client) use ($db) {
+                return $client->select($db)->then(
+                    function () use ($client) {
+                        return $client;
+                    },
+                    function ($error) use ($client) {
+                        $client->close();
+                        throw $error;
+                    }
+                );
+            });
+        }
+
+        return $promise;
     }
 
     private function parseUrl($target)
@@ -89,7 +104,11 @@ private function connect($target)
             $parts = $this->parseUrl($target);
         }
         catch (Exception $e) {
-            return When::reject($e);
+            if (class_exists('React\Promise\When')) {
+                return \React\Promise\When::reject($e);
+            } else {
+                return \React\Promise\reject($e);
+            }
         }
 
         return $this->connector->create($parts['host'], $parts['port']);