Merge remote-tracking branch 'origin/4.x' into onlime-rebrand

Author: onlime

.gitattributes

@@ -7,7 +7,5 @@
 /.gitignore         export-ignore
 /.travis.yml        export-ignore
 /phpunit.xml.dist   export-ignore
-/.scrutinizer.yml   export-ignore
-/.styleci.yml       export-ignore
 /.editorconfig      export-ignore
 /tests              export-ignore

.github/workflows/ci.yml

@@ -3,6 +3,25 @@ name: CI
 on: [push, pull_request]
 
 jobs:
+  phplint:
+    runs-on: ubuntu-latest
+
+    name: PHP Linting (Pint)
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: "laravel-pint"
+        uses: aglipanci/laravel-pint-action@latest
+        with:
+          preset: laravel
+          verboseMode: true
+          testMode: true
+          configPath: "pint.json"
+          pintVersion: 1.18.2
+          onlyDirty: true
+
   test:
     runs-on: ubuntu-latest
     strategy:
@@ -16,7 +35,7 @@ jobs:
           - laravel: 11.*
             testbench: 9.*
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    name: PHP${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout

.scrutinizer.yml

@@ -5,6 +5,8 @@ All notable changes to `laravel-notification-channels/twilio` will be documented
 ## 4.0.0
 
 - Rebranded abandoned [`laravel-notification-channels/twilio`](https://github.com/laravel-notification-channels/twilio) to [`onlime/laravel-twilio`](https://github.com/onlime/laravel-twilio)
+- Added PHP Linting (Pint) to CI workflow
+- Additional tests to achieve 100% code coverage by @pascalbaljet
 - Update PhpUnit to 10.5 and fixed all tests.
 - Bump `twilio/sdk` to 8.3
 - Improved types and use constructor property promotion everywhere.

.styleci.yml

@@ -2,10 +2,8 @@
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/onlime/laravel-twilio.svg?style=flat-square)](https://packagist.org/packages/onlime/laravel-twilio)
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
-[![Build Status](https://github.com/onlime/laravel-notification-channels-twilio/actions/workflows/ci.yml/badge.svg)](https://github.com/onlime/laravel-notification-channels-twilio/actions/workflows/ci.yml)
-[![Quality Score](https://img.shields.io/scrutinizer/g/onlime/laravel-twilio.svg?style=flat-square)](https://scrutinizer-ci.com/g/onlime/laravel-twilio)
-[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/onlime/laravel-twilio/master.svg?style=flat-square)](https://scrutinizer-ci.com/g/onlime/laravel-twilio/?branch=master)
-[![Total Downloads](https://img.shields.io/packagist/dt/onlime/laravel-twilio.svg?style=flat-square)](https://packagist.org/packages/onlime/laravel-twilio)
+[![Build Status](https://github.com/onlime/laravel-twilio/actions/workflows/ci.yml/badge.svg)](https://github.com/onlime/laravel-twilio/actions/workflows/ci.yml)
+[![Total Downloads](https://img.shields.io/packagist/dt/laravel-notification-channels/twilio.svg?style=flat-square)](https://packagist.org/packages/onlime/laravel-twilio)
 
 This package makes it easy to send [Twilio notifications](https://documentation.twilio.com/docs) with Laravel 11.x
 
@@ -57,7 +55,7 @@ Run `php artisan vendor:publish --provider="NotificationChannels\Twilio\TwilioPr
 #### Suppressing specific errors or all errors
 
 Publish the config using the above command, and edit the `ignored_error_codes` array. You can get the list of
-exception codes from [the documentation](https://www.twilio.com/docs/api/errors). 
+exception codes from [the documentation](https://www.twilio.com/docs/api/errors).
 
 If you want to suppress all errors, you can set the option to `['*']`. The errors will not be logged but notification
 failed events will still be emitted.
@@ -75,8 +73,8 @@ We have dropped support for PHP < 8.2 and the minimum Laravel version is now 11.
 
 ## Upgrading from 2.x to 3.x
 
-If you're upgrading from version `2.x`, you'll need to make sure that your set environment variables match those above 
-in the config section. None of the environment variable names have changed, but if you used different keys in your 
+If you're upgrading from version `2.x`, you'll need to make sure that your set environment variables match those above
+in the config section. None of the environment variable names have changed, but if you used different keys in your
 `services.php` config then you'll need to update them to match the above, or publish the config file and change the
 `env` key.
 

CHANGELOG.md

@@ -30,11 +30,4 @@ public static function invalidReceiver(): self
             method or a phone_number attribute to your notifiable.'
         );
     }
-
-    public static function missingAlphaNumericSender(): self
-    {
-        return new static(
-            'Notification was not sent. Missing `alphanumeric_sender` in config'
-        );
-    }
 }

README.md

@@ -67,9 +67,9 @@ public function register(): void
     public function provides(): array
     {
         return [
+            TwilioChannel::class,
             TwilioConfig::class,
             TwilioService::class,
-            TwilioChannel::class,
         ];
     }
 }

src/Exceptions/CouldNotSendNotification.php

@@ -7,17 +7,22 @@
 use NotificationChannels\Twilio\Exceptions\InvalidConfigException;
 use NotificationChannels\Twilio\Tests\IntegrationTestCase;
 use NotificationChannels\Twilio\TwilioChannel;
+use NotificationChannels\Twilio\TwilioConfig;
+use NotificationChannels\Twilio\TwilioProvider;
+use Twilio\Rest\Client;
 
 class TwilioProviderTest extends IntegrationTestCase
 {
-    public function testThatApplicationCannotCreateChannelWithoutConfig()
+    /** @test */
+    public function it_cannot_create_the_application_without_config()
     {
         $this->expectException(InvalidConfigException::class);
 
         $this->app->get(TwilioChannel::class);
     }
 
-    public function testThatApplicationCannotCreateChannelWithoutSid()
+    /** @test */
+    public function it_cannot_create_the_application_without_sid()
     {
         $this->app['config']->set('twilio-notification-channel.username', 'test');
         $this->app['config']->set('twilio-notification-channel.username', 'password');
@@ -26,12 +31,32 @@ public function testThatApplicationCannotCreateChannelWithoutSid()
         $this->app->get(TwilioChannel::class);
     }
 
-    public function testThatApplicationCreatesChannelWithConfig()
+    /** @test */
+    public function it_can_create_the_application_with_sid()
     {
         $this->app['config']->set('twilio-notification-channel.username', 'test');
         $this->app['config']->set('twilio-notification-channel.password', 'password');
         $this->app['config']->set('twilio-notification-channel.account_sid', '1234');
 
         $this->assertInstanceOf(TwilioChannel::class, $this->app->get(TwilioChannel::class));
     }
+
+    /** @test */
+    public function it_can_create_the_application_with_token_auth()
+    {
+        $this->app['config']->set('twilio-notification-channel.auth_token', 'token');
+        $this->app['config']->set('twilio-notification-channel.account_sid', '1234');
+
+        $this->assertInstanceOf(TwilioChannel::class, $this->app->get(TwilioChannel::class));
+    }
+
+    /** @test */
+    public function it_provides_three_classes()
+    {
+        $provides = (new TwilioProvider($this->app))->provides();
+
+        $this->assertTrue(in_array(TwilioChannel::class, $provides));
+        $this->assertTrue(in_array(TwilioConfig::class, $provides));
+        $this->assertTrue(in_array(Client::class, $provides));
+    }
 }

src/TwilioProvider.php

@@ -3,9 +3,11 @@
 namespace NotificationChannels\Twilio\Tests\Unit;
 
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Notifications\Events\NotificationFailed;
 use Illuminate\Notifications\Notification;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryTestCase;
+use NotificationChannels\Twilio\Exceptions\CouldNotSendNotification;
 use NotificationChannels\Twilio\Twilio;
 use NotificationChannels\Twilio\TwilioCallMessage;
 use NotificationChannels\Twilio\TwilioChannel;
@@ -28,7 +30,7 @@ class IntegrationTest extends MockeryTestCase
     /** @var Dispatcher */
     protected $events;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -144,6 +146,27 @@ public function it_can_make_a_call()
         $channel->send(new NotifiableWithAttribute, $this->notification);
     }
 
+    /** @test */
+    public function it_cant_make_a_call_when_the_from_config_is_missing()
+    {
+        $message = TwilioCallMessage::create('http://example.com');
+        $this->notification->shouldReceive('toTwilio')->andReturn($message);
+
+        $config = new TwilioConfig([]);
+        $twilio = new Twilio($this->twilioService, $config);
+        $channel = new TwilioChannel($twilio, $this->events);
+
+        $this->twilioService->calls->shouldNotReceive('create');
+
+        $this->events->shouldReceive('dispatch')
+            ->atLeast()->once()
+            ->with(Mockery::type(NotificationFailed::class));
+
+        $this->expectException(CouldNotSendNotification::class);
+
+        $channel->send(new NotifiableWithAttribute, $this->notification);
+    }
+
     protected function smsMessageWillBeSentToTwilioWith(...$args)
     {
         $this->twilioService->messages->shouldReceive('create')