Updated ReposneMediator to PSR-7

Author: Nyholm

lib/Github/HttpClient/Message/ResponseMediator.php

@@ -2,15 +2,15 @@
 
 namespace Github\HttpClient\Message;
 
-use Guzzle\Http\Message\Response;
 use Github\Exception\ApiLimitExceedException;
+use Psr\Http\Message\ResponseInterface;
 
 class ResponseMediator
 {
-    public static function getContent(Response $response)
+    public static function getContent(ResponseInterface $response)
     {
-        $body = $response->getBody(true);
-        if (strpos($response->getContentType(), 'application/json') === 0) {
+        $body = $response->getBody()->__toString();
+        if (strpos($response->getHeaderLine('Content-Type'), 'application/json') === 0) {
             $content = json_decode($body, true);
             if (JSON_ERROR_NONE === json_last_error()) {
                 return $content;
@@ -20,14 +20,14 @@ public static function getContent(Response $response)
         return $body;
     }
 
-    public static function getPagination(Response $response)
+    public static function getPagination(ResponseInterface $response)
     {
-        $header = (string) $response->getHeader('Link');
-
-        if (empty($header)) {
+        if ($response->hasHeader('Link')) {
             return null;
         }
 
+        $header = $response->getHeader('Link');
+        $header = array_shift($header);
         $pagination = array();
         foreach (explode(',', $header) as $link) {
             preg_match('/<(.*)>; rel="(.*)"/i', trim($link, ','), $match);
@@ -40,9 +40,10 @@ public static function getPagination(Response $response)
         return $pagination;
     }
 
-    public static function getApiLimit(Response $response)
+    public static function getApiLimit(ResponseInterface $response)
     {
-        $remainingCalls = (string) $response->getHeader('X-RateLimit-Remaining');
+        $remainingCalls = $response->getHeader('X-RateLimit-Remaining');
+        $remainingCalls = array_shift($remainingCalls);
 
         if (null !== $remainingCalls && 1 > $remainingCalls) {
             throw new ApiLimitExceedException($remainingCalls);