Merge pull request #22 from mindbox-moscow/v2.2.0

V2.2.0

Author: MaximBurcev

src/Clients/AbstractMindboxClient.php

@@ -284,7 +284,12 @@ final protected function parseRawResponse(MindboxRequest $request, HttpClientRaw
                 $this->logger->error($message, $context);
                 $body = $context['response']['body'];
                 $arBody  = json_decode($body, true);
-                throw new \Mindbox\Exceptions\MindboxBadRequestException(substr($arBody['errorMessage'], strpos($arBody['errorMessage'], ":") + 1));
+                if ($arBody) {
+                    $message = substr($arBody['errorMessage'], strpos($arBody['errorMessage'], ":") + 1);
+                } else {
+                    $message = 'Bad request';
+                }
+                throw new \Mindbox\Exceptions\MindboxBadRequestException($message);
             case 409:
                 $this->logger->error($message, $context);
                 throw new \Mindbox\Exceptions\MindboxConflictException('Conflict');

src/Clients/MindboxClientFactory.php

@@ -45,7 +45,7 @@ public function createMindboxClient(
                     throw new MindboxConfigException('Endpoint id cant`t be empty for v3 API');
                 }
 
-                return new MindboxClientV3($endpointId, $secretKey, $httpClient, $logger);
+                return new MindboxClientV3($endpointId, $secretKey, $httpClient, $logger, $domain);
             case 'v2.1':
                 if (empty($domain)) {
                     throw new MindboxConfigException('Domain cant`t be empty for v2.1 API');

src/Clients/MindboxClientV3.php

@@ -22,13 +22,18 @@ class MindboxClientV3 extends AbstractMindboxClient
     /**
      * Базовый URL на который будут отправляться запросы.
      */
-    const BASE_V3_URL = 'https://api.mindbox.ru/v3/operations/';
+    const BASE_V3_URL = 'https://api.mindbox.{{domainZone}}/v3/operations/';
 
     /**
      * Секретный ключ.
      */
     const SECRET_KEY_NAME = 'Mindbox secretKey';
 
+    /**
+     * @var string Доменная зона API.
+     */
+    private $domainZone;
+
     /**
      * @var string Уникальный идентификатор сайта/мобильного приложения/и т.п.
      */
@@ -37,14 +42,16 @@ class MindboxClientV3 extends AbstractMindboxClient
     /**
      * Конструктор MindboxRequest.
      *
-     * @param string          $endpointId Уникальный идентификатор сайта/мобильного приложения/и т.п.
-     * @param string          $secretKey  Секретный ключ.
-     * @param IHttpClient     $httpClient Экземпляр HTTP клиента.
-     * @param LoggerInterface $logger     Экземпляр логгера.
+     * @param string $endpointId Уникальный идентификатор сайта/мобильного приложения/и т.п.
+     * @param string $secretKey Секретный ключ.
+     * @param IHttpClient $httpClient Экземпляр HTTP клиента.
+     * @param LoggerInterface $logger Экземпляр логгера.
+     * @param string $domainZone
      */
-    public function __construct($endpointId, $secretKey, IHttpClient $httpClient, LoggerInterface $logger)
+    public function __construct($endpointId, $secretKey, IHttpClient $httpClient, LoggerInterface $logger, $domainZone)
     {
         parent::__construct($secretKey, $httpClient, $logger);
+        $this->domainZone = $domainZone;
         $this->endpointId = $endpointId;
     }
 
@@ -89,7 +96,8 @@ private function getCustomerIP()
      */
     protected function prepareUrl($url, array $queryParams, $isSync = true)
     {
-        return static::BASE_V3_URL . ($isSync ? 'sync' : 'async') . '?' . http_build_query($queryParams);
+        $domain = str_replace('{{domainZone}}', $this->domainZone, static::BASE_V3_URL);
+        return $domain . ($isSync ? 'sync' : 'async') . '?' . http_build_query($queryParams);
     }
 
     /**

src/Mindbox.php

@@ -83,7 +83,7 @@ public function __construct(array $config, LoggerInterface $logger)
             'v3',
             $this->config['endpointId'],
             $this->config['secretKey'],
-            $this->config['domain'],
+            $this->config['domainZone'],
             $httpClient,
             $logger
         );

tests/Clients/AbstractMindboxClientTest.php

@@ -26,6 +26,11 @@ class AbstractMindboxClientTest extends TestCase
      */
     protected $secret = 'secret';
 
+    /**
+     * @var string
+     */
+    protected $domain = 'ru';
+
     /**
      * @var string
      */
@@ -53,9 +58,10 @@ class AbstractMindboxClientTest extends TestCase
 
     public function setUp()
     {
+        $this->domain         = $this->domain;
         $this->httpClientStub = $this->getHttpClientStub();
         $this->loggerStub     = $this->getLoggerStub();
-        $this->client         = $this->getClient($this->secret, $this->httpClientStub, $this->loggerStub);
+        $this->client         = $this->getClient($this->secret, $this->httpClientStub, $this->loggerStub, $this->domain);
         $this->dtoStub        = $this->getDTOStub();
     }
 
@@ -278,7 +284,7 @@ protected function getClient($secret, $httpClient, $loggerClient)
                 'prepareBody',
                 'prepareResponseBody'
             ])
-            ->setConstructorArgs([$secret, $httpClient, $loggerClient])
+            ->setConstructorArgs([$secret, $httpClient, $loggerClient, $this->domain])
             ->getMock();
 
         $clientStub->expects($this->any())

tests/Clients/MindboxClientV3Test.php

@@ -104,7 +104,7 @@ public function expectedArgsForSendProvider()
      */
     protected function getClient($secret, $httpClient, $loggerClient)
     {
-        $client = new MindboxClientV3($this->endpointId, $secret, $httpClient, $loggerClient);
+        $client = new MindboxClientV3($this->endpointId, $secret, $httpClient, $loggerClient, $this->domain);
 
         return $client;
     }

tests/MindboxTest.php

@@ -29,6 +29,7 @@ class MindboxTest extends TestCase
         'endpointId' => 'test',
         'secretKey'  => 'test',
         'domain'     => 'test',
+        'domainZone'     => 'test',
     ];
 
     public function setUp()
@@ -47,27 +48,31 @@ public function incorrectConfigProvider()
                     'endpointId' => '',
                     'secretKey'  => 'test',
                     'domain'     => 'test',
+                    'domainZone' => 'test',
                 ],
             ],
             [
                 [
                     'endpointId' => 'test',
                     'secretKey'  => '',
                     'domain'     => 'test',
+                    'domainZone' => 'test',
                 ],
             ],
             [
                 [
                     'endpointId' => 'test',
                     'secretKey'  => 'test',
                     'domain'     => '',
+                    'domainZone' => '',
                 ],
             ],
             [
                 [
                     'endpointId' => 'test',
                     'secretKey'  => 'test',
                     'domain'     => 'test',
+                    'domainZone' => 'test',
                     'httpClient' => 'test',
                 ],
             ],