Merge remote-tracking branch 'origin/v4' into 142-totwilio-override

Author: onlime

.github/workflows/php.yml

@@ -1,33 +1,48 @@
 name: PHP
 
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 
 jobs:
   run:
     runs-on: ubuntu-latest
+
     strategy:
       max-parallel: 15
       fail-fast: false
       matrix:
-        laravel-version: ['^8.0', '^9.0', 10.*]
+        laravel-version: ['10.*', '11.0', ^8.0, ^9.0]
         php-version: ['8.0', '8.1', '8.2']
+        exclude:
+          - laravel-version: 11.*
+            php-version: '8.0'
+          - laravel-version: 11.*
+            php-version: '8.1'
+
     name: PHP ${{ matrix.php-version }} on Laravel ${{ matrix.laravel-version }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@master
+
       - name: Setup PHP
         uses: shivammathur/setup-php@master
         with:
           php-version: ${{ matrix.php-version }}
           extension-csv: mbstring, xdebug
           coverage: xdebug
+
       - name: Install dependencies
         run: |
           composer require --no-update --no-interaction "illuminate/support:${{ matrix.laravel-version }}"
           composer update --no-interaction --prefer-dist --no-suggest
+
       - name: Lint composer.json
         run: composer validate
+
       - name: Run Tests
         run: composer test:unit
+
       - name: Run Integration Tests
         run: composer test:integration

composer.json

@@ -30,16 +30,16 @@
     ],
     "require": {
         "php": ">=7.2|^8.0",
-        "twilio/sdk": "~6.0",
-        "illuminate/notifications": "^7.0 || ^8.0 || ^9.0 || ^10.0",
-        "illuminate/support": "^7.0 || ^8.0 || ^9.0 || ^10.0",
-        "illuminate/events": "^7.0 || ^8.0 || ^9.0 || ^10.0",
-        "illuminate/queue": "^7.0 || ^8.0 || ^9.0 || ^10.0"
+        "twilio/sdk": "~6.0|^7.16",
+        "illuminate/notifications": "^7.0 || ^8.0 || ^9.0 || ^10.0|^11.0",
+        "illuminate/support": "^7.0 || ^8.0 || ^9.0 || ^10.0|^11.0",
+        "illuminate/events": "^7.0 || ^8.0 || ^9.0 || ^10.0|^11.0",
+        "illuminate/queue": "^7.0 || ^8.0 || ^9.0 || ^10.0|^11.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.3",
-        "phpunit/phpunit": "^8.5|^9.5",
-        "orchestra/testbench": "^5.0 || ^6.0 || ^7.0 || ^8.0"
+        "phpunit/phpunit": "^8.5|^9.5|^10.5",
+        "orchestra/testbench": "^5.0 || ^6.0 || ^7.0 || ^8.0|^9.0"
     },
     "autoload": {
         "psr-4": {

config/twilio-notification-channel.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'enabled' => 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

src/TwilioChannel.php

@@ -43,6 +43,10 @@ public function __construct(Twilio $twilio, Dispatcher $events)
      */
     public function send($notifiable, Notification $notification)
     {
+        if (! $this->isEnabled()) {
+            return;
+        }
+
         try {
             $to = $this->getTo($notifiable, $notification);
             $message = $this->getMessage($notifiable, $notification);
@@ -88,6 +92,20 @@ protected function getMessage($notifiable, Notification $notification)
         return $notification->toTwilio($notifiable);
     }
 
+    /**
+     * Check if twilio is enabled.
+     *
+     * @return bool
+     */
+    protected function isEnabled()
+    {
+        if (is_null($this->twilio->config)) {
+            return true;
+        }
+
+        return $this->twilio->config->enabled();
+    }
+
     /**
      * Get the address to send a notification to.
      *

src/TwilioConfig.php

@@ -15,6 +15,11 @@ public function __construct(array $config)
         $this->config = $config;
     }
 
+    public function enabled()
+    {
+        return $this->config['enabled'] ?? true;
+    }
+
     public function usingUsernamePasswordAuth(): bool
     {
         return $this->getUsername() !== null && $this->getPassword() !== null && $this->getAccountSid() !== null;

tests/Integration/BaseIntegrationTest.php

@@ -5,7 +5,7 @@
 namespace NotificationChannels\Twilio\Tests\Integration;
 
 use NotificationChannels\Twilio\TwilioProvider;
-use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\TestCase;
 
 abstract class BaseIntegrationTest extends TestCase
 {

tests/Unit/TwilioChannelTest.php

@@ -36,6 +36,23 @@ public function setUp(): void
         $this->channel = new TwilioChannel($this->twilio, $this->dispatcher);
     }
 
+    /** @test */
+    public function it_will_not_send_a_message_if_not_enabled()
+    {
+        $notifiable = new Notifiable();
+        $notification = Mockery::mock(Notification::class);
+
+        $this->twilio->config = new TwilioConfig([
+            'enabled' => false,
+        ]);
+
+        $this->dispatcher->shouldNotReceive('dispatch');
+
+        $result = $this->channel->send($notifiable, $notification);
+
+        $this->assertNull($result);
+    }
+
     /** @test */
     public function it_will_not_send_a_message_without_known_receiver()
     {