Merge branch 'master' into dev

composer.json

@@ -11,11 +11,13 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "guzzlehttp/guzzle": "^6.3"
+        "guzzlehttp/guzzle": "^6.3|^7.2",
+        "ext-curl": "*",
+        "ext-mbstring": "*"
     },
     "autoload": {
         "psr-4": {
-            "Xenon\\": "src/"
+            "Xenon\\Multisms\\": "src/"
         }
     },
     "autoload-dev": {

readme.md

@@ -10,8 +10,8 @@ composer require xenon/multisms
 ### Sample Code
 
 <pre>
-use Xenon\Provider\BulkSmsBD;
-use Xenon\Sender;
+use Xenon\Multisms\Provider\BulkSmsBD;
+use Xenon\Multisms\Sender;
 
 require 'vendor/autoload.php';
 

src/Config/Configuration.php

@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Xenon\Config;
+namespace Xenon\Multisms\Config;
 
 
 class Configuration
 {
-
+    //todo:: write something here
 }

src/Handler/Formatter.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Xenon\Handler;
+namespace Xenon\Multisms\Handler;
 
 
 class Formatter

src/Provider/AbstractProvider.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
 abstract class AbstractProvider implements ProviderRoadmap

src/Provider/Alpha.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
 class Alpha implements ProviderRoadmap

src/Provider/BDBulkSms.php

@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
-use Xenon\Handler\XenonException;
-use Xenon\Sender;
+use Xenon\Multisms\Handler\XenonException;
+use Xenon\Multisms\Sender;
 
 class BDBulkSms extends AbstractProvider
 {

src/Provider/BulkSmsBD.php

@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
-use Xenon\Handler\XenonException;
-use Xenon\Sender;
+use Xenon\Multisms\Handler\XenonException;
+use Xenon\Multisms\Sender;
 
 class BulkSmsBD extends AbstractProvider
 {

src/Provider/DianaHost.php

@@ -1,13 +1,13 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
 use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Config;
-use Xenon\Handler\XenonException;
-use Xenon\Sender;
+use Xenon\Multisms\Handler\XenonException;
+use Xenon\Multisms\Sender;
 use function Couchbase\defaultDecoder;
 
 class DianaHost extends AbstractProvider

src/Provider/DnsBd.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
 class DnsBd extends AbstractProvider

src/Provider/GreenWeb.php

@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
-use Xenon\Handler\XenonException;
-use Xenon\Sender;
+use Xenon\Multisms\Handler\XenonException;
+use Xenon\Multisms\Sender;
 
 class GreenWeb extends AbstractProvider
 {

src/Provider/MDL.php

@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
-use Xenon\Handler\XenonException;
-use Xenon\Sender;
+use Xenon\Multisms\Handler\XenonException;
+use Xenon\Multisms\Sender;
 
 class MDL extends AbstractProvider
 {

src/Provider/Mim.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
-use Xenon\Handler\XenonException;
-use Xenon\Sender;
+use Xenon\Multisms\Handler\XenonException;
+use Xenon\Multisms\Sender;
 
 class Mim extends AbstractProvider
 {
@@ -19,6 +19,7 @@ public function __construct(Sender $sender)
 
     /**
      * Send Request To Api and Send Message
+     * @throws XenonException
      */
     public function sendRequest(): array
     {

src/Provider/Onnorokom.php

@@ -1,12 +1,12 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
 use SoapClient;
-use Xenon\Handler\XenonException;
-use Xenon\Sender;
+use Xenon\Multisms\Handler\XenonException;
+use Xenon\Multisms\Sender;
 
 class Onnorokom extends AbstractProvider
 {

src/Provider/ProviderRoadmap.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
 interface ProviderRoadmap

src/Provider/Sms4BD.php

@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
-use Xenon\Sender;
+use Xenon\Multisms\Sender;
 
 class Sms4BD implements ProviderRoadmap
 {

src/Provider/Ssl.php

@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Xenon\Provider;
+namespace Xenon\Multisms\Provider;
 
 
-use Xenon\Handler\XenonException;
-use Xenon\Sender;
+use Xenon\Multisms\Handler\XenonException;
+use Xenon\Multisms\Sender;
 
 class Ssl extends AbstractProvider
 {

src/Sender.php

@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Xenon;
+namespace Xenon\Multisms;
 
 
 use Exception;
-use Xenon\Handler\XenonException;
+use Xenon\Multisms\Handler\XenonException;
 
 class Sender
 {
@@ -42,29 +42,27 @@ public function getConfig()
      */
     public function setConfig($config): Sender
     {
-        try {
-            if (!is_array($config)) {
-                throw  new XenonException('config must be an array');
-            }
-            $this->config = $config;
-        } catch (XenonException $e) {
-            $e->showException();
+        if (!is_array($config)) {
+            throw  new XenonException('config must be an array');
         }
 
+        $this->config = $config;
+
         return $this;
     }
 
 
     /**
      * Send Message Finally
+     * @throws XenonException
      */
     public function send()
     {
         try {
             $this->provider->errorException();
             return $this->provider->sendRequest();
         } catch (XenonException $exception) {
-            $exception->showException();
+            throw new XenonException($exception->getMessage());
         }
     }
 
@@ -107,11 +105,17 @@ public function setMessage($message = ''): Sender
     /**
      * @param mixed $provider
      * @return Sender
+     * @throws XenonException
      */
     public function setProvider($provider): Sender
     {
-        $this->provider = $provider;
-        return self::getInstance();
+        if (!class_exists($provider)) {
+            throw new XenonException('Provider ' . $provider . ' not found');
+        }
+
+        $this->provider = new $provider($this);
+
+        return $this;
     }
 
 
@@ -123,23 +127,4 @@ public function getProvider()
         return $this->provider;
     }
 
-    /**
-     * Return this class object
-     * @param $ProviderClass
-     * @return Sender
-     */
-    public function selectProvider($ProviderClass): Sender
-    {
-        try {
-            if (!class_exists($ProviderClass)) {
-                throw new XenonException('Provider ' . $ProviderClass . ' not found');
-            }
-        } catch (XenonException $exception) {
-            $exception->showException($ProviderClass);
-        }
-
-        $this->provider = new $ProviderClass($this);
-        return $this;
-    }
-
 }