Compatibility with PHP8.3 & Laravel 12

README.md

@@ -3,14 +3,16 @@
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/robust-tools/resala.svg?style=flat-square)](https://packagist.org/packages/robust-tools/resala)
 [![Total Downloads](https://img.shields.io/packagist/dt/robust-tools/resala.svg?style=flat-square)](https://packagist.org/packages/robust-tools/resala)
 
-**Resala** is a PHP & Laravel Package, (Designed to add support to your laravel or just native php app for sending SMS using local operators in the MENA region Like `Vodafone`, `Infopib`, `Conneckio`, `VectoryLink`).  
+**Resala** is a PHP & Laravel Package, (Designed to add support to your laravel or just native php app for sending SMS using local operators in the MENA region Like `Vodafone`, `Infobip`, `Connekio`, `VectoryLink`, `Gateway SA`, `BrandEncode`).  
 **Resala** not just tied to use inside Laravel you can hook it up in any php code
 
 ## Supported Providers
 - Vodafone SMS Gateway
 - Connekio SMS Gateway
-- InfoPib SMS Gateway
+- Infobip SMS Gateway
 - Vectory Link SMS Gateway
+- Gateway SA SMS Gateway
+- BrandEncode SMS Gateway
 
 ## Installation
 
@@ -82,6 +84,24 @@ return [
             'sender_name' => env('VECTORY_LINK_SENDER_NAME', 'Vectory Link'),
             'lang' => env('VECTORY_LINK_LANG', 'E')
         ],
+
+        'gateway_sa' => [
+            'end_point' => env('GATEWAYSA_END_POINT', 'http://REST.GATEWAY.SA/api/SendSMS'),
+            'api_id' => env('GATEWAYSA_API_ID'),
+            'api_password' => env('GATEWAYSA_API_PASSWORD'),
+            'sms_type' => env('GATEWAYSA_SMS_TYPE', 'T'),
+            'encoding' => env('GATEWAYSA_ENCODING', 'T'),
+            'sender_id' => env('GATEWAYSA_SENDER_ID'),
+            'templateid' => env('GATEWAYSA_TEMPLATE_ID'),
+        ],
+
+        'brandencode' => [
+            'end_point' => env('BRANDENCODE_END_POINT'),
+            'username' => env('BRANDENCODE_USERNAME'),
+            'password' => env('BRANDENCODE_PASSWORD'),
+            'sender_name' => env('BRANDENCODE_SENDER_NAME', 'Brandencode'),
+            'lang' => env('BRANDENCODE_LANG', 'E')
+        ],
     ],
 
     /*
@@ -96,7 +116,9 @@ return [
         'vodafone' => VodafoneDriver::class,
         'connekio' => ConnekioDriver::class,
         'infobip' => InfobipDriver::class,
-        'vectory_link' => VectoryLink::class
+        'vectory_link' => VectoryLinkDriver::class,
+        'gateway_sa' => GatewaySA::class,
+        'brandencode' => BrandEncodeDriver::class
     ],
 ];
 ```
@@ -122,6 +144,16 @@ This adds `vectory_link` environment variables to your .env file.
 php artisan resala:make vectory_link
 ```
 
+This adds `brandencode` environment variables to your .env file.
+```bash
+php artisan resala:make brandencode
+```
+
+This adds `gateway_sa` environment variables to your .env file.
+```bash
+php artisan resala:make gateway_sa
+```
+
 ## Usage
 
 ``` php

composer.json

@@ -17,16 +17,16 @@
         }
     ],
     "require": {
-        "php": "^8.1|8.2",
+        "php": "^8.1|^8.2|^8.3",
         "ext-dom": "*",
         "ext-json": "*",
         "ext-simplexml": "*",
         "guzzlehttp/guzzle": "^7.5",
-        "illuminate/support": "^9.0|^10|^11.0"
+        "illuminate/support": "^9.0|^10.0|^11.0|^12.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^8.0.8",
-        "phpunit/phpunit": "^10.0"
+        "orchestra/testbench": "^8.0|^9.0|^10.0",
+        "phpunit/phpunit": "^10.0|^11.0"
     },
     "autoload": {
         "psr-4": {

src/Abstracts/Driver.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Abstracts;
 
 use RobustTools\Resala\Contracts\SMSDriverInterface;

src/Console/PublishProviderEnvVariablesCommand.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Console;
 
 use Illuminate\Console\Command;
@@ -86,5 +85,9 @@ private function getStubContent(): string
         if ($this->argument('driver') == "brandencode") {
             return File::get(__DIR__ . "/../../stubs/brandencode.env.stub");
         }
+
+        if ($this->argument('driver') == "gateway_sa") {
+            return File::get(__DIR__ . "/../../stubs/gateway_sa.env.stub");
+        }
     }
 }

src/Contracts/SMSDriverInterface.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Contracts;
 
 interface SMSDriverInterface

src/Contracts/SMSDriverResponseInterface.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Contracts;
 
 use Psr\Http\Message\ResponseInterface;

src/Drivers/BrandEncodeDriver.php

@@ -1,10 +1,8 @@
 <?php
-
 namespace RobustTools\Resala\Drivers;
 
 use RobustTools\Resala\Abstracts\Driver;
-use RobustTools\Resala\Contracts\SMSDriverInterface;
-use RobustTools\Resala\Contracts\SMSDriverResponseInterface;
+use RobustTools\Resala\Contracts\{SMSDriverInterface, SMSDriverResponseInterface};
 use RobustTools\Resala\Response\BrandEncodeResponse;
 use RobustTools\Resala\Support\HTTP;
 

src/Drivers/ConnekioDriver.php

@@ -1,10 +1,8 @@
 <?php
-
 namespace RobustTools\Resala\Drivers;
 
 use RobustTools\Resala\Abstracts\Driver;
-use RobustTools\Resala\Contracts\SMSDriverInterface;
-use RobustTools\Resala\Contracts\SMSDriverResponseInterface;
+use RobustTools\Resala\Contracts\{SMSDriverInterface, SMSDriverResponseInterface};
 use RobustTools\Resala\Response\ConnekioResponse;
 use RobustTools\Resala\Support\HTTP;
 
@@ -67,7 +65,7 @@ protected function payload(): string
         ];
 
         $this->toMultiple($this->recipients) ? $payload['mobile_list'] = array_map(
-            fn($recipient) => ['msisdn' => $this->formatPhoneNumber($recipient)],
+            fn ($recipient) => ['msisdn' => $this->formatPhoneNumber($recipient)],
             $this->recipients
         ) : $payload["msisdn"] = $this->formatPhoneNumber($this->recipients);
 
@@ -86,13 +84,6 @@ protected function headers(): array
         ];
     }
 
-    private function endpoint(): string
-    {
-        return $this->toMultiple($this->recipients)
-            ? $this->batchSmsEndPoint
-            : $this->singleSmsEndPoint;
-    }
-
     protected function formatPhoneNumber($phoneNumber): string
     {
         if (substr($phoneNumber, 0, 1) == '0') {
@@ -101,4 +92,11 @@ protected function formatPhoneNumber($phoneNumber): string
 
         return $phoneNumber;
     }
+
+    private function endpoint(): string
+    {
+        return $this->toMultiple($this->recipients)
+            ? $this->batchSmsEndPoint
+            : $this->singleSmsEndPoint;
+    }
 }

src/Drivers/GatewaySA.php

@@ -1,10 +1,8 @@
 <?php
-
 namespace RobustTools\Resala\Drivers;
 
 use RobustTools\Resala\Abstracts\Driver;
-use RobustTools\Resala\Contracts\SMSDriverInterface;
-use RobustTools\Resala\Contracts\SMSDriverResponseInterface;
+use RobustTools\Resala\Contracts\{SMSDriverInterface, SMSDriverResponseInterface};
 use RobustTools\Resala\Response\GatewaySAResponse;
 use RobustTools\Resala\Support\HTTP;
 

src/Drivers/InfobipDriver.php

@@ -1,10 +1,8 @@
 <?php
-
 namespace RobustTools\Resala\Drivers;
 
 use RobustTools\Resala\Abstracts\Driver;
-use RobustTools\Resala\Contracts\SMSDriverInterface;
-use RobustTools\Resala\Contracts\SMSDriverResponseInterface;
+use RobustTools\Resala\Contracts\{SMSDriverInterface, SMSDriverResponseInterface};
 use RobustTools\Resala\Response\InfobipResponse;
 use RobustTools\Resala\Support\HTTP;
 

src/Drivers/VectoryLinkDriver.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Drivers;
 
 use RobustTools\Resala\Abstracts\Driver;
@@ -72,6 +71,13 @@ protected function payload(): array
         ];
     }
 
+    protected function headers(): array
+    {
+        return [
+            'Content-Type' => 'application/json',
+        ];
+    }
+
     private function generateGuid(): string
     {
         $data = random_bytes(16);
@@ -80,11 +86,4 @@ private function generateGuid(): string
 
         return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
     }
-
-    protected function headers(): array
-    {
-        return [
-            'Content-Type' => 'application/json',
-        ];
-    }
 }

src/Drivers/VodafoneDriver.php

@@ -1,14 +1,10 @@
 <?php
-
 namespace RobustTools\Resala\Drivers;
 
 use RobustTools\Resala\Abstracts\Driver;
-use RobustTools\Resala\Contracts\SMSDriverInterface;
-use RobustTools\Resala\Contracts\SMSDriverResponseInterface;
+use RobustTools\Resala\Contracts\{SMSDriverInterface, SMSDriverResponseInterface};
 use RobustTools\Resala\Response\VodafoneResponse;
-use RobustTools\Resala\Support\HTTP;
-use RobustTools\Resala\Support\VodafonePayloadBuilder;
-
+use RobustTools\Resala\Support\{HTTP, VodafonePayloadBuilder};
 final class VodafoneDriver extends Driver implements SMSDriverInterface
 {
     /** @var string|array */

src/Facades/SMS.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Facades;
 
 use Illuminate\Support\Facades\Facade;

src/Factories/SMSDriverFactory.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Factories;
 
 use RobustTools\Resala\Contracts\SMSDriverInterface;

src/Response/BrandEncodeResponse.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Response;
 
 use Psr\Http\Message\ResponseInterface;

src/Response/ConnekioResponse.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Response;
 
 use Psr\Http\Message\ResponseInterface;

src/Response/GatewaySAResponse.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Response;
 
 use Psr\Http\Message\ResponseInterface;

src/Response/InfobipResponse.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Response;
 
 use Psr\Http\Message\ResponseInterface;

src/Response/VectoryLinkResponse.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Response;
 
 use Psr\Http\Message\ResponseInterface;
@@ -36,14 +35,6 @@ public function __construct(ResponseInterface $response)
         $this->status = $this->parseStatus($contents);
     }
 
-    private function parseStatus(string $contents): int
-    {
-        if ($contents === '' || !is_numeric($contents)) {
-            return self::STATUS_OTHER_ERROR;
-        }
-        return (int) $contents;
-    }
-
     public function success(): bool
     {
         return $this->status === self::STATUS_SUCCESS;
@@ -76,4 +67,13 @@ public function body(): string
 
         return $messages[$this->status] ?? 'Something wrong happened';
     }
+
+    private function parseStatus(string $contents): int
+    {
+        if ($contents === '' || !is_numeric($contents)) {
+            return self::STATUS_OTHER_ERROR;
+        }
+
+        return (int) $contents;
+    }
 }

src/Response/VodafoneResponse.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Response;
 
 use Psr\Http\Message\ResponseInterface;

src/SMS.php

@@ -1,9 +1,7 @@
 <?php
-
 namespace RobustTools\Resala;
 
-use RobustTools\Resala\Contracts\SMSDriverInterface;
-use RobustTools\Resala\Contracts\SMSDriverResponseInterface;
+use RobustTools\Resala\Contracts\{SMSDriverInterface, SMSDriverResponseInterface};
 use RobustTools\Resala\Factories\SMSDriverFactory;
 
 final class SMS

src/SMSServiceProvider.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala;
 
 use Illuminate\Support\ServiceProvider;

src/Support/Config.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Support;
 
 use InvalidArgumentException;

src/Support/ConfigRepository.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Support;
 
 use ArrayAccess;

src/Support/HTTP.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Support;
 
 use GuzzleHttp\Client;

src/Support/VodafonePayloadBuilder.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RobustTools\Resala\Support;
 
 use DOMAttr;

stubs/gateway_sa.env.stub

@@ -0,0 +1,7 @@
+GATEWAYSA_END_POINT=http://REST.GATEWAY.SA/api/SendSMS
+GATEWAYSA_API_ID=
+GATEWAYSA_API_PASSWORD=
+GATEWAYSA_SMS_TYPE=T
+GATEWAYSA_ENCODING=T
+GATEWAYSA_SENDER_ID=
+GATEWAYSA_TEMPLATE_ID=