Alter AbstractProfileRequest to send requests successfully

itsip · itsip · commit fadc0315fef4 · 2018-11-08T11:20:24.000-05:00
diff --git a/src/Message/AbstractProfileRequest.php b/src/Message/AbstractProfileRequest.php
@@ -37,41 +37,28 @@ public function setComment($value)
     public function sendData($data)
     {
         $header = base64_encode($this->getMerchantId() . ':' . $this->getApiPasscode());
-        // Don't throw exceptions for 4xx errors
-        $this->httpClient->getEventDispatcher()->addListener(
-            'request.error',
-            function ($event) {
-                if ($event['response']->isClientError()) {
-                    $event->stopPropagation();
-                }
-            }
-        );
-
+        
         if (!empty($data)) {
-            $httpRequest = $this->httpClient->createRequest(
+            $httpResponse = $this->httpClient->request(
                 $this->getHttpMethod(),
                 $this->getEndpoint(),
-                null,
+                [
+                    'Content-Type' => 'application/json',
+                    'Authorization' => 'Passcode ' . $header,
+                ],
                 json_encode($data)
             );
         } else {
-            $httpRequest = $this->httpClient->createRequest(
+            $httpResponse = $this->httpClient->request(
                 $this->getHttpMethod(),
-                $this->getEndpoint()
+                $this->getEndpoint(),
+                [
+                    'Content-Type' => 'application/json',
+                    'Authorization' => 'Passcode ' . $header,
+                ]
             );
         }
 
-        $httpResponse = $httpRequest
-            ->setHeader(
-                'Content-Type',
-                'application/json'
-            )
-            ->setHeader(
-                'Authorization',
-                'Passcode ' . $header
-            )
-            ->send();
-
-        return $this->response = new ProfileResponse($this, $httpResponse->json());
+        return $this->response = new Response($this, $httpResponse->getBody()->getContents());
     }
 }
diff --git a/src/Message/AbstractRequest.php b/src/Message/AbstractRequest.php
@@ -147,7 +147,6 @@ public function getHttpMethod()
     public function sendData($data)
     {
         $header = base64_encode($this->getMerchantId() . ':' . $this->getApiPasscode());
-        // Don't throw exceptions for 4xx errors
         
         if (!empty($data)) {
             $httpResponse = $this->httpClient->request(

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,6 @@ public function getHttpMethod()`
`147`	`147`	`public function sendData($data)`
`148`	`148`	`{`
`149`	`149`	`$header = base64_encode($this->getMerchantId() . ':' . $this->getApiPasscode());`
`150`		`- // Don't throw exceptions for 4xx errors`
`151`	`150`
`152`	`151`	`if (!empty($data)) {`
`153`	`152`	`$httpResponse = $this->httpClient->request(`