code review

Author: freekmurze

src/Events/MessageWasSent.php

@@ -21,7 +21,9 @@ class MessageWasSent
     public function __construct($notifiable, Notification $notification, $response = null)
     {
         $this->notifiable = $notifiable;
+
         $this->notification = $notification;
+
         $this->response = $response;
     }
 }

src/Events/SendingMessage.php

@@ -11,6 +11,7 @@ class SendingMessage
     /** @var \Illuminate\Notifications\Notification */
     protected $notification;
 
+    /** @var mixed|\NotificationChannels\Twilio\CallMessage|\NotificationChannels\Twilio\SmsMessage */
     protected $message;
 
     /**

src/Exceptions/CouldNotSendNotification.php

@@ -18,13 +18,15 @@ public static function serviceRespondedWithAnException($exception)
     }
 
     /**
-     * @param string $class
+     * @param mixed $message
      *
      * @return static
      */
-    public static function invalidMessageObject($class)
+    public static function invalidMessageObject($message)
     {
-        return new static("Notification was not sent. Message object class `{$class}` is invalid. It should be either `".SmsMessage::class.'` or `'.CallMessage::class.'`');
+        $className = get_class($message) ?: 'Unknown';
+
+        return new static("Notification was not sent. Message object class `{$className}` is invalid. It should be either `".SmsMessage::class.'` or `'.CallMessage::class.'`');
     }
 
     /**

src/TwilioCallMessage.php

@@ -19,30 +19,30 @@ class TwilioCallMessage
     public $from;
 
     /**
-     * Create a new message instance.
+     * @param string $url
      *
-     * @param  string  $url
-     * @return void
+     * @return static
      */
-    public function __construct($url = '')
+    public static function create($url = '')
     {
-        $this->url = $url;
+        return new static($url);
     }
 
     /**
-     * @param string $url
+     * Create a new message instance.
      *
-     * @return static
+     * @param  string  $url
      */
-    public static function create($url = '')
+    public function __construct($url = '')
     {
-        return new static($url);
+        $this->url = $url;
     }
 
     /**
      * Set the message content.
      *
      * @param  string  $url
+     *
      * @return $this
      */
     public function url($url)
@@ -56,6 +56,7 @@ public function url($url)
      * Set the phone number the message should be sent from.
      *
      * @param  string  $from
+     *
      * @return $this
      */
     public function from($from)

src/TwilioChannel.php

@@ -2,6 +2,7 @@
 
 namespace NotificationChannels\Twilio;
 
+use Exception;
 use Illuminate\Notifications\Notification;
 use NotificationChannels\Twilio\Events\MessageWasSent;
 use NotificationChannels\Twilio\Events\SendingMessage;
@@ -10,9 +11,7 @@
 
 class TwilioChannel
 {
-    /**
-     * @var \Services_Twilio
-     */
+    /** @var \Services_Twilio */
     protected $twilio;
 
     public function __construct(Services_Twilio $twilio)
@@ -25,60 +24,73 @@ public function __construct(Services_Twilio $twilio)
      *
      * @param  mixed $notifiable
      * @param  \Illuminate\Notifications\Notification $notification
-     * @return void
+     *
      * @throws CouldNotSendNotification
      */
     public function send($notifiable, Notification $notification)
     {
-        if (! $to = $notifiable->routeNotificationFor('twilio')) {
+        if (!$to = $notifiable->routeNotificationFor('twilio')) {
             return;
         }
 
         $message = $notification->toTwilio($notifiable);
 
         if (is_string($message)) {
-            // Default to SMS message if only a string is provided
             $message = new TwilioSmsMessage($message);
         }
 
-        if (! ($message instanceof TwilioSmsMessage) &&
-            ! ($message instanceof TwilioCallMessage)) {
-            $class = get_class($message) ?: 'Unknown';
-
-            throw CouldNotSendNotification::invalidMessageObject($class);
+        if (!in_array(get_class($message), [TwilioSmsMessage::class, TwilioCallMessage::class])) {
+            throw CouldNotSendNotification::invalidMessageObject($message);
         }
 
-        if (! $from = $message->from ?: config('services.twilio.from')) {
+        if (!$from = $message->from ?: config('services.twilio.from')) {
             throw CouldNotSendNotification::missingFrom();
         }
 
         $shouldSendMessage = event(new SendingMessage($notifiable, $notification, $message), [], true) !== false;
 
-        if (! $shouldSendMessage) {
+        if (!$shouldSendMessage) {
             return;
         }
 
         $response = null;
 
-        /* @var TwilioSmsMessage|TwilioCallMessage $message */
         try {
-            if ($message instanceof TwilioSmsMessage) {
-                $response = $this->twilio->account->messages->sendMessage(
-                    $from,
-                    $to,
-                    trim($message->content)
-                );
-            } elseif ($message instanceof TwilioCallMessage) {
-                $response = $this->twilio->account->calls->create(
-                    $from,
-                    $to,
-                    trim($message->url)
-                );
-            }
-        } catch (\Exception $exception) {
+            $response = $this->sendMessage($message, $from, $to);
+        } catch (Exception $exception) {
             throw CouldNotSendNotification::serviceRespondedWithAnException($exception);
         }
 
         event(new MessageWasSent($notifiable, $notification, $response));
     }
+
+    /**
+     * @param $message
+     * @param $from
+     * @param $to
+     * @return mixed
+     *
+     * @throws \NotificationChannels\Twilio\Exceptions\CouldNotSendNotification
+     */
+    protected function sendMessage($message, $from, $to)
+    {
+        if ($message instanceof TwilioSmsMessage) {
+            return $this->twilio->account->messages->sendMessage(
+                $from,
+                $to,
+                trim($message->content)
+            );
+            return $response;
+        }
+
+        if ($message instanceof TwilioCallMessage) {
+            return $this->twilio->account->calls->create(
+                $from,
+                $to,
+                trim($message->url)
+            );
+        }
+
+        throw CouldNotSendNotification::invalidMessageObject($message);
+    }
 }

src/TwilioProvider.php

@@ -22,11 +22,4 @@ public function boot()
                 );
             });
     }
-
-    /**
-     * Register the application services.
-     */
-    public function register()
-    {
-    }
 }

src/TwilioSmsMessage.php

@@ -19,30 +19,30 @@ class TwilioSmsMessage
     public $from;
 
     /**
-     * Create a new message instance.
+     * @param string $content
      *
-     * @param  string  $content
-     * @return void
+     * @return static
      */
-    public function __construct($content = '')
+    public static function create($content = '')
     {
-        $this->content = $content;
+        return new static($content);
     }
 
     /**
-     * @param string $content
+     * Create a new message instance.
      *
-     * @return static
+     * @param  string  $content
      */
-    public static function create($content = '')
+    public function __construct($content = '')
     {
-        return new static($content);
+        $this->content = $content;
     }
 
     /**
      * Set the message content.
      *
      * @param  string  $content
+     *
      * @return $this
      */
     public function content($content)
@@ -56,6 +56,7 @@ public function content($content)
      * Set the phone number the message should be sent from.
      *
      * @param  string  $from
+     *
      * @return $this
      */
     public function from($from)