Use modern syntax: Constructor property promotion, improved types

Author: onlime

config/twilio-notification-channel.php

@@ -1,15 +1,15 @@
 <?php
 
 return [
-    'enabled' => env('TWILIO_ENABLED', true),
+    'enabled' => (bool) env('TWILIO_ENABLED', true),
     'username' => env('TWILIO_USERNAME'), // optional when using auth token
     'password' => env('TWILIO_PASSWORD'), // optional when using auth token
     'auth_token' => env('TWILIO_AUTH_TOKEN'), // optional when using username and password
     'account_sid' => env('TWILIO_ACCOUNT_SID'),
 
     'from' => env('TWILIO_FROM'), // optional
     'alphanumeric_sender' => env('TWILIO_ALPHA_SENDER'),
-    'shorten_urls' => env('TWILIO_SHORTEN_URLS', false), // optional, enable twilio URL shortener
+    'shorten_urls' => (bool) env('TWILIO_SHORTEN_URLS', false), // optional, enable twilio URL shortener
 
     /**
      * See https://www.twilio.com/docs/sms/services.

src/Twilio.php

@@ -10,27 +10,18 @@
 
 class Twilio
 {
-    /** @var TwilioService */
-    protected $twilioService;
-
-    /** @var TwilioConfig */
-    public $config;
-
-    public function __construct(TwilioService $twilioService, TwilioConfig $config)
-    {
-        $this->twilioService = $twilioService;
-        $this->config = $config;
-    }
+    public function __construct(
+        protected TwilioService $twilioService,
+        public TwilioConfig $config
+    ) {}
 
     /**
-     * Send a TwilioMessage to the a phone number.
+     * Send a TwilioMessage to a phone number.
      *
-     *
-     * @return mixed
      * @throws TwilioException
      * @throws CouldNotSendNotification
      */
-    public function sendMessage(TwilioMessage $message, ?string $to, bool $useAlphanumericSender = false)
+    public function sendMessage(TwilioMessage $message, ?string $to, bool $useAlphanumericSender = false): CallInstance|MessageInstance
     {
         if ($message instanceof TwilioSmsMessage) {
             if ($useAlphanumericSender && $sender = $this->getAlphanumericSender()) {
@@ -164,12 +155,7 @@ protected function getAlphanumericSender(): ?string
         return $this->config->getAlphanumericSender();
     }
 
-    /**
-     * @param  array  $params
-     * @param  TwilioMessage  $message
-     * @param  array  $optionalParams
-     */
-    protected function fillOptionalParams(&$params, $message, $optionalParams): self
+    protected function fillOptionalParams(array &$params, TwilioMessage $message, array $optionalParams): self
     {
         foreach ($optionalParams as $optionalParam) {
             if ($message->$optionalParam) {

src/TwilioCallMessage.php

@@ -8,30 +8,16 @@ class TwilioCallMessage extends TwilioMessage
 
     public const STATUS_COMPLETED = 'completed';
 
-    /**
-     * @var null|string
-     */
-    public $method;
+    public ?string $method = null;
 
-    /**
-     * @var null|string
-     */
-    public $status;
+    public ?string $status = null;
 
-    /**
-     * @var null|string
-     */
-    public $fallbackUrl;
+    public ?string $fallbackUrl = null;
 
-    /**
-     * @var null|string
-     */
-    public $fallbackMethod;
+    public ?string $fallbackMethod = null;
 
     /**
      * Set the message url.
-     *
-     * @return $this
      */
     public function url(string $url): self
     {
@@ -42,11 +28,8 @@ public function url(string $url): self
 
     /**
      * Set the message url request method.
-     *
-     * @param  string  $method
-     * @return $this
      */
-    public function method($method): self
+    public function method(string $method): self
     {
         $this->method = $method;
 
@@ -55,8 +38,6 @@ public function method($method): self
 
     /**
      * Set the status for the current calls.
-     *
-     * @return $this
      */
     public function status(string $status): self
     {
@@ -67,8 +48,6 @@ public function status(string $status): self
 
     /**
      * Set the fallback url.
-     *
-     * @return $this
      */
     public function fallbackUrl(string $fallbackUrl): self
     {
@@ -79,8 +58,6 @@ public function fallbackUrl(string $fallbackUrl): self
 
     /**
      * Set the fallback url request method.
-     *
-     * @return $this
      */
     public function fallbackMethod(string $fallbackMethod): self
     {

src/TwilioChannel.php

@@ -10,34 +10,18 @@
 
 class TwilioChannel
 {
-    /**
-     * @var Twilio
-     */
-    protected $twilio;
-
-    /**
-     * @var Dispatcher
-     */
-    protected $events;
-
-    /**
-     * TwilioChannel constructor.
-     */
-    public function __construct(Twilio $twilio, Dispatcher $events)
-    {
-        $this->twilio = $twilio;
-        $this->events = $events;
-    }
+    public function __construct(
+        protected Twilio $twilio,
+        protected Dispatcher $events
+    ) {}
 
     /**
      * Send the given notification.
      *
-     * @param  mixed  $notifiable
-     *
      * @return mixed
      * @throws Exception
      */
-    public function send($notifiable, Notification $notification)
+    public function send(mixed $notifiable, Notification $notification)
     {
         if (! $this->isEnabled()) {
             return;
@@ -78,27 +62,19 @@ public function send($notifiable, Notification $notification)
     /**
      * Get the message to send.
      *
-     * @param  mixed  $notifiable
-     *
      * @return mixed
      */
-    protected function getMessage($notifiable, Notification $notification)
+    protected function getMessage(mixed $notifiable, Notification $notification)
     {
         return $notification->toTwilio($notifiable);
     }
 
     /**
      * Check if twilio is enabled.
-     *
-     * @return bool
      */
-    protected function isEnabled()
+    protected function isEnabled(): bool
     {
-        if (is_null($this->twilio->config)) {
-            return true;
-        }
-
-        return $this->twilio->config->enabled();
+        return $this->twilio->config->enabled() ?? true;
     }
 
     /**

src/TwilioConfig.php

@@ -2,17 +2,13 @@
 
 namespace NotificationChannels\Twilio;
 
-class TwilioConfig
+readonly class TwilioConfig
 {
-    /** @var array */
-    private $config;
+    public function __construct(
+        private array $config
+    ) {}
 
-    public function __construct(array $config)
-    {
-        $this->config = $config;
-    }
-
-    public function enabled()
+    public function enabled(): bool
     {
         return $this->config['enabled'] ?? true;
     }

src/TwilioMessage.php

@@ -4,51 +4,32 @@
 
 abstract class TwilioMessage
 {
-    /**
-     * The message content.
-     *
-     * @var string
-     */
-    public $content;
-
     /**
      * The phone number the message should be sent from.
-     *
-     * @var string
      */
-    public $from;
+    public ?string $from = null;
 
-    /**
-     * @var null|string
-     */
-    public $statusCallback;
+    public ?string $statusCallback = null;
+
+    public ?string $statusCallbackMethod = null;
 
     /**
-     * @var null|string
+     * Create a new message instance.
      */
-    public $statusCallbackMethod;
+    public function __construct(
+        public string $content = ''
+    ) {}
 
     /**
      * Create a message object.
-     * @return static
      */
     public static function create(string $content = ''): self
     {
         return new static($content);
     }
 
-    /**
-     * Create a new message instance.
-     */
-    public function __construct(string $content = '')
-    {
-        $this->content = $content;
-    }
-
     /**
      * Set the message content.
-     *
-     * @return $this
      */
     public function content(string $content): self
     {
@@ -59,8 +40,6 @@ public function content(string $content): self
 
     /**
      * Set the phone number the message should be sent from.
-     *
-     * @return $this
      */
     public function from(string $from): self
     {
@@ -79,8 +58,6 @@ public function getFrom(): ?string
 
     /**
      * Set the status callback.
-     *
-     * @return $this
      */
     public function statusCallback(string $statusCallback): self
     {
@@ -91,8 +68,6 @@ public function statusCallback(string $statusCallback): self
 
     /**
      * Set the status callback request method.
-     *
-     * @return $this
      */
     public function statusCallbackMethod(string $statusCallbackMethod): self
     {

src/TwilioMmsMessage.php

@@ -4,15 +4,10 @@
 
 class TwilioMmsMessage extends TwilioSmsMessage
 {
-    /**
-     * @var string|null
-     */
-    public $mediaUrl;
+    public ?string $mediaUrl = null;
 
     /**
      * Set the message media url.
-     *
-     * @return $this
      */
     public function mediaUrl(string $url): self
     {

src/TwilioProvider.php

@@ -19,7 +19,7 @@ public function boot() {}
     /**
      * Register the application services.
      */
-    public function register()
+    public function register(): void
     {
         $this->mergeConfigFrom(__DIR__.'/../config/twilio-notification-channel.php', 'twilio-notification-channel');