fix ответа с ошибкой. Вместо массива приходит иногда текст

Author: Denis Korolev

src/AuthApi.php

@@ -26,9 +26,9 @@ public function auth(AuthRequest $request): AuthResponse
         );
 
         $response = $this->send($req);
-
+        $data = $this->prepareResponse($response);
         /** @var AuthResponse $body */
-        $body = $this->serializer->deserialize($response->getBody()->getContents(), AuthResponse::class, 'json');
+        $body = $this->serializer->deserialize($data, AuthResponse::class, 'json');
         $body->statusCode = $response->getStatusCode();
 
         return $body;
@@ -47,9 +47,9 @@ public function logOut(LogOutRequest $request): LogOutResponse
         );
 
         $response = $this->send($req);
-
+        $data = $this->prepareResponse($response);
         /** @var LogOutResponse $body */
-        $body = $this->serializer->deserialize($response->getBody()->getContents(), LogOutResponse::class, 'json');
+        $body = $this->serializer->deserialize($data, LogOutResponse::class, 'json');
         $body->statusCode = $response->getStatusCode();
 
         return $body;

src/BaseClient.php

@@ -51,4 +51,21 @@ protected function send(RequestInterface $request): ResponseInterface
 
         return $response;
     }
+
+    protected function prepareResponse(ResponseInterface $response): string
+    {
+        if ($response->getStatusCode() > 300) {
+            $array = json_decode($response->getBody()->getContents(), true);
+
+            if (isset($array['error']) && is_string($array['error'])) {
+                $error = $array['error'];
+                $array['error'] = ['message' => $error];
+            }
+            $data = json_encode($array, JSON_UNESCAPED_UNICODE);
+        } else {
+            $data = $response->getBody()->getContents();
+        }
+
+        return $data;
+    }
 }

src/ContractorApi.php

@@ -24,7 +24,7 @@ public function getInfo(GetInfoRequest $request): GetInfoResponse
         );
 
         $response = $this->send($req);
-        $data = $response->getBody()->getContents();
+        $data = $this->prepareResponse($response);
 
         if ($response->getStatusCode() >= 200 && $response->getStatusCode() < 300 && $request->params->memberParam->extendedFields) {
             $array = json_decode($data, true);

src/DocumentApi.php

@@ -28,8 +28,7 @@ public function sendDocument(SendDocumentRequest $request): SendDocumentResponse
         );
 
         $response = $this->send($req);
-        $data = $response->getBody()->getContents();
-
+        $data = $this->prepareResponse($response);
         /** @var SendDocumentResponse $body */
         $body = $this->serializer->deserialize($data, SendDocumentResponse::class, 'json');
         $body->statusCode = $response->getStatusCode();
@@ -50,7 +49,7 @@ public function makeAction(MakeActionRequest $request): MakeActionResponse
         );
 
         $response = $this->send($req);
-        $data = $response->getBody()->getContents();
+        $data = $this->prepareResponse($response);
 
         /** @var MakeActionResponse $body */
         $body = $this->serializer->deserialize($data, MakeActionResponse::class, 'json');
@@ -72,7 +71,7 @@ public function listOfChanges(ListOfChangesRequest $listOfChangesRequest): ListO
         );
 
         $response = $this->send($req);
-        $data = $response->getBody()->getContents();
+        $data = $this->prepareResponse($response);
 
         /** @var ListOfChangesResponse $body */
         $body = $this->serializer->deserialize($data, ListOfChangesResponse::class, 'json');