- Updated min. required php version to 7.4

- Added support for laravel 9
- CS & Typehinting

Author: hebinet

composer.json

@@ -16,13 +16,13 @@
     }
   ],
   "require": {
-    "php": "^7.3|^8.0",
-    "illuminate/notifications": "^6.0|^7.0|^8.0",
+    "php": "^7.4|^8.0",
+    "illuminate/notifications": "^6.0|^7.0|^8.0|^9.0",
     "hebinet/websmscom-php": "^1.0.7"
   },
   "require-dev": {
     "mockery/mockery": "^1.0",
-    "phpunit/phpunit": "^8.0"
+    "phpunit/phpunit": "^9.5"
   },
   "autoload": {
     "psr-4": {

phpunit.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         verbose="true"
+>
+    <testsuites>
+        <testsuite name="WebSMS Channel Test Suite">
+            <directory suffix="Test.php">./tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+</phpunit>

src/Channels/WebSmsChannel.php

@@ -5,9 +5,6 @@
 use Hebinet\Notifications\Events\WebSmsFailed;
 use Hebinet\Notifications\Events\WebSmsSending;
 use Hebinet\Notifications\Events\WebSmsSent;
-use Illuminate\Notifications\Events\NotificationFailed;
-use Illuminate\Notifications\Events\NotificationSending;
-use Illuminate\Notifications\Events\NotificationSent;
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Arr;
 use WebSms\Client;
@@ -22,38 +19,22 @@ class WebSmsChannel
      * @var Client
      */
     protected $client;
-    /**
-     * @var string
-     */
-    private $channelName = 'websms';
 
-    /**
-     * Create a new WebSms channel instance.
-     *
-     * @param  Client  $client
-     *
-     * @return void
-     */
+    private string $channelName = 'websms';
+
     public function __construct(Client $client)
     {
         $this->client = $client;
     }
 
     /**
-     * Send the given notification.
-     *
-     * @param  mixed  $notifiable
-     * @param  \Illuminate\Notifications\Notification  $notification
-     *
-     * @return Response|null
-     *
      * @throws \WebSms\Exception\ApiException
      * @throws \WebSms\Exception\AuthorizationFailedException
      * @throws \WebSms\Exception\HttpConnectionException
      * @throws \WebSms\Exception\ParameterValidationException
      * @throws \WebSms\Exception\UnknownResponseException
      */
-    public function send($notifiable, Notification $notification)
+    public function send($notifiable, Notification $notification): ?Response
     {
         $to = $notifiable->phone_number ?? null;
         $routeTo = $notifiable->routeNotificationFor($this->channelName, $notification);
@@ -102,11 +83,6 @@ public function send($notifiable, Notification $notification)
         return $response;
     }
 
-    /**
-     * @param  string  $message
-     *
-     * @return int
-     */
     public function getSmsCount(string $message): int
     {
         $length = strlen(trim($message));
@@ -117,11 +93,6 @@ public function getSmsCount(string $message): int
         return 1;
     }
 
-    /**
-     * @param $key
-     *
-     * @return mixed
-     */
     private function getConfig($key)
     {
         return config('websms')[$key];

src/WebSmsChannelServiceProvider.php

@@ -10,23 +10,20 @@
 
 class WebSmsChannelServiceProvider extends ServiceProvider
 {
-    public function boot()
+    public function boot(): void
     {
-        if ($this->app->runningInConsole()) {
-            $this->publishes([
-                __DIR__ . '/../config/websms.php' => config_path('websms.php'),
-            ], 'config');
+        if ( ! $this->app->runningInConsole()) {
+            return;
         }
+
+        $this->publishes([
+            __DIR__.'/../config/websms.php' => config_path('websms.php'),
+        ], 'config');
     }
 
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
+    public function register(): void
     {
-        $this->mergeConfigFrom(__DIR__ . '/../config/websms.php', 'websms');
+        $this->mergeConfigFrom(__DIR__.'/../config/websms.php', 'websms');
 
         Notification::resolved(function (ChannelManager $service) {
             $service->extend('websms', function ($app) {

tests/NotificationWebSmsChannelTest.php

@@ -48,19 +48,23 @@ public function testSmsIsSentViaWebsms()
                 $client = m::mock(Client::class)
             );
 
-            self::$functions->shouldReceive('config')->with('websms')->twice()->andReturns([
-                'test' => false,
-                'verbose' => false
-            ]);
-
-            $client->shouldReceive('send')->withArgs(function ($message, $count) {
-                if ($message instanceof TextMessage && is_int($count)) {
-                    return true;
-                }
-                return false;
-            })->once();
+            self::$functions->shouldReceive('config')
+                            ->with('websms')
+                            ->twice()
+                            ->andReturns([
+                                'test' => false,
+                                'verbose' => false,
+                            ]);
+
+            $client->shouldReceive('send')
+                   ->withArgs(function ($message, $count) {
+                       return $message instanceof TextMessage && is_int($count);
+                   })
+                   ->once();
 
             $channel->send($notifiable, $notification);
+
+            $this->assertEquals('this is the way', $notification->toWebsms($notifiable));
         }
 
         public function testSmsCount()
@@ -88,7 +92,7 @@ class NotificationWebsmsChannelTestNotification extends Notification
     {
         public function toWebsms($notifiable)
         {
-            return 'this is my message';
+            return 'this is the way';
         }
     }
 }