Remove the Stampie Response (#100)

* Remove the Stampie Response * removed type casting
Stampie · Feb 4, 2018 · 55bc297 · 55bc297
1 parent 19b4629
commit 55bc297
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 206 deletions.
diff --git a/lib/Adapter/Response.php b/lib/Adapter/Response.php
diff --git a/lib/Adapter/ResponseInterface.php b/lib/Adapter/ResponseInterface.php
diff --git a/lib/Mailer.php b/lib/Mailer.php
@@ -6,8 +6,7 @@
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Message\MessageFactory;
 use Http\Message\MultipartStream\MultipartStreamBuilder;
-use Stampie\Adapter\Response;
-use Stampie\Adapter\ResponseInterface;
+use Psr\Http\Message\ResponseInterface;
 use Stampie\Util\IdentityUtils;
 
 /**
@@ -108,7 +107,7 @@ public function send(MessageInterface $message)
         $response = $this->doSend($message);
 
         // We are all clear if status is HTTP 2xx OK
-        if ($response->isSuccessful()) {
+        if (in_array($response->getStatusCode(), range(200, 206), true)) {
             return;
         }
 
@@ -203,11 +202,11 @@ protected function buildIdentityString($identities)
     }
 
     /**
-     * Take a Message and return a Stampie Response.
+     * Take a Message and return a PSR ResponseInterface.
      *
      * @param MessageInterface $message
      *
-     * @return Response
+     * @return ResponseInterface
      */
     private function doSend(MessageInterface $message)
     {
@@ -248,8 +247,6 @@ private function doSend(MessageInterface $message)
         }
 
         $request = $this->getMessageFactory()->createRequest('POST', $this->getEndpoint(), $headers, $content);
-        $psr7Response = $this->getHttpClient()->sendRequest($request);
-
-        return new Response($psr7Response->getStatusCode(), $psr7Response->getBody()->__toString());
+        return $this->getHttpClient()->sendRequest($request);
     }
 }
diff --git a/lib/Mailer/MailGun.php b/lib/Mailer/MailGun.php
@@ -2,7 +2,7 @@
 
 namespace Stampie\Mailer;
 
-use Stampie\Adapter\ResponseInterface;
+use Psr\Http\Message\ResponseInterface;
 use Stampie\Attachment;
 use Stampie\Exception\HttpException;
 use Stampie\Mailer;
@@ -122,7 +122,7 @@ protected function format(MessageInterface $message)
      */
     protected function handle(ResponseInterface $response)
     {
-        throw new HttpException($response->getStatusCode(), $response->getStatusText());
+        throw new HttpException($response->getStatusCode(), $response->getReasonPhrase());
     }
 
     /**

diff --git a/lib/Mailer/Mandrill.php b/lib/Mailer/Mandrill.php
@@ -2,7 +2,7 @@
 
 namespace Stampie\Mailer;
 
-use Stampie\Adapter\ResponseInterface;
+use Psr\Http\Message\ResponseInterface;
 use Stampie\Attachment;
 use Stampie\Exception\ApiException;
 use Stampie\Exception\HttpException;
@@ -106,8 +106,8 @@ protected function format(MessageInterface $message)
      */
     protected function handle(ResponseInterface $response)
     {
-        $httpException = new HttpException($response->getStatusCode(), $response->getStatusText());
-        $error = json_decode($response->getContent());
+        $httpException = new HttpException($response->getStatusCode(), $response->getReasonPhrase());
+        $error = json_decode((string) $response->getBody());
 
         throw new ApiException($error->message, $httpException, $error->code);
     }

diff --git a/lib/Mailer/Postmark.php b/lib/Mailer/Postmark.php
@@ -2,7 +2,7 @@
 
 namespace Stampie\Mailer;
 
-use Stampie\Adapter\ResponseInterface;
+use Psr\Http\Message\ResponseInterface;
 use Stampie\Attachment;
 use Stampie\Exception\ApiException;
 use Stampie\Exception\HttpException;
@@ -32,11 +32,11 @@ protected function getEndpoint()
      */
     protected function handle(ResponseInterface $response)
     {
-        $httpException = new HttpException($response->getStatusCode(), $response->getStatusText());
+        $httpException = new HttpException($response->getStatusCode(), $response->getReasonPhrase());
 
         // Not 422 contains information about API Error
         if ($response->getStatusCode() == 422) {
-            $error = json_decode($response->getContent());
+            $error = json_decode((string) $response->getBody());
             throw new ApiException(isset($error->Message) ? $error->Message : 'Unprocessable Entity', $httpException);
         }
 

diff --git a/lib/Mailer/SendGrid.php b/lib/Mailer/SendGrid.php
@@ -2,7 +2,7 @@
 
 namespace Stampie\Mailer;
 
-use Stampie\Adapter\ResponseInterface;
+use Psr\Http\Message\ResponseInterface;
 use Stampie\Attachment;
 use Stampie\Exception\ApiException;
 use Stampie\Exception\HttpException;
@@ -35,14 +35,14 @@ protected function getEndpoint()
      */
     protected function handle(ResponseInterface $response)
     {
-        $httpException = new HttpException($response->getStatusCode(), $response->getStatusText());
+        $httpException = new HttpException($response->getStatusCode(), $response->getReasonPhrase());
 
         // 4xx will content error information in the body encoded as JSON
         if (!in_array($response->getStatusCode(), range(400, 417))) {
             throw $httpException;
         }
 
-        $error = json_decode($response->getContent());
+        $error = json_decode((string) $response->getBody());
         $message = '';
         foreach ($error->errors as $i => $e) {
             $message .= sprintf(

diff --git a/tests/Stampie/Tests/Adapter/ResponseTest.php b/tests/Stampie/Tests/Adapter/ResponseTest.php