Merge pull request #52 from ConnySjoblom/laravel-9

Support for Laravel 9.x
mailjet · Feb 23, 2022 · 06cb7d2 · 06cb7d2
2 parents 0430a8e + 7d5525a
commit 06cb7d2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 62 deletions.
diff --git a/composer.json b/composer.json
@@ -24,9 +24,9 @@
     ],
     "require": {
         "php": "^7.1.3|^8.0",
-        "laravel/framework": "~5.1|^6.0|^7.0|^8.0",
+        "laravel/framework": "~5.1|^6.0|^7.0|^8.0|^9.0",
         "mailjet/mailjet-apiv3-php": "^1.2",
-        "mailjet/mailjet-swiftmailer": "^2.0"
+        "symfony/mailjet-mailer": "^6.0"
     },
     "require-dev": {
         "fakerphp/faker": "~1",
@@ -47,8 +47,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Mailjet\\LaravelMailjet\\MailjetServiceProvider",
-                "Mailjet\\LaravelMailjet\\MailjetMailServiceProvider"
+                "Mailjet\\LaravelMailjet\\MailjetServiceProvider"
             ],
             "aliases": {
                 "Mailjet": "Mailjet\\LaravelMailjet\\Facades\\Mailjet"

diff --git a/src/MailjetMailServiceProvider.php b/src/MailjetMailServiceProvider.php
diff --git a/src/MailjetServiceProvider.php b/src/MailjetServiceProvider.php
@@ -4,8 +4,11 @@
 
 namespace Mailjet\LaravelMailjet;
 
+use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\ServiceProvider;
 use Mailjet\LaravelMailjet\Services\MailjetService;
+use Symfony\Component\Mailer\Bridge\Mailjet\Transport\MailjetTransportFactory;
+use Symfony\Component\Mailer\Transport\Dsn;
 
 class MailjetServiceProvider extends ServiceProvider
 {
@@ -16,6 +19,16 @@ class MailjetServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
+        Mail::extend('mailjet', function () {
+            return (new MailjetTransportFactory)->create(
+                new Dsn(
+                    'mailjet+api',
+                    'default',
+                    config('services.mailjet.key'),
+                    config('services.mailjet.secret')
+                )
+            );
+        });
     }
 
     /**

diff --git a/src/Transport/MailjetTransport.php b/src/Transport/MailjetTransport.php