Merge pull request #1 from devimteam/develop

Develop
devimteam · Oct 28, 2016 · d13e538 · d13e538
2 parents 3e752f7 + 8ac5829
commit d13e538
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/src/MttServiceProvider.php b/src/MttServiceProvider.php
@@ -23,10 +23,9 @@ public function register(Container $container)
     {
         $container['mtt.login'] = '';
         $container['mtt.password'] = '';
-        $container['mtt.short_code'] = '';
 
         $container['mtt.sender'] = function () use ($container) {
-            return new MttSmsSender($container['mtt.login'], $container['mtt.password'], $container['mtt.short_code']);
+            return new MttSmsSender($container['mtt.login'], $container['mtt.password']);
         };
     }
 }
diff --git a/src/Sender/MttSmsSender.php b/src/Sender/MttSmsSender.php
@@ -22,39 +22,33 @@ class MttSmsSender implements SmsSenderInterface
      */
     private $password;
 
-    /**
-     * @var string
-     */
-    private $shortCode;
-
     /**
      * MttSmsSender constructor.
      *
      * @param string $login
      * @param string $password
-     * @param string $shortCode
      */
-    public function __construct(string $login, string $password, string $shortCode)
+    public function __construct(string $login, string $password)
     {
         $this->login = $login;
         $this->password = $password;
-        $this->shortCode = $shortCode;
     }
 
     /**
      * Send SMS.
      *
      * @param string $to
      * @param string $message
+     * @param string $shortCode
      *
      * @return mixed
      *
      * @throws \Devim\Provider\MttServiceProvider\Sender\Exception\SmsErrorException
      * @throws \Devim\Provider\MttServiceProvider\Sender\Exception\SmsSendException
      */
-    public function send(string $to, string $message)
+    public function send(string $to, string $message, string $shortCode)
     {
-        $url = self::SMS_POOL_URL . '?' . $this->buildQuery($to, $message);
+        $url = self::SMS_POOL_URL . '?' . $this->buildQuery($to, $message, $shortCode);
 
         $request = curl_init($url);
         curl_setopt($request, CURLOPT_RETURNTRANSFER, true);
@@ -75,17 +69,18 @@ public function send(string $to, string $message)
     /**
      * @param string $to
      * @param string $message
+     * @param string $shortCode
      *
      * @return string
      */
-    final private function buildQuery(string $to, string $message) : string
+    final private function buildQuery(string $to, string $message, string $shortCode) : string
     {
         return http_build_query([
             'login' => $this->login,
             'password' => $this->password,
             'msisdn' => $to,
             'text' => $message,
-            'shortcode' => $this->shortCode,
+            'shortcode' => $shortCode,
             'operation' => 'send',
         ]);
     }

diff --git a/src/Sender/NullSmsSender.php b/src/Sender/NullSmsSender.php
@@ -12,10 +12,11 @@ class NullSmsSender implements SmsSenderInterface
      *
      * @param string $to
      * @param string $message
+     * @param string $shortCode
      *
      * @return void
      */
-    public function send(string $to, string $message)
+    public function send(string $to, string $message, string $shortCode)
     {
         return;
     }

diff --git a/src/Sender/SmsSenderInterface.php b/src/Sender/SmsSenderInterface.php
@@ -12,8 +12,9 @@ interface SmsSenderInterface
      *
      * @param string $to
      * @param string $message
+     * @param string $shortCode
      *
      * @return mixed
      */
-    public function send(string $to, string $message);
+    public function send(string $to, string $message, string $shortCode);
 }