Merge pull request #14 from awssat/copilot/merge-laravel-13-compatibility

Add Laravel 13 CI coverage and support new Slack message class in Discord channel

Author: BSN4

.github/workflows/tests.yml

@@ -12,12 +12,16 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.1, 8.2, 8.3]
-        laravel: ['10.*', '11.*', '12.*']
+        laravel: ['10.*', '11.*', '12.*', '13.*']
         exclude:
           - laravel: 11.*
             php: 8.1
           - laravel: 12.*
             php: 8.1
+          - laravel: 13.*
+            php: 8.1
+          - laravel: 13.*
+            php: 8.2
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }}
 

composer.json

@@ -14,14 +14,14 @@
         }
     ],
     "require": {
-        "php": "^7.1.3|^8.0",
-        "guzzlehttp/guzzle": "^6.0|^7.0",
-        "illuminate/notifications": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0",
-        "laravel/slack-notification-channel": "^2.0|^3.2"
+        "php": "^8.1",
+        "guzzlehttp/guzzle": "^7.0",
+        "illuminate/notifications": "^10.0|^11.0|^12.0|^13.0",
+        "laravel/slack-notification-channel": "^3.2"
     },
     "require-dev": {
-        "mockery/mockery": "^1.4 || ^1.6",
-        "phpunit/phpunit": "^7.0|^8.0|^9.0|^10.1"
+        "mockery/mockery": "^1.6",
+        "phpunit/phpunit": "^10.1|^11.0|^12.0"
     },
     "autoload": {
         "psr-4": {

src/Channels/DiscordWebhookChannel.php

@@ -6,7 +6,9 @@
 use Awssat\Notifications\Messages\DiscordEmbedField;
 use Awssat\Notifications\Messages\DiscordMessage;
 use GuzzleHttp\Client as HttpClient;
+use Illuminate\Notifications\Channels\SlackWebhookChannel;
 use Illuminate\Notifications\Messages\SlackMessage;
+use Illuminate\Notifications\Slack\SlackMessage as LaravelSlackMessage;
 use Illuminate\Notifications\Notification;
 
 class DiscordWebhookChannel
@@ -45,7 +47,7 @@ public function send($notifiable, Notification $notification)
 
         $message = $notification->toDiscord($notifiable);
 
-        if($message instanceof SlackMessage) {
+        if ($message instanceof SlackMessage || $message instanceof LaravelSlackMessage) {
             $slackWebhook = new SlackWebhookChannel($this->http);
             return $this->http->post($url . '/slack', $slackWebhook->buildJsonPayload($message));
         }

tests/NotificationDiscordChannelTest.php

@@ -6,11 +6,10 @@
 use GuzzleHttp\Psr7\Response;
 use Awssat\Notifications\Messages\DiscordMessage;
 use GuzzleHttp\Client;
-use Illuminate\Notifications\Messages\SlackMessage;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notification;
-use Illuminate\Support\Carbon;
 use Mockery as m;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 class NotificationDiscordChannelTest extends TestCase
@@ -39,66 +38,23 @@ protected function tearDown(): void
         m::close();
     }
 
-    /**
-     * @dataProvider payloadDataProvider
-     * @param \Illuminate\Notifications\Notification $notification
-     * @param array $payload
-     */
+    #[DataProvider('payloadDataProvider')]
     public function testCorrectPayloadIsSentToDiscord(Notification $notification, string $url, array $payload)
     {
         $this->guzzleHttp->shouldReceive('post')->andReturnUsing(function ($argUrl, $argPayload) use ($payload, $url) {
             $this->assertEquals($argUrl, $url);
             $this->assertEquals($argPayload, $payload);
-            
+
             return new Response();
         });
 
         $this->discordChannel->send(new NotificationDiscordChannelTestNotifiable, $notification);
     }
 
-    public  static function payloadDataProvider()
+    public static function payloadDataProvider()
     {
         return [
             'payloadWithDiscord' => self::getPayloadWithDiscord(),
-            'payloadWithSlackMessage' => self::getPayloadWithSlackMessage(),
-        ];
-    }
-
-    private static function getPayloadWithSlackMessage()
-    {
-        return [
-            new NotificationDiscordChannelTestNotificationWithSlack,
-            'url/slack',
-            [
-                'json' => [
-                    'username' => 'Ghostbot',
-                    'icon_emoji' => ':ghost:',
-                    'channel' => '#ghost-talk',
-                    'text' => 'Content',
-                    'attachments' => [
-                        [
-                            'title' => 'Laravel',
-                            'title_link' => 'https://laravel.com',
-                            'text' => 'Attachment Content',
-                            'fallback' => 'Attachment Fallback',
-                            'fields' => [
-                                [
-                                    'title' => 'Project',
-                                    'value' => 'Laravel',
-                                    'short' => true,
-                                ],
-                            ],
-                            'mrkdwn_in' => ['text'],
-                            'footer' => 'Laravel',
-                            'footer_icon' => 'https://laravel.com/fake.png',
-                            'author_name' => 'Author',
-                            'author_link' => 'https://laravel.com/fake_author',
-                            'author_icon' => 'https://laravel.com/fake_author.png',
-                            'ts' => 1234567890,
-                        ],
-                    ],
-                ],
-            ],
         ];
     }
 
@@ -148,32 +104,6 @@ public function routeNotificationForDiscord()
     }
 }
 
-class NotificationDiscordChannelTestNotificationWithSlack extends Notification
-{
-    public function toDiscord($notifiable)
-    {
-        return (new SlackMessage)
-            ->from('Ghostbot', ':ghost:')
-            ->to('#ghost-talk')
-            ->content('Content')
-            ->attachment(function ($attachment) {
-                $timestamp = m::mock(Carbon::class);
-                $timestamp->shouldReceive('getTimestamp')->andReturn(1234567890);
-                $attachment->title('Laravel', 'https://laravel.com')
-                    ->content('Attachment Content')
-                    ->fallback('Attachment Fallback')
-                    ->fields([
-                        'Project' => 'Laravel',
-                    ])
-                    ->footer('Laravel')
-                    ->footerIcon('https://laravel.com/fake.png')
-                    ->markdown(['text'])
-                    ->author('Author', 'https://laravel.com/fake_author', 'https://laravel.com/fake_author.png')
-                    ->timestamp($timestamp);
-            });
-    }
-}
-
 class NotificationDiscordChannelTestNotificationWithDiscordMessage extends Notification
 {
     public function toDiscord($notifiable)