use seven client; require php8.2

seven-io · Nov 22, 2024 · 07aae0f · 07aae0f
1 parent 9c0996c
commit 07aae0f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -44,8 +44,8 @@
     "name": "seven.io/sylius",
     "prefer-stable": true,
     "require": {
-        "php": "^8.0",
-        "sms77/api": "v2.5.0",
+        "php": "^8.2",
+        "seven.io/api": "v5.0.0",
         "sylius/sylius": "~1.09.0 || ~1.10.0 || ~1.11.0 || ~1.12.0 || ~1.13.0 || ~1.14.0"
     },
     "require-dev": {

diff --git a/src/Api/Client.php b/src/Api/Client.php
@@ -2,7 +2,8 @@
 
 namespace Seven\SyliusPlugin\Api;
 
-use Sms77\Api\Client as ApiClient;
+use Seven\Api\Client as ApiClient;
+use Seven\Api\Resource\Sms\SmsResource;
 use Seven\SyliusPlugin\Entity\Config;
 use Seven\SyliusPlugin\Repository\ConfigRepository;
 use Sylius\Component\Core\Model\OrderInterface;
@@ -35,7 +36,7 @@ public function sms($data): void {
             ->setText($text)
             ->setTo($to);
 
-        $client->sms($params);
+        (new SmsResource($client))->dispatch($params);
     }
 
     private function orderToPhone(OrderInterface $order): ?string {

diff --git a/src/Controller/AbstractController.php b/src/Controller/AbstractController.php
@@ -3,9 +3,11 @@
 namespace Seven\SyliusPlugin\Controller;
 
 use FOS\RestBundle\View\View;
-use Sms77\Api\Client;
-use Sms77\Api\Params\SmsParams;
-use Sms77\Api\Params\VoiceParams;
+use Seven\Api\Client;
+use Seven\Api\Resource\Sms\SmsParams;
+use Seven\Api\Resource\Sms\SmsResource;
+use Seven\Api\Resource\Voice\VoiceParams;
+use Seven\Api\Resource\Voice\VoiceResource;
 use Seven\SyliusPlugin\Entity\AbstractMessage;
 use Seven\SyliusPlugin\Entity\Config;
 use Seven\SyliusPlugin\Entity\Message;
@@ -131,7 +133,9 @@ private function getApiResponse(AbstractMessage $newResource): array {
                 $params = clone $params;
                 $params->setText($text);
                 $params->setTo($to);
-                $responses[] = $client->{$isSMS ? 'smsJson' : 'voiceJson'}($params);
+                $responses[] = $isSMS
+                    ? (new SmsResource($client))->dispatch($params)
+                    : (new VoiceResource($client))->call($params);
             }
         }
 

diff --git a/src/Controller/SmsController.php b/src/Controller/SmsController.php
@@ -2,12 +2,12 @@
 
 namespace Seven\SyliusPlugin\Controller;
 
-use Sms77\Api\Params\SmsParams;
+use Seven\Api\Resource\Sms\SmsParams;
 use Seven\SyliusPlugin\Entity\Config;
 
 class SmsController extends AbstractController {
     protected function buildParams(Config $cfg): SmsParams {
-        $params = new SmsParams;
+        $params = new SmsParams('', '');
 
         $params->setDelay($cfg->getDelay());
         $params->setFlash($cfg->getFlash());

diff --git a/src/Controller/VoiceController.php b/src/Controller/VoiceController.php
@@ -2,12 +2,12 @@
 
 namespace Seven\SyliusPlugin\Controller;
 
-use Sms77\Api\Params\VoiceParams;
+use Seven\Api\Resource\Voice\VoiceParams;
 use Seven\SyliusPlugin\Entity\Config;
 
 class VoiceController extends AbstractController {
     protected function buildParams(Config $cfg): VoiceParams {
-        $params = new VoiceParams;
+        $params = new VoiceParams('', '');
 
         return $params;
     }

diff --git a/src/Entity/Config.php b/src/Entity/Config.php
@@ -10,8 +10,8 @@
 use Doctrine\ORM\Mapping\GeneratedValue;
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\Table;
-use Sms77\Api\Params\SmsParams;
-use Sms77\Api\Params\VoiceParams;
+use Seven\Api\Resource\Sms\SmsParams;
+use Seven\Api\Resource\Voice\VoiceParams;
 use Sylius\Component\Resource\Model\ResourceInterface;
 use Sylius\Component\Resource\Model\TranslatableInterface;
 use Sylius\Component\Resource\Model\TranslatableTrait;
@@ -205,7 +205,7 @@ public function getShippingText(): ?string {
     }
 
     public function getSmsParams(): SmsParams {
-        return (new SmsParams)
+        return (new SmsParams('', ''))
             ->setDelay($this->getDelay())
             ->setFlash($this->getFlash())
             ->setForeignId($this->getForeignId())
@@ -218,7 +218,7 @@ public function getSmsParams(): SmsParams {
     }
 
     public function getVoiceParams(): VoiceParams {
-        return (new VoiceParams)
+        return (new VoiceParams('', ''))
             ->setFrom($this->getFrom())
             ;
     }