Merge pull request #7 from clue-labs/promise

Update to Promise v2 API (while keeping full BC)

Author: cboden

composer.json

@@ -18,6 +18,6 @@
         "evenement/evenement": "~1.0|~2.0",
         "react/event-loop": ">=0.2, <0.5",
         "react/dns": ">=0.2, <0.5",
-        "react/promise": "~1.0|~2.0"
+        "react/promise": "~2.0|~1.1"
     }
 }

src/Factory.php

@@ -4,7 +4,7 @@
 
 use React\EventLoop\LoopInterface;
 use React\Dns\Resolver\Resolver;
-use React\Promise\Deferred;
+use React\Promise;
 use React\Datagram\Socket;
 use \Exception;
 
@@ -65,10 +65,7 @@ protected function resolveAddress($address)
         $parts = parse_url($address);
 
         if (!$parts || !isset($parts['host'])) {
-            $deferred = new Deferred();
-            $deferred->resolve($address);
-
-            return $deferred->promise();
+            return Promise\resolve($address);
         }
 
         if ($nullport) {
@@ -100,24 +97,15 @@ protected function resolveHost($host)
     {
         // there's no need to resolve if the host is already given as an IP address
         if (false !== filter_var($host, FILTER_VALIDATE_IP)) {
-            $deferred = new Deferred();
-            $deferred->resolve($host);
-
-            return $deferred->promise();
+            return Promise\resolve($host);
         }
         // todo: remove this once the dns resolver can handle the hosts file!
         if ($host === 'localhost') {
-            $deferred = new Deferred();
-            $deferred->resolve('127.0.0.1');
-
-            return $deferred->promise();
+            return Promise\resolve('127.0.0.1');
         }
 
         if ($this->resolver === null) {
-            $deferred = new Deferred();
-            $deferred->reject(new Exception('No resolver given in order to get IP address for given hostname'));
-
-            return $deferred->promise();
+            return Promise\reject(new Exception('No resolver given in order to get IP address for given hostname'));
         }
 
         return $this->resolver->resolve($host);

tests/FactoryTest.php

@@ -1,8 +1,6 @@
 <?php
 
 use React\Datagram\Socket;
-use React\Promise\When;
-use React\Promise\PromiseInterface;
 
 class FactoryTest extends TestCase
 {

tests/SocketTest.php

@@ -1,8 +1,6 @@
 <?php
 
 use React\Datagram\Socket;
-use React\Promise\When;
-use React\Promise\PromiseInterface;
 
 class SocketTest extends TestCase
 {

tests/bootstrap.php

@@ -1,9 +1,6 @@
 <?php
 
-use React\Promise\When;
-use React\Promise\PromiseInterface;
-
-require __DIR__.'/../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 abstract class TestCase extends PHPUnit_Framework_TestCase
 {