Merge branch 'master' of github.com:arif98741/laravelbdsms

Author: arif98741

composer.json

@@ -15,7 +15,10 @@
     "autoload": {
         "psr-4": {
             "Xenon\\LaravelBDSms\\": "src/"
-        }
+        },
+        "files": [
+            "Helper/Helper.php"
+        ]
     },
     "extra": {
         "laravel": {

src/Helper/Helper.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Xenon\LaravelBDSms\Helper;
+
+class Helper
+{
+    public static function numberValidation($number)
+    {
+        $validCheckPattern = "/^(?:\+88|01)?(?:\d{11}|\d{13})$/";
+        if (preg_match($validCheckPattern, $number)) {
+            if (preg_match('/^(?:01)\d+$/', $number)) {
+                $number = '+88' . $number;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+}

src/Provider/DianaHost.php

@@ -15,6 +15,7 @@
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Http\JsonResponse;
 use Xenon\LaravelBDSms\Handler\RenderException;
+use Xenon\LaravelBDSms\Helper\Helper;
 use Xenon\LaravelBDSms\Sender;
 
 class DianaHost extends AbstractProvider
@@ -80,6 +81,11 @@ public function errorException()
         if (strlen($this->senderObject->getMobile()) > 11 || strlen($this->senderObject->getMobile()) < 11) {
             throw new RenderException('Invalid mobile number. It should be 11 digit');
         }
+
+        if (Helper::numberValidation($this->senderObject->getMobile()) == false) {
+            throw new RenderException('Invalid Mobile Number');
+        }
+
         if (empty($this->senderObject->getMessage())) {
             throw new RenderException('Message should not be empty');
         }

src/Provider/Ssl.php

@@ -11,11 +11,10 @@
 
 namespace Xenon\LaravelBDSms\Provider;
 
-
+use Xenon\LaravelBDSms\Helper\Helper;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\GuzzleException;
 use Xenon\LaravelBDSms\Handler\RenderException;
-use Xenon\LaravelBDSms\Handler\XenonException;
 use Xenon\LaravelBDSms\Sender;
 
 
@@ -86,6 +85,9 @@ public function errorException()
         if (strlen($this->senderObject->getMobile()) > 11 || strlen($this->senderObject->getMobile()) < 11)
             throw new RenderException('Invalid mobile number. It should be 11 digit');
 
+        if (Helper::numberValidation($this->senderObject->getMobile()) == false) {
+            throw new RenderException('Invalid Mobile Number');
+        }
         if (empty($this->senderObject->getMessage()))
             throw new RenderException('Message should not be empty');
 

src/Sender.php

@@ -15,6 +15,7 @@
 use Exception;
 use Xenon\LaravelBDSms\Handler\RenderException;
 use Xenon\LaravelBDSms\Handler\XenonException;
+use Xenon\LaravelBDSms\Handler\RenderException;
 
 class Sender
 {
@@ -84,6 +85,7 @@ public function getConfig()
      */
     public function setConfig($config): Sender
     {
+
         try {
             if (!is_array($config)) {
                 throw  new XenonException('config must be an array');