Merge pull request #21 from vormkracht10/laravel-11

Laravel 11 support

.github/workflows/run-tests.yml

@@ -13,19 +13,25 @@ jobs:
  fail-fast: true
  matrix:
  os: [ubuntu-latest, windows-latest]
- php: [8.2, 8.1]
- laravel: [10.*]
+ php: [8.1, 8.2]
+ laravel: [10.*, 11.*]
  stability: [prefer-lowest, prefer-stable]
  include:
  - laravel: 10.*
  testbench: 8.*
  carbon: ^2.63
+ - laravel: 11.*
+ testbench: 9.*
+ carbon: ^2.72.2
+ exclude:
+ - laravel: 11.*
+ php: 8.1
 
  name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
  steps:
  - name: Checkout code
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
@@ -44,8 +50,5 @@ jobs:
  composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
  composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
- - name: List Installed Dependencies
- run: composer show -D
-
  - name: Execute tests
- run: vendor/bin/pest
+ run: vendor/bin/pest --ci

.phpunit.cache/test-results

@@ -0,0 +1 @@
+{"version":"pest_2.34.8","defects":[],"times":{"P\\Tests\\EventTest::__pest_evaluable_it_dispaches_events_when_an_mail_is_logged":0.01,"P\\Tests\\GlobalTest::__pest_evaluable_globals":0.109,"P\\Tests\\MailLogTest::__pest_evaluable_it_can_log_sent_mails":0.056,"P\\Tests\\PostmarkTest::__pest_evaluable_it_can_receive_incoming_delivery_webhook_from_postmark":0.003,"P\\Tests\\PostmarkTest::__pest_evaluable_it_can_receive_incoming_click_webhook_from_postmark":0.003,"P\\Tests\\PostmarkTest::__pest_evaluable_it_can_receive_incoming_open_webhook_from_postmark":0.003,"P\\Tests\\PostmarkTest::__pest_evaluable_it_can_receive_incoming_complaint_webhook_from_postmark":0.003,"P\\Tests\\PostmarkTest::__pest_evaluable_it_can_receive_incoming_bounce_webhook_from_postmark":0.068,"P\\Tests\\NotificationTest::__pest_evaluable_it_will_send_notification_on_bounce":0.002}}

composer.json

@@ -17,19 +17,19 @@
  ],
  "require": {
  "php": "^8.1",
- "illuminate/contracts": "^10.8.0",
+ "illuminate/contracts": "^10.8.0|^11.0",
  "laravel-notification-channels/discord": "^1.6",
- "laravel-notification-channels/telegram": "^4.0",
+ "laravel-notification-channels/telegram": "^4.0|5.0",
  "laravel/helpers": "^1.6",
- "laravel/slack-notification-channel": "^2.5",
+ "laravel/slack-notification-channel": "^2.5|^3.2",
  "spatie/laravel-package-tools": "^1.14.0",
  "wildbit/postmark-php": "^4.0"
  },
  "require-dev": {
  "laravel/pint": "^1.9.0",
- "nunomaduro/collision": "^7.5.0",
+ "nunomaduro/collision": "^7.5.0|^8.0",
  "nunomaduro/larastan": "^2.0.1",
- "orchestra/testbench": "^8.5.0",
+ "orchestra/testbench": "^8.5.0|^9.0",
  "pestphp/pest": "^2.6.1",
  "pestphp/pest-plugin-laravel": "^2.0.0",
  "phpstan/extension-installer": "^1.3.0",

src/Commands/CheckBounceRateCommand.php

@@ -11,7 +11,7 @@ class CheckBounceRateCommand extends Command
  protected $signature = 'mails:bounce-rate';
 
  protected $description = 'Check if the bounce rate is higher than the configured limit '.
-  'and send a notification if it is.';
+ 'and send a notification if it is.';
 
  public function handle(): int
  {

src/Contracts/MailProviderContract.php

@@ -4,5 +4,5 @@
 
 interface MailProviderContract
 {
- public function driver(string $driver = null);
+ public function driver(?string $driver = null);
 }

src/Controllers/PostmarkWebhookController.php

@@ -21,7 +21,7 @@ public function __invoke(Request $request): Response
  $payload = $request->all(),
  );
 
- if(is_null($uuid)) {
+ if (is_null($uuid)) {
  return response(status: 202);
  }
 

src/Events/MailBounced.php

@@ -16,6 +16,5 @@ class MailBounced
  */
  public function __construct(
  public MailEvent $mailEvent
- ) {
- }
+ ) {}
 }

src/Events/MailClicked.php

@@ -16,6 +16,5 @@ class MailClicked
  */
  public function __construct(
  public MailEvent $mailEvent
- ) {
- }
+ ) {}
 }

src/Events/MailComplained.php

@@ -16,6 +16,5 @@ class MailComplained
  */
  public function __construct(
  public MailEvent $mailEvent
- ) {
- }
+ ) {}
 }

src/Events/MailDelivered.php

@@ -16,6 +16,5 @@ class MailDelivered
  */
  public function __construct(
  public MailEvent $mailEvent
- ) {
- }
+ ) {}
 }

src/Events/MailEvent.php

@@ -16,6 +16,5 @@ class MailEvent
  public function __construct(
  public string $provider,
  public $payload
- ) {
- }
+ ) {}
 }

src/Events/MailEventLogged.php

@@ -16,6 +16,5 @@ class MailEventLogged
  */
  public function __construct(
  public MailEvent $mailEvent
- ) {
- }
+ ) {}
 }

src/Events/MailOpened.php

@@ -16,6 +16,5 @@ class MailOpened
  */
  public function __construct(
  public MailEvent $mailEvent
- ) {
- }
+ ) {}
 }

src/Events/MailResent.php

@@ -16,6 +16,5 @@ class MailResent
  public function __construct(
  public string $provider,
  public $payload
- ) {
- }
+ ) {}
 }

src/Events/WebhookBounced.php

@@ -17,6 +17,5 @@ class WebhookBounced
  public function __construct(
  public Provider $provider,
  public $payload
- ) {
- }
+ ) {}
 }

src/Events/WebhookClicked.php

@@ -17,6 +17,5 @@ class WebhookClicked
  public function __construct(
  public Provider $provider,
  public $payload
- ) {
- }
+ ) {}
 }

src/Events/WebhookComplained.php

@@ -17,6 +17,5 @@ class WebhookComplained
  public function __construct(
  public Provider $provider,
  public $payload
- ) {
- }
+ ) {}
 }

src/Events/WebhookDelivered.php

@@ -17,6 +17,5 @@ class WebhookDelivered
  public function __construct(
  public Provider $provider,
  public $payload,
- ) {
- }
+ ) {}
 }

src/Events/WebhookEvent.php

@@ -19,8 +19,7 @@ public function __construct(
  public array $payload = [],
  protected ?string $mailUuid = null,
  public $timestamp = null,
- ) {
- }
+ ) {}
 
  public function mail(): ?Mail
  {

src/Events/WebhookOpened.php

@@ -17,6 +17,5 @@ class WebhookOpened
  public function __construct(
  public Provider $provider,
  public $payload
- ) {
- }
+ ) {}
 }

src/Listeners/Concerns/SendsNotifications.php

@@ -24,7 +24,7 @@ public function send(Notification $notification, array $channels): void
  return;
  }
 
- foreach($accounts as $route) {
+ foreach ($accounts as $route) {
  Notifications::route($channel, $route)->notify(
  $notification->on($channel),
  );

src/Notifications/Concerns/HasDynamicDrivers.php

@@ -24,9 +24,10 @@ public function on($drivers, bool $merge = false): static
 
  $via = [
  'discord' => \NotificationChannels\Discord\DiscordChannel::class,
+ 'mail' => \Illuminate\Notifications\Channels\MailChannel::class,
  ];
 
- $drivers = array_map(function($driver) use ($via) {
+ $drivers = array_map(function ($driver) use ($via) {
  return $via[$driver];
  }, $drivers);