From b70701d7d61ac329767ab625586d62309527a6e1 Mon Sep 17 00:00:00 2001
From: ihomyak <ihomyak@mail.ru>
Date: Thu, 18 Jun 2020 12:08:53 +0700
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D1=82=D0=B8=D0=BF=20=D0=BF=D0=BE=D0=BB=D1=8F=20?=
 =?UTF-8?q?phone=20=D0=B2=20=D1=81=D0=B2=D0=BE=D0=B9=D1=81=D1=82=D0=B2?=
 =?UTF-8?q?=D0=B5=20Seller.=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D0=BE=D0=B2=D1=8B=D0=B5?=
 =?UTF-8?q?=20=D0=B0=D0=BA=D0=BA=D0=B0=D1=83=D0=BD=D1=82=D1=8B.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BaseTypes/Seller.php |  4 ++--
 src/Constants.php        | 38 +++++++++++++++++++-------------------
 tests/ApiTest.php        |  4 ++--
 tests/ClientTest.php     |  5 +++--
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/BaseTypes/Seller.php b/src/BaseTypes/Seller.php
index 160bb56..771ecc2 100644
--- a/src/BaseTypes/Seller.php
+++ b/src/BaseTypes/Seller.php
@@ -30,8 +30,8 @@ class Seller extends Base
 
     /**
      * Телефон истинного продавца
-     * @Type("CdekSDK2\BaseTypes\Phone")
-     * @var Phone
+     * @Type("string")
+     * @var string
      */
     public $phone;
 
diff --git a/src/Constants.php b/src/Constants.php
index ce3f188..67f8ff2 100644
--- a/src/Constants.php
+++ b/src/Constants.php
@@ -278,13 +278,13 @@ class Constants
      * Аккаунт для тестовой среды
      * @var string
      */
-    public const TEST_ACCOUNT = 'z9GRRu7FxmO53CQ9cFfI6qiy32wpfTkd';
+    public const TEST_ACCOUNT = 'EMscd6r9JnFiQ3bLoyjJY6eM78JrJceI';
 
     /**
      * Секретный ключ для тестовой среды
      * @var string
      */
-    public const TEST_SECURE = 'w24JTCv4MnAcuRTx0oHjHLDtyt3I6IBq';
+    public const TEST_SECURE = 'PjLZkKBHEiLK3YsjtNrt3TGNG0ahs3kG';
 
     /**
      * Тип связанной сущности: возвратный заказ
@@ -325,103 +325,103 @@ class Constants
 
     /**
      * Код материала товара: Полиэстер
-     * @var string
+     * @var int
      */
     public const MATERIAL_POLYESTER = 1;
 
     /**
      * Код материала товара: Нейлон
-     * @var string
+     * @var int
      */
     public const MATERIAL_NYLON = 2;
 
     /**
      * Код материала товара: Флис
-     * @var string
+     * @var int
      */
     public const MATERIAL_FLEECE = 3;
 
     /**
      * Код материала товара: Хлопок
-     * @var string
+     * @var int
      */
     public const MATERIAL_COTTON = 4;
 
     /**
      * Код материала товара: Текстиль
-     * @var string
+     * @var int
      */
     public const MATERIAL_TEXTILES = 5;
 
     /**
      * Код материала товара: Лён
-     * @var string
+     * @var int
      */
     public const MATERIAL_FLAX = 6;
 
     /**
      * Код материала товара: Вискоза
-     * @var string
+     * @var int
      */
     public const MATERIAL_VISCOSE = 7;
 
     /**
      * Код материала товара: Шелк
-     * @var string
+     * @var int
      */
     public const MATERIAL_SILK = 8;
 
     /**
      * Код материала товара: Шерсть
-     * @var string
+     * @var int
      */
     public const MATERIAL_WOOL = 9;
 
     /**
      * Код материала товара: Кашемир
-     * @var string
+     * @var int
      */
     public const MATERIAL_CASHMERE = 10;
 
     /**
      * Код материала товара: Кожа
-     * @var string
+     * @var int
      */
     public const MATERIAL_LEATHER = 11;
 
     /**
      * Код материала товара: Кожзам
-     * @var string
+     * @var int
      */
     public const MATERIAL_LEATHERETTE = 12;
 
     /**
      * Код материала товара: Искусственный мех
-     * @var string
+     * @var int
      */
     public const MATERIAL_FAUX_FUR = 13;
 
     /**
      * Код материала товара: Замша
-     * @var string
+     * @var int
      */
     public const MATERIAL_SUEDE = 14;
 
     /**
      * Код материала товара: Полиуретан
-     * @var string
+     * @var int
      */
     public const MATERIAL_POLYURETHANE = 15;
 
     /**
      * Код материала товара: Спандекс
-     * @var string
+     * @var int
      */
     public const MATERIAL_SPANDEX = 16;
 
     /**
      * Код материала товара: Резина
-     * @var string
+     * @var int
      */
     public const MATERIAL_RUBBER = 17;
 }
diff --git a/tests/ApiTest.php b/tests/ApiTest.php
index d1de8c6..5325371 100644
--- a/tests/ApiTest.php
+++ b/tests/ApiTest.php
@@ -67,8 +67,8 @@ public function testSetTest()
     {
         $this->api->setTest(true);
         $this->assertTrue($this->api->isTest());
-        $this->assertStringContainsString('z9GRRu7FxmO53CQ9cFfI6qiy32wpfTkd', $this->api->getAccount());
-        $this->assertStringContainsString('w24JTCv4MnAcuRTx0oHjHLDtyt3I6IBq', $this->api->getSecure());
+        $this->assertStringContainsString(Constants::TEST_ACCOUNT, $this->api->getAccount());
+        $this->assertStringContainsString(Constants::TEST_SECURE, $this->api->getSecure());
     }
 
     public function testAuthorize()
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
index 267a5b6..ffb9b43 100644
--- a/tests/ClientTest.php
+++ b/tests/ClientTest.php
@@ -14,6 +14,7 @@
 use CdekSDK2\Actions\Orders;
 use CdekSDK2\Actions\Webhooks;
 use CdekSDK2\BaseTypes\Invoice;
+use CdekSDK2\Constants;
 use CdekSDK2\Dto\RegionList;
 use CdekSDK2\Client;
 use CdekSDK2\Exceptions\ParsingException;
@@ -71,8 +72,8 @@ public function testSetTest(): Client
     {
         $this->client->setTest(true);
         $this->assertTrue($this->client->isTest());
-        $this->assertStringContainsString('z9GRRu7FxmO53CQ9cFfI6qiy32wpfTkd', $this->client->getAccount());
-        $this->assertStringContainsString('w24JTCv4MnAcuRTx0oHjHLDtyt3I6IBq', $this->client->getSecure());
+        $this->assertStringContainsString(Constants::TEST_ACCOUNT, $this->client->getAccount());
+        $this->assertStringContainsString(Constants::TEST_SECURE, $this->client->getSecure());
         return $this->client;
     }