Merge pull request #11 from mingyoung/patch-1

real raw response
overtrue · Jan 13, 2019 · 7270d64 · 7270d64
2 parents 76ae3be + fc3f2ad
commit 7270d64
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -12,7 +12,6 @@
 namespace Overtrue\Http;
 
 use GuzzleHttp\Client as GuzzleClient;
-use Overtrue\Http\Responses\Response;
 use Overtrue\Http\Traits\HasHttpRequests;
 
 /**
@@ -140,7 +139,9 @@ public function request(string $uri, string $method = 'GET', array $options = []
 
         $response = $this->performRequest($uri, $method, $options);
 
-        return $returnRaw ? $response : $this->castResponseToType($response, $this->config->getOption('response_type'));
+        return $this->castResponseToType(
+            $response, $returnRaw ? 'raw' : $this->config->getOption('response_type')
+        );
     }
 
     /**
@@ -152,7 +153,7 @@ public function request(string $uri, string $method = 'GET', array $options = []
      */
     public function requestRaw(string $url, string $method = 'GET', array $options = [])
     {
-        return Response::buildFromPsrResponse($this->request($url, $method, $options, true));
+        return $this->request($url, $method, $options, true);
     }
 
     /**

diff --git a/src/Traits/ResponseCastable.php b/src/Traits/ResponseCastable.php
@@ -31,6 +31,10 @@ trait ResponseCastable
      */
     protected function castResponseToType(ResponseInterface $response, $type = null)
     {
+        if ('raw' === $type) {
+            return $response;
+        }
+
         $response = Response::buildFromPsrResponse($response);
         $response->getBody()->rewind();
 
@@ -41,8 +45,6 @@ protected function castResponseToType(ResponseInterface $response, $type = null)
                 return $response->toArray();
             case 'object':
                 return $response->toObject();
-            case 'raw':
-                return $response;
         }
     }