Depend on react/promise-timer for more SOLID timer API

Author: clue

composer.json

@@ -17,6 +17,7 @@
         "php": ">=5.3",
         "react/socket-client": "^0.5 || ^0.4 || ^0.3",
         "react/event-loop": "^0.4 || ^0.3",
-        "react/promise": "^2.0 || ^1.1"
+        "react/promise": "^2.0 || ^1.1",
+        "react/promise-timer": "^1.1"
     }
 }

src/ConnectionManagerDelay.php

@@ -4,7 +4,7 @@
 
 use React\SocketClient\ConnectorInterface;
 use React\EventLoop\LoopInterface;
-use React\Promise\Deferred;
+use React\Promise\Timer;
 
 class ConnectionManagerDelay implements ConnectorInterface
 {
@@ -21,15 +21,10 @@ public function __construct(ConnectorInterface $connectionManager, LoopInterface
 
     public function create($host, $port)
     {
-        $deferred = new Deferred();
-
         $connectionManager = $this->connectionManager;
-        $this->loop->addTimer($this->delay, function() use ($deferred, $connectionManager, $host, $port) {
-            $connectionManager->create($host, $port)->then(
-                array($deferred, 'resolve'),
-                array($deferred, 'reject')
-            );
+
+        return Timer\resolve($this->delay, $this->loop)->then(function () use ($connectionManager, $host, $port) {
+            return $connectionManager->create($host, $port);
         });
-        return $deferred->promise();
     }
 }

src/ConnectionManagerTimeout.php

@@ -4,7 +4,7 @@
 
 use React\SocketClient\ConnectorInterface;
 use React\EventLoop\LoopInterface;
-use React\Promise\Deferred;
+use React\Promise\Timer;
 use Exception;
 
 class ConnectionManagerTimeout implements ConnectorInterface
@@ -22,28 +22,15 @@ public function __construct(ConnectorInterface $connectionManager, LoopInterface
 
     public function create($host, $port)
     {
-        $deferred = new Deferred();
-        $timedout = false;
+        $promise = $this->connectionManager->create($host, $port);
 
-        $tid = $this->loop->addTimer($this->timeout, function() use ($deferred, &$timedout) {
-            $deferred->reject(new Exception('Connection attempt timed out'));
-            $timedout = true;
-            // TODO: find a proper way to actually cancel the connection
-        });
-
-        $loop = $this->loop;
-        $this->connectionManager->create($host, $port)->then(function ($connection) use ($tid, $loop, &$timedout, $deferred) {
-            if ($timedout) {
-                // connection successfully established but timeout already expired => close successful connection
+        return Timer\timeout($promise, $this->timeout, $this->loop)->then(null, function ($e) use ($promise) {
+            // connection successfully established but timeout already expired => close successful connection
+            $promise->then(function ($connection) {
                 $connection->end();
-            } else {
-                $loop->cancelTimer($tid);
-                $deferred->resolve($connection);
-            }
-        }, function ($error) use ($loop, $tid, $deferred) {
-            $loop->cancelTimer($tid);
-            $deferred->reject($error);
+            });
+
+            throw $e;
         });
-        return $deferred->promise();
     }
 }