Some abstraction, code cleaning and improvement

Author: gregoriohc

README.md

@@ -101,7 +101,7 @@ class AccountApproved extends Notification
 }
 ```
 
-In order to let your Notification know which phone are you sending/calling to, add the `routeNotificationForTwilio` method to your Notifiable model.
+In order to let your Notification know which phone are you sending/calling to, the channel will look for the `phone_number` attribute of the Notifiable model. If you want to override this behaviour, add the `routeNotificationForTwilio` method to your Notifiable model.
 
 ```php
 public function routeNotificationForTwilio()

src/TwilioAbstractMessage.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace NotificationChannels\Twilio;
+
+abstract class TwilioAbstractMessage
+{
+    /**
+     * The message content.
+     *
+     * @var string
+     */
+    public $content;
+
+    /**
+     * The phone number the message should be sent from.
+     *
+     * @var string
+     */
+    public $from;
+
+    /**
+     * @param string $content
+     *
+     * @return static
+     */
+    public static function create($content = '')
+    {
+        return new static($content);
+    }
+
+    /**
+     * Create a new message instance.
+     *
+     * @param  string  $content
+     */
+    public function __construct($content = '')
+    {
+        $this->content = $content;
+    }
+
+    /**
+     * Set the message content.
+     *
+     * @param  string  $content
+     *
+     * @return $this
+     */
+    public function content($content)
+    {
+        $this->content = $content;
+
+        return $this;
+    }
+
+    /**
+     * Set the phone number the message should be sent from.
+     *
+     * @param  string  $from
+     *
+     * @return $this
+     */
+    public function from($from)
+    {
+        $this->from = $from;
+
+        return $this;
+    }
+}

src/TwilioCallMessage.php

@@ -2,66 +2,18 @@
 
 namespace NotificationChannels\Twilio;
 
-class TwilioCallMessage
+class TwilioCallMessage extends TwilioAbstractMessage
 {
     /**
-     * The message TwiML url.
-     *
-     * @var string
-     */
-    public $url;
-
-    /**
-     * The phone number the message should be sent from.
-     *
-     * @var string
-     */
-    public $from;
-
-    /**
-     * @param string $url
-     *
-     * @return static
-     */
-    public static function create($url = '')
-    {
-        return new static($url);
-    }
-
-    /**
-     * Create a new message instance.
-     *
-     * @param  string  $url
-     */
-    public function __construct($url = '')
-    {
-        $this->url = $url;
-    }
-
-    /**
-     * Set the message content.
+     * Set the message url.
      *
      * @param  string  $url
      *
      * @return $this
      */
     public function url($url)
     {
-        $this->url = $url;
-
-        return $this;
-    }
-
-    /**
-     * Set the phone number the message should be sent from.
-     *
-     * @param  string  $from
-     *
-     * @return $this
-     */
-    public function from($from)
-    {
-        $this->from = $from;
+        $this->content = $url;
 
         return $this;
     }

src/TwilioChannel.php

@@ -4,8 +4,6 @@
 
 use Exception;
 use Illuminate\Notifications\Notification;
-use NotificationChannels\Twilio\Events\MessageWasSent;
-use NotificationChannels\Twilio\Events\SendingMessage;
 use NotificationChannels\Twilio\Exceptions\CouldNotSendNotification;
 use Services_Twilio;
 
@@ -30,7 +28,9 @@ public function __construct(Services_Twilio $twilio)
     public function send($notifiable, Notification $notification)
     {
         if (! $to = $notifiable->routeNotificationFor('twilio')) {
-            return;
+            if (! $to = $notifiable->phone_number) {
+                return;
+            }
         }
 
         $message = $notification->toTwilio($notifiable);
@@ -39,18 +39,16 @@ public function send($notifiable, Notification $notification)
             $message = new TwilioSmsMessage($message);
         }
 
-        if (! in_array(get_class($message), [TwilioSmsMessage::class, TwilioCallMessage::class])) {
+        if (! $message instanceof TwilioAbstractMessage) {
             throw CouldNotSendNotification::invalidMessageObject($message);
         }
 
         if (! $from = $message->from ?: config('services.twilio.from')) {
             throw CouldNotSendNotification::missingFrom();
         }
 
-        $response = null;
-
         try {
-            $response = $this->sendMessage($message, $from, $to);
+            $this->sendMessage($message, $from, $to);
         } catch (Exception $exception) {
             throw CouldNotSendNotification::serviceRespondedWithAnException($exception);
         }
@@ -72,15 +70,13 @@ protected function sendMessage($message, $from, $to)
                 $to,
                 trim($message->content)
             );
-
-            return $response;
         }
 
         if ($message instanceof TwilioCallMessage) {
             return $this->twilio->account->calls->create(
                 $from,
                 $to,
-                trim($message->url)
+                trim($message->content)
             );
         }
 

src/TwilioSmsMessage.php

@@ -2,67 +2,6 @@
 
 namespace NotificationChannels\Twilio;
 
-class TwilioSmsMessage
+class TwilioSmsMessage extends TwilioAbstractMessage
 {
-    /**
-     * The message content.
-     *
-     * @var string
-     */
-    public $content;
-
-    /**
-     * The phone number the message should be sent from.
-     *
-     * @var string
-     */
-    public $from;
-
-    /**
-     * @param string $content
-     *
-     * @return static
-     */
-    public static function create($content = '')
-    {
-        return new static($content);
-    }
-
-    /**
-     * Create a new message instance.
-     *
-     * @param  string  $content
-     */
-    public function __construct($content = '')
-    {
-        $this->content = $content;
-    }
-
-    /**
-     * Set the message content.
-     *
-     * @param  string  $content
-     *
-     * @return $this
-     */
-    public function content($content)
-    {
-        $this->content = $content;
-
-        return $this;
-    }
-
-    /**
-     * Set the phone number the message should be sent from.
-     *
-     * @param  string  $from
-     *
-     * @return $this
-     */
-    public function from($from)
-    {
-        $this->from = $from;
-
-        return $this;
-    }
 }

tests/TwilioCallMessageTest.php

@@ -22,23 +22,23 @@ public function it_can_accept_an_url_when_constructing_a_message()
     {
         $message = new TwilioCallMessage('http://example.com');
 
-        $this->assertEquals('http://example.com', $message->url);
+        $this->assertEquals('http://example.com', $message->content);
     }
 
     /** @test */
     public function it_provides_a_create_method()
     {
         $message = TwilioCallMessage::create('http://example.com');
 
-        $this->assertEquals('http://example.com', $message->url);
+        $this->assertEquals('http://example.com', $message->content);
     }
 
     /** @test */
     public function it_can_set_the_url()
     {
         $this->message->url('http://example.com');
 
-        $this->assertEquals('http://example.com', $this->message->url);
+        $this->assertEquals('http://example.com', $this->message->content);
     }
 
     /** @test */