Merge branch 'MAR-6868-error-logging' into 'master'

[MAR-6868] Updated error logging, to log full error message

Closes MAR-6868

See merge request marketplace-team/marketplace-api-client!44

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Marketplace API client - change log
 
+## 3.11.1
+- updated logging of request errors, they are no longer truncated after 120 characters
+
 ## 3.11.0
 - added support for new `pricing` endpoints for Products and Variants
 

composer.json

@@ -1,12 +1,13 @@
 {
   "name" : "mallgroup/mpapi-client",
   "description" : "Mall marketplace API client",
-  "version" : "3.11.0",
+  "version" : "3.11.1",
   "require" : {
     "php" : "^5.5 || ^7.0",
     "guzzlehttp/guzzle" : ">=6.2.3",
     "psr/log" : "~1.0.2",
-    "ext-json": "*"
+    "ext-json": "*",
+    "ext-bcmath": "*"
   },
   "require-dev" : {
     "codeception/codeception" : "~2.1",

src/Services/Client.php

@@ -4,6 +4,7 @@
 
 use GuzzleHttp\Client as HttpClient;
 use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Response;
 use GuzzleHttp\Psr7\Request;
 use MPAPI\Entity\Paging;
@@ -27,7 +28,7 @@ class Client
 	 *
 	 * @var string
 	 */
-	const APPLICATION_NAME = 'mpapic-v3.11.0';
+	const APPLICATION_NAME = 'mpapic-v3.11.1';
 
 	/**
 	 *
@@ -291,7 +292,8 @@ public function sendRequest($path, $method, array $body = [], array $args = [])
 				'body' => $body,
 				'client_id' => $this->clientId
 			]);
-			$responseData = json_decode($e->getResponse()->getBody()->getContents(), true);
+			$response = $e->getResponse()->getBody()->getContents();
+			$responseData = json_decode($response, true);
 			$e->getResponse()->getBody()->rewind();
 			$responseData = isset($responseData['data']) ? $responseData['data'] : $responseData;
 			if (isset($responseData['forceToken']) || isset($responseData['data']['forceToken'])) {
@@ -301,6 +303,18 @@ public function sendRequest($path, $method, array $body = [], array $args = [])
 				$exception->setForceToken($forceToken);
 				throw $exception;
 			}
+
+			// RequestException truncates the output to 120 chars., which does not fit some of our error messages (ie. media Content-Length)
+			if ($e instanceof RequestException) {
+				$message = $e->getMessage();
+				$pos = strpos($message, "` response:\n");
+				if ($pos !== false) {
+					// Replace the truncated response with full contents of the body
+					$message = substr_replace($message, $response . "\n", $pos + 12);
+					throw new \Exception($message, $e->getCode(), $e);
+				}
+			}
+
 			throw $e;
 		}
 		return $this->lastResponse;