Update to new promise-based dns API in react/dns v0.2.4

CHANGELOG.md

@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+* 0.1.1 (2012-11-18)
+
+  * Use promise-based DNS resolver in react/dns v0.2.4
+
 * 0.1.0 (2012-11-08)
 
   * First tagged release

src/React/Whois/Client.php

@@ -6,6 +6,7 @@
 use React\Curry\Util as Curry;
 use React\Dns\Resolver\Resolver;
 use React\Stream\ReadableStreamInterface;
+use React\Stream\BufferedSink;
 
 class Client
 {
@@ -27,14 +28,10 @@ public function query($domain)
 
     public function resolveWhoisServer($domain)
     {
-        $deferred = new Deferred();
-
         $tld = substr(strrchr($domain, '.'), 1);
         $target = $tld.'.whois-servers.net';
 
-        $this->dns->resolve($target, array($deferred, 'resolve'));
-
-        return $deferred->promise();
+        return $this->dns->resolve($target);
     }
 
     public function queryWhoisServer($domain, $ip)
@@ -54,9 +51,9 @@ public function normalizeLinefeeds($data)
 
     public function streamGetContents(ReadableStreamInterface $input)
     {
-        $contents = new BufferedStreamPromise();
-        $input->pipe($contents);
+        $sink = new BufferedSink();
+        $input->pipe($sink);
 
-        return $contents;
+        return $sink->promise();
     }
 }

tests/React/Whois/ClientTest.php

@@ -2,6 +2,8 @@
 
 namespace React\Whois;
 
+use React\Promise\FulfilledPromise;
+
 class ClientTest extends TestCase
 {
     /** @test */
@@ -15,17 +17,15 @@ public function clientShouldGetCorrectWhoisServerAndQueryIt()
             ->method('__invoke')
             ->with($result);
 
+        // whois.nic.io => 193.223.78.152
         $resolver = $this->getMockBuilder('React\Dns\Resolver\Resolver')
             ->disableOriginalConstructor()
             ->getMock();
         $resolver
             ->expects($this->once())
             ->method('resolve')
             ->with('io.whois-servers.net')
-            ->will($this->returnCallback(function ($domain, $callback) {
-                // whois.nic.io
-                call_user_func($callback, '193.223.78.152');
-            }));
+            ->will($this->returnValue(new FulfilledPromise('193.223.78.152')));
 
         $conn = $this->getMockBuilder('React\Whois\Stub\ConnectionStub')
             ->setMethods(array(