Allow optional "from" when sending SMS using "messagingServiceSid"

Author: gregoriohc

src/Twilio.php

@@ -36,7 +36,7 @@ public function __construct(TwilioService $twilioService, TwilioConfig $config)
      * @param  string $to
      * @param bool $useAlphanumericSender
      * @return mixed
-     * @throws CouldNotSendNotification
+     * @throws \Twilio\Exceptions\TwilioException
      */
     public function sendMessage(TwilioMessage $message, $to, $useAlphanumericSender = false)
     {
@@ -61,17 +61,23 @@ public function sendMessage(TwilioMessage $message, $to, $useAlphanumericSender
      * @param TwilioSmsMessage $message
      * @param string $to
      * @return \Twilio\Rest\Api\V2010\Account\MessageInstance
-     * @throws CouldNotSendNotification
      */
     protected function sendSmsMessage(TwilioSmsMessage $message, $to)
     {
         $params = [
-            'from' => $this->getFrom($message),
             'body' => trim($message->content),
         ];
 
-        if ($serviceSid = $this->config->getServiceSid()) {
-            $params['messagingServiceSid'] = $serviceSid;
+        if ($messagingServiceSid = $this->getMessagingServiceSid($message)) {
+            $params['messagingServiceSid'] = $messagingServiceSid;
+        }
+
+        if ($from = $this->getFrom($message)) {
+            $params['from'] = $from;
+        }
+
+        if (!$from && !$messagingServiceSid) {
+            throw CouldNotSendNotification::missingFrom();
         }
 
         $this->fillOptionalParams($params, $message, [
@@ -98,7 +104,7 @@ protected function sendSmsMessage(TwilioSmsMessage $message, $to)
      * @param TwilioCallMessage $message
      * @param string $to
      * @return \Twilio\Rest\Api\V2010\Account\CallInstance
-     * @throws CouldNotSendNotification
+     * @throws \Twilio\Exceptions\TwilioException
      */
     protected function makeCall(TwilioCallMessage $message, $to)
     {
@@ -115,9 +121,13 @@ protected function makeCall(TwilioCallMessage $message, $to)
             'fallbackMethod',
         ]);
 
+        if (! $from = $this->getFrom($message)) {
+            throw CouldNotSendNotification::missingFrom();
+        }
+
         return $this->twilioService->calls->create(
             $to,
-            $this->getFrom($message),
+            $from,
             $params
         );
     }
@@ -127,15 +137,21 @@ protected function makeCall(TwilioCallMessage $message, $to)
      *
      * @param TwilioMessage $message
      * @return string
-     * @throws CouldNotSendNotification
      */
     protected function getFrom(TwilioMessage $message)
     {
-        if (! $from = $message->getFrom() ?: $this->config->getFrom()) {
-            throw CouldNotSendNotification::missingFrom();
-        }
+        return $message->getFrom() ?: $this->config->getFrom();
+    }
 
-        return $from;
+    /**
+     * Get the messaging service SID from message, or config.
+     *
+     * @param TwilioSmsMessage $message
+     * @return string
+     */
+    protected function getMessagingServiceSid(TwilioSmsMessage $message)
+    {
+        return $message->getMessagingServiceSid() ?: $this->config->getServiceSid();
     }
 
     /**
@@ -148,13 +164,15 @@ protected function getAlphanumericSender()
         if ($sender = $this->config->getAlphanumericSender()) {
             return $sender;
         }
+
+        return null;
     }
 
     /**
      * @param array $params
      * @param TwilioMessage $message
      * @param array $optionalParams
-     * @return mixed
+     * @return Twilio
      */
     protected function fillOptionalParams(&$params, $message, $optionalParams)
     {
@@ -163,5 +181,7 @@ protected function fillOptionalParams(&$params, $message, $optionalParams)
                 $params[$optionalParam] = $message->$optionalParam;
             }
         }
+
+        return $this;
     }
 }

src/TwilioSmsMessage.php

@@ -9,6 +9,11 @@ class TwilioSmsMessage extends TwilioMessage
      */
     public $alphaNumSender = null;
 
+    /**
+     * @var null|string
+     */
+    public $messagingServiceSid = null;
+
     /**
      * @var null|string
      */
@@ -43,6 +48,31 @@ public function getFrom()
         if ($this->alphaNumSender && strlen($this->alphaNumSender) > 0) {
             return $this->alphaNumSender;
         }
+
+        return null;
+    }
+
+    /**
+     * Set the messaging service SID.
+     *
+     * @param  string $messagingServiceSid
+     * @return $this
+     */
+    public function messagingServiceSid($messagingServiceSid)
+    {
+        $this->messagingServiceSid = $messagingServiceSid;
+
+        return $this;
+    }
+
+    /**
+     * Get the messaging service SID of this message.
+     *
+     * @return null|string
+     */
+    public function getMessagingServiceSid()
+    {
+        return $this->messagingServiceSid;
     }
 
     /**

tests/TwilioTest.php

@@ -213,6 +213,10 @@ public function it_will_throw_an_exception_in_case_of_a_missing_from_number()
             ->once()
             ->andReturn(null);
 
+        $this->config->shouldReceive('getServiceSid')
+            ->once()
+            ->andReturn(null);
+
         $this->twilio->sendMessage($smsMessage, null);
     }