Prepare React v0.4

Author: clue

composer.json

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

src/Client.php

@@ -2,7 +2,6 @@
 
 namespace Clue\React\Socks;
 
-use React\Promise\When;
 use React\Promise\Deferred;
 use React\Dns\Resolver\Factory as DnsFactory;
 use React\Dns\Resolver\Resolver;
@@ -133,7 +132,9 @@ public function createConnector()
     public function getConnection($host, $port)
     {
         if (strlen($host) > 255 || $port > 65535 || $port < 0) {
-            return When::reject(new InvalidArgumentException('Invalid target specified'));
+            $deferred = new Deferred();
+            $deferred->reject(new InvalidArgumentException('Invalid target specified'));
+            return $deferred->promise();
         }
         $deferred = new Deferred();
 
@@ -155,7 +156,7 @@ public function getConnection($host, $port)
 
         $loop = $this->loop;
         $that = $this;
-        When::all(
+        \react\promise\all(
             array(
                 $this->connector->create($this->socksHost, $this->socksPort)->then(
                     null,
@@ -188,7 +189,9 @@ private function resolve($host)
     {
         // return if it's already an IP or we want to resolve remotely (socks 4 only supports resolving locally)
         if (false !== filter_var($host, FILTER_VALIDATE_IP) || ($this->protocolVersion !== '4' && !$this->resolveLocal)) {
-            return When::resolve($host);
+            $deferred = new Deferred();
+            $deferred->resolve($host);
+            return $deferred->promise();
         }
 
         return $this->resolver->resolve($host);

src/Server.php

@@ -4,7 +4,6 @@
 
 use Evenement\EventEmitter;
 use React\Socket\ServerInterface;
-use React\Promise\When;
 use React\Promise\PromiseInterface;
 use React\Stream\Stream;
 use React\Dns\Resolver\Factory as DnsFactory;
@@ -15,6 +14,7 @@
 use \UnexpectedValueException;
 use \InvalidArgumentException;
 use \Exception;
+use React\Promise\Deferred;
 
 class Server extends EventEmitter
 {
@@ -73,7 +73,9 @@ public function setAuth($auth)
             if ($ret instanceof PromiseInterface) {
                 return $ret;
             }
-            return $ret ? When::resolve() : When::reject();
+            $deferred = new Deferred();
+            $ret ? $deferred->resolve() : $deferred->reject();
+            return $deferred->promise();
         };
     }