From dad3a54a949ebcb6dc95abc7158c18a9fd98c0de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Sat, 7 May 2016 12:05:51 +0200
Subject: [PATCH 1/2] Update react/socket-client dependency to all supported
 versions

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 5205b8c..ffc5a2a 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     "require": {
         "php": ">=5.3",
         "react/promise": "1.*|2.*",
-        "react/socket-client": "0.3.*|0.4.*",
+        "react/socket-client": "^0.5 || ^0.4 || ^0.3",
         "react/event-loop": "0.3.*|0.4.*",
         "clue/redis-protocol": "0.3.*",
         "evenement/evenement": "~1.0|~2.0"

From 17ab4ad2c230ba911c49bca88c93f2c1b1b89834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@lueck.tv>
Date: Sun, 8 May 2016 12:10:25 +0200
Subject: [PATCH 2/2] Update promise dependency

---
 composer.json   |  2 +-
 src/Factory.php | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index ffc5a2a..c41a8dd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.3",
-        "react/promise": "1.*|2.*",
+        "react/promise": "^2.0 || ^1.1",
         "react/socket-client": "^0.5 || ^0.4 || ^0.3",
         "react/event-loop": "0.3.*|0.4.*",
         "clue/redis-protocol": "0.3.*",
diff --git a/src/Factory.php b/src/Factory.php
index 269a147..69318c1 100644
--- a/src/Factory.php
+++ b/src/Factory.php
@@ -12,6 +12,7 @@
 use BadMethodCallException;
 use Exception;
 use React\EventLoop\LoopInterface;
+use React\Promise;
 
 class Factory
 {
@@ -109,13 +110,8 @@ private function connect($target)
     {
         try {
             $parts = $this->parseUrl($target);
-        }
-        catch (Exception $e) {
-            if (class_exists('React\Promise\When')) {
-                return \React\Promise\When::reject($e);
-            } else {
-                return \React\Promise\reject($e);
-            }
+        } catch (Exception $e) {
+            return Promise\reject($e);
         }
 
         return $this->connector->create($parts['host'], $parts['port']);