Some refactoring and improvements

Author: gregoriohc

src/Exceptions/CouldNotSendNotification.php

@@ -24,6 +24,14 @@ public static function serviceRespondedWithAnException($exception)
      */
     public static function invalidMessageObject($class)
     {
-        return new static("Message object class `{$class}` is invalid. It should be either `".SmsMessage::class.'` or `'.CallMessage::class.'`');
+        return new static("Notification was not sent. Message object class `{$class}` is invalid. It should be either `".SmsMessage::class.'` or `'.CallMessage::class.'`');
+    }
+
+    /**
+     * @return static
+     */
+    public static function missingFrom()
+    {
+        return new static("Notification was not sent. Missing `from` number.");
     }
 }

src/CallMessage.php renamed to src/TwilioCallMessage.php

@@ -2,7 +2,7 @@
 
 namespace NotificationChannels\Twilio;
 
-class CallMessage
+class TwilioCallMessage
 {
     /**
      * The message TwiML url.

src/Channel.php renamed to src/TwilioChannel.php

@@ -8,7 +8,7 @@
 use NotificationChannels\Twilio\Exceptions\CouldNotSendNotification;
 use Services_Twilio;
 
-class Channel
+class TwilioChannel
 {
     /**
      * @var \Services_Twilio
@@ -34,22 +34,25 @@ public function send($notifiable, Notification $notification)
             return;
         }
 
-        $config = config('services.twilio');
-
         $message = $notification->toTwilio($notifiable);
 
         if (is_string($message)) {
-            $message = new SmsMessage($message);
+            // Default to SMS message if only a string is provided
+            $message = new TwilioSmsMessage($message);
         }
 
-        if (!$message instanceof SmsMessage::class &&
-            !$message instanceof CallMessage::class
+        if (!$message instanceof TwilioSmsMessage::class &&
+            !$message instanceof TwilioCallMessage::class
         ) {
             $class = get_class($message) ?: 'Unknown';
 
             throw CouldNotSendNotification::invalidMessageObject($class);
         }
 
+        if (!$from = $message->from ?: config('services.twilio.from')) {
+            throw CouldNotSendNotification::missingFrom();
+        }
+
         $shouldSendMessage = event(new SendingMessage($notifiable, $notification, $message), [], true) !== false;
 
         if (!$shouldSendMessage) {
@@ -58,17 +61,17 @@ public function send($notifiable, Notification $notification)
 
         $response = null;
 
-        /** @var SmsMessage|CallMessage $message */
+        /** @var TwilioSmsMessage|TwilioCallMessage $message */
         try {
-            if ($message instanceof SmsMessage::class) {
+            if ($message instanceof TwilioSmsMessage::class) {
                 $response = $this->twilio->account->messages->sendMessage(
-                    $message->from ?: $config['from'],
+                    $from,
                     $to,
                     trim($message->content)
                 );
-            } elseif ($message instanceof CallMessage::class) {
+            } elseif ($message instanceof TwilioCallMessage::class) {
                 $response = $this->twilio->account->calls->create(
-                    $message->from ?: $config['from'],
+                    $from,
                     $to,
                     trim($message->url)
                 );

src/Provider.php renamed to src/TwilioProvider.php

@@ -4,14 +4,14 @@
 
 use Illuminate\Support\ServiceProvider;
 
-class Provider extends ServiceProvider
+class TwilioProvider extends ServiceProvider
 {
     /**
      * Bootstrap the application services.
      */
     public function boot()
     {
-        $this->app->when(Channel::class)
+        $this->app->when(TwilioChannel::class)
             ->needs(\Services_Twilio::class)
             ->give(function () {
                 $config = config('services.twilio');

src/SmsMessage.php renamed to src/TwilioSmsMessage.php

@@ -2,7 +2,7 @@
 
 namespace NotificationChannels\Twilio;
 
-class SmsMessage
+class TwilioSmsMessage
 {
     /**
      * The message content.