1.0.1

MianSaleem · MianSaleem · commit f210a7d49a62 · 2018-03-22T19:43:28.000+08:00
diff --git a/composer.json b/composer.json
@@ -11,14 +11,13 @@
     ],
     "require": {
         "php": ">=7.0.28",
-        "guzzlehttp/guzzle": "^6.3@dev",
-        "monolog/monolog": "^2.0@dev",
-        "brick/phonenumber": "dev-master"
+        "guzzlehttp/guzzle": "^6.3.0",
+        "monolog/monolog": "^1.23.0",
+        "brick/phonenumber": "^0.2.0"
     },
     "autoload": {
         "psr-4": {
             "Tecdiary\\Sms\\": "src/"
         }
-    },
-    "minimum-stability": "dev"
+    }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/demo/index.php b/demo/index.php
@@ -13,7 +13,7 @@
 
 $sms = new \Tecdiary\Sms\Sms($config);
 
-$result = $sms->send(['+919090909090', '009190909090901'], 'This is test message for Log gateway.');
+$result = $sms->send(['+919090909090', '009190909090901'], 'This is test message for Log gateway.')->response();
 ?><html>
 <head>
     <meta charset="UTF-8">
@@ -23,6 +23,6 @@
     <pre/>
 
     TECDIARY/SMS DEMO
-    <?php var_dump($result->status, $result->response); ?>
+    <?php var_dump($result); ?>
 </body>
 </html>
diff --git a/src/Gateways/MVaayooGateway.php b/src/Gateways/MVaayooGateway.php
@@ -8,26 +8,25 @@ class MVaayooGateway implements SmsGatewayInterface
     public $logger;
     public $response = '';
 
-    protected $gwvars = [];
+    protected $params = [];
     protected $request = '';
-    protected $status = false;
     protected $url = 'http://api.mVaayoo.com/mvaayooapi/MessageCompose?';
 
     public function __construct($config, $logger)
     {
         $this->config = $config;
         $this->logger = $logger;
-        $this->gwvars['receipientno'] = '';
-        $this->gwvars['msgtxt'] = '';
-        $this->gwvars['senderID'] = $this->config[$this->config['gateway']]['senderID'];
-        $this->gwvars['user'] = $this->config[$this->config['gateway']]['user'];
-        $this->gwvars['msgtype'] = 0;
-        $this->gwvars['state'] = 4;
+        $this->params['receipientno'] = '';
+        $this->params['msgtxt'] = '';
+        $this->params['senderID'] = $this->config[$this->config['gateway']]['senderID'];
+        $this->params['user'] = $this->config[$this->config['gateway']]['user'];
+        $this->params['msgtype'] = 0;
+        $this->params['state'] = 4;
     }
 
     public function getUrl()
     {
-        foreach ($this->gwvars as $key => $val) {
+        foreach ($this->params as $key => $val) {
             $this->request.= $key."=".urlencode($val);
             $this->request.= "&";
         }
@@ -37,8 +36,8 @@ public function getUrl()
 
     public function sendSms($mobile, $message)
     {
-        $this->gwvars['receipientno'] = $mobile;
-        $this->gwvars['msgtxt'] = $message;
+        $this->params['receipientno'] = $mobile;
+        $this->params['msgtxt'] = $message;
         $client = new \GuzzleHttp\Client();
         $this->response = $client->get($this->getUrl())->getBody()->getContents();
         $this->logger->info('MVaayoo Response: '.$this->response);
@@ -47,10 +46,6 @@ public function sendSms($mobile, $message)
 
     public function response()
     {
-        $status = explode(',', $this->response);
-        if (trim($status[0]) == 'Status=0') {
-            $this->status = true;
-        }
-        return ['status' => $this->status, 'response' => $this->response];
+        return $this->response;
     }
 }
diff --git a/src/Gateways/NexmoGateway.php b/src/Gateways/NexmoGateway.php
@@ -33,9 +33,9 @@ public function getUrl()
         return $this->url;
     }
 
-    public function sendSms($mobiles, $message)
+    public function sendSms($mobile, $message)
     {
-        $mobiles = explode(',', $mobiles);
+        $mobiles = explode(',', $mobile);
         $this->composeBulkMobile($mobiles, $message);
         return $this;
     }
diff --git a/src/Sms.php b/src/Sms.php
@@ -6,6 +6,7 @@ class Sms
 {
     public $logger;
     public $gateway;
+    public $status = false;
 
     public function __construct($config)
     {
@@ -19,7 +20,7 @@ public function send($phone_numbers, $message)
         if ($phone_numbers = $this->composeBulkNumbers($phone_numbers)) {
             return $this->gateway->sendSms($phone_numbers, $message);
         }
-        return (object) ['status' => false, 'response' => 'The provided phone number(s) were not valid.'];
+        return $this;
     }
 
     public function composeBulkNumbers($phone_numbers)
@@ -44,4 +45,9 @@ public function composeBulkNumbers($phone_numbers)
         $numbers = implode(',', $new_phone_numbers);
         return $numbers;
     }
+
+    public function response()
+    {
+        return $this->status;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ public function getUrl()`
`33`	`33`	`return $this->url;`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function sendSms($mobiles, $message)`
	`36`	`+ public function sendSms($mobile, $message)`
`37`	`37`	`{`
`38`		`- $mobiles = explode(',', $mobiles);`
	`38`	`+ $mobiles = explode(',', $mobile);`
`39`	`39`	`$this->composeBulkMobile($mobiles, $message);`
`40`	`40`	`return $this;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ class Sms`
`6`	`6`	`{`
`7`	`7`	`public $logger;`
`8`	`8`	`public $gateway;`
	`9`	`+ public $status = false;`
`9`	`10`
`10`	`11`	`public function __construct($config)`
`11`	`12`	`{`
`@@ -19,7 +20,7 @@ public function send($phone_numbers, $message)`
`19`	`20`	`if ($phone_numbers = $this->composeBulkNumbers($phone_numbers)) {`
`20`	`21`	`return $this->gateway->sendSms($phone_numbers, $message);`
`21`	`22`	`}`
`22`		`- return (object) ['status' => false, 'response' => 'The provided phone number(s) were not valid.'];`
	`23`	`+ return $this;`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`public function composeBulkNumbers($phone_numbers)`
`@@ -44,4 +45,9 @@ public function composeBulkNumbers($phone_numbers)`
`44`	`45`	`$numbers = implode(',', $new_phone_numbers);`
`45`	`46`	`return $numbers;`
`46`	`47`	`}`
	`48`	`+`
	`49`	`+ public function response()`
	`50`	`+ {`
	`51`	`+ return $this->status;`
	`52`	`+ }`
`47`	`53`	`}`