Update to React/Promise 2.0

Author: jsor

Config/FilesystemFactory.php

@@ -3,8 +3,8 @@
 namespace React\Dns\Config;
 
 use React\EventLoop\LoopInterface;
+use React\Promise;
 use React\Promise\Deferred;
-use React\Promise\When;
 use React\Stream\Stream;
 
 class FilesystemFactory
@@ -38,13 +38,13 @@ public function parseEtcResolvConf($contents)
         $config = new Config();
         $config->nameservers = $nameservers;
 
-        return When::resolve($config);
+        return Promise\resolve($config);
     }
 
     public function loadEtcResolvConf($filename)
     {
         if (!file_exists($filename)) {
-            return When::reject(new \InvalidArgumentException("The filename for /etc/resolv.conf given does not exist: $filename"));
+            return Promise\reject(new \InvalidArgumentException("The filename for /etc/resolv.conf given does not exist: $filename"));
         }
 
         try {
@@ -68,7 +68,7 @@ public function loadEtcResolvConf($filename)
 
             return $deferred->promise();
         } catch (\Exception $e) {
-            return When::reject($e);
+            return Promise\reject($e);
         }
     }
 }

Query/CachedExecutor.php

@@ -4,7 +4,6 @@
 
 use React\Dns\Model\Message;
 use React\Dns\Model\Record;
-use React\Promise\When;
 
 class CachedExecutor implements ExecutorInterface
 {

Query/RecordCache.php

@@ -5,7 +5,7 @@
 use React\Cache\CacheInterface;
 use React\Dns\Model\Message;
 use React\Dns\Model\Record;
-use React\Promise\When;
+use React\Promise;
 
 class RecordCache
 {
@@ -29,7 +29,7 @@ public function lookup(Query $query)
                 $recordBag = unserialize($value);
 
                 if (null !== $expiredAt && $expiredAt <= $query->currentTime) {
-                    return When::reject();
+                    return Promise\reject();
                 }
 
                 return $recordBag->all();

Query/RetryExecutor.php

@@ -19,16 +19,16 @@ public function query($nameserver, Query $query)
     {
         $deferred = new Deferred();
 
-        $this->tryQuery($nameserver, $query, $this->retries, $deferred->resolver());
+        $this->tryQuery($nameserver, $query, $this->retries, $deferred);
 
         return $deferred->promise();
     }
 
-    public function tryQuery($nameserver, Query $query, $retries, $resolver)
+    public function tryQuery($nameserver, Query $query, $retries, $deferred)
     {
-        $errorback = function ($error) use ($nameserver, $query, $retries, $resolver) {
+        $errorback = function ($error) use ($nameserver, $query, $retries, $deferred) {
             if (!$error instanceof TimeoutException) {
-                $resolver->reject($error);
+                $deferred->reject($error);
                 return;
             }
             if (0 >= $retries) {
@@ -37,14 +37,14 @@ public function tryQuery($nameserver, Query $query, $retries, $resolver)
                     0,
                     $error
                 );
-                $resolver->reject($error);
+                $deferred->reject($error);
                 return;
             }
-            $this->tryQuery($nameserver, $query, $retries-1, $resolver);
+            $this->tryQuery($nameserver, $query, $retries-1, $deferred);
         };
 
         $this->executor
             ->query($nameserver, $query)
-            ->then(array($resolver, 'resolve'), $errorback);
+            ->then(array($deferred, 'resolve'), $errorback);
     }
 }