Merge pull request #9 from phergie/use-response-object

Fixed missing conversion to Reponse object

Author: WyriHaximus

src/Plugin.php

@@ -10,6 +10,7 @@
 
 namespace Phergie\Irc\Plugin\React\Url;
 
+use GuzzleHttp\Message\Response;
 use React\EventLoop\LoopInterface;
 use Phergie\Irc\Bot\React\AbstractPlugin;
 use Phergie\Irc\Bot\React\EventQueue;
@@ -176,8 +177,13 @@ public function createRequest($requestId, $url, UserEvent $event, EventQueue $qu
                 $this->logDebug('[' . $requestId . ']Reponse (after ' . ($end - $start) . 's): ' . $code);
             },
             'resolveCallback' =>
-                function ($result) use ($requestId, $url, $event, $queue, $start) {
-                    list ($data, $headers, $code) = $result;
+                function (Response $response) use ($requestId, $url, $event, $queue, $start) {
+                    $data = $response->getBody()->getContents();
+                    $headers = $response->getHeaders();
+                    array_walk($headers, function (&$value, $key) use ($response) {
+                        $value = $response->getHeader($key);
+                    });
+                    $code = $response->getStatusCode();
                     $end = microtime(true);
                     $message = '[';
                     $message .= $requestId;

tests/PluginTest.php

@@ -10,6 +10,7 @@
 
 namespace Phergie\Tests\Irc\Plugin\React\Url;
 
+use GuzzleHttp\Message\Response;
 use Phake;
 use Phergie\Irc\Plugin\React\Url\Plugin;
 use React\Promise\FulfilledPromise;
@@ -249,13 +250,20 @@ public function testCreateRequest() {
 
         Phake::when($plugin)->emitShorteningEvents($this->isType('string'), $this->isType('string'))->thenReturn(new FulfilledPromise($url));
 
-        $request->callResolve(['', array(
-            'foo' => 'bar',
-        ), 200]);
+        $body = Phake::mock('GuzzleHttp\Stream\StreamInterface');
+        Phake::when($body)->getContents()->thenReturn('');
 
-        $request->callResolve(['', array(
-            'foo' => 'bar',
-        ), 200]);
+        $request->callResolve(
+            new Response(200, [
+                'foo' => 'bar',
+            ], $body)
+        );
+
+        $request->callResolve(
+            new Response(200, [
+                'foo' => 'bar',
+            ], $body)
+        );
 
         Phake::inOrder(
             Phake::verify($plugin, Phake::times(2))->logDebug($this->isType('string')),