Merge branch 'WP-90-main' into 'main'

fix: recreate branch from main

See merge request ecommerce_modules/cms/wordpress/wordpress!45

composer.json

@@ -42,7 +42,6 @@
   "require": {
     "php": "^7.4",
     "composer/installers": "~2.0",
-    "giggsey/libphonenumber-for-php": "^8.13",
     "paragonie/paserk": "^1.1",
     "paragonie/paseto": "^2.4"
   },

src/Actions/OrderCreateAction.php

@@ -193,8 +193,7 @@ private function createOrder(array $packages): array
         private function buildRequestData(): array
         {
             $countryCode     = $this->order->country ?: 'RU';
-            $recipientNumber = $this->order->phone;
-            PhoneValidator::new()($recipientNumber, $countryCode);
+            $recipientNumber = PhoneValidator::new()($this->order->phone, $countryCode);
 
             $deliveryMethod = $this->shipping->getMethod();
 

src/CoreApi.php

@@ -102,6 +102,21 @@ public function orderHistory(int $orderId): array
             )->data();
         }
 
+        /**
+         * @throws ApiException
+         * @throws CoreAuthException
+         * @throws \Cdek\Exceptions\CacheException
+         */
+        public function validatePhone(string $phone, ?string $country = null): string
+        {
+            return HttpClient::sendJsonRequest(
+                $this->getEndpoint('validate/phone'),
+                'GET',
+                $this->getToken(),
+                ['phone' => $phone, 'country' => $country],
+            )->data()['phone'];
+        }
+
         /**
          * @throws ShopRegistrationException
          * @throws CoreAuthException

src/Validator/PhoneValidator.php

@@ -9,25 +9,23 @@
 
 namespace Cdek\Validator {
 
+    use Cdek\CoreApi;
+    use Cdek\Exceptions\External\HttpClientException;
     use Cdek\Exceptions\InvalidPhoneException;
     use Cdek\Traits\CanBeCreated;
-    use libphonenumber\NumberParseException;
-    use libphonenumber\PhoneNumberUtil;
 
     class PhoneValidator
     {
         use CanBeCreated;
+
         /**
          * @throws \Cdek\Exceptions\InvalidPhoneException
          */
-        public function __invoke(string $phone, string $countryCode = null): void
+        public function __invoke(string $phone, string $countryCode = null): string
         {
-            $phoneNumUtil = PhoneNumberUtil::getInstance();
             try {
-                if (!$phoneNumUtil->isValidNumber($phoneNumUtil->parse($phone, $countryCode))) {
-                    throw new InvalidPhoneException($phone);
-                }
-            } catch (NumberParseException $e) {
+                return (new CoreApi)->validatePhone($phone, $countryCode);
+            } catch (HttpClientException $e) {
                 throw new InvalidPhoneException($phone);
             }
         }