support Laravel9

Author: s-ichikawa

composer.json

@@ -4,16 +4,16 @@
     "keywords": ["laravel", "sendgrid"],
     "license": "MIT",
     "require": {
-        "illuminate/mail": ">=7.0",
-        "illuminate/support": ">=7.0",
-        "guzzlehttp/guzzle": "^6.3 || ^7.0"
+        "illuminate/mail": "^9.0",
+        "illuminate/support": "^9.0",
+        "guzzlehttp/guzzle": "^7.2"
     },
     "require-dev": {
-        "illuminate/container": ">=7.0",
-        "illuminate/filesystem": ">=7.0",
-        "phpunit/phpunit": "^8.5",
+        "illuminate/container": "^9.0",
+        "illuminate/filesystem": "^9.0",
+        "phpunit/phpunit": "^9.5.8",
         "laravel/helpers": "^1.2",
-        "vlucas/phpdotenv": "^4.1 || ^5.2"
+        "vlucas/phpdotenv": "^5.4.1"
     },
     "autoload": {
         "psr-4": {
@@ -43,5 +43,7 @@
                 "Sichikawa\\LaravelSendgridDriver\\SendgridTransportServiceProvider"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

src/SendGrid.php

@@ -3,9 +3,8 @@
 namespace Sichikawa\LaravelSendgridDriver;
 
 use Illuminate\Mail\Mailable;
-use Illuminate\Notifications\Messages\MailMessage;
 use Sichikawa\LaravelSendgridDriver\Transport\SendgridTransport;
-use Swift_Message;
+use Symfony\Component\Mime\Email;
 
 trait SendGrid
 {
@@ -16,9 +15,9 @@ trait SendGrid
      */
     public function sendgrid($params)
     {
-        if (($this instanceof Mailable || $this instanceof MailMessage) && $this->mailDriver() == "sendgrid") {
-            $this->withSwiftMessage(function (Swift_Message $message) use ($params) {
-                $message->embed(new \Swift_Image(static::sgEncode($params), SendgridTransport::SMTP_API_NAME));
+        if (($this instanceof Mailable) && $this->mailDriver() == "sendgrid") {
+            $this->withSymfonyMessage(function (Email $email) use ($params) {
+                $email->embed(static::sgEncode($params), SendgridTransport::REQUEST_BODY_PARAMETER);
             });
         }
         return $this;
@@ -51,7 +50,7 @@ public static function sgEncode($params)
     public static function sgDecode($strParams)
     {
         if (!is_string($strParams)) {
-            return (array) $strParams;
+            return (array)$strParams;
         }
         $params = json_decode($strParams, true);
         return is_array($params) ? $params : [];

src/SendgridTransportServiceProvider.php

@@ -11,7 +11,7 @@
 class SendgridTransportServiceProvider extends ServiceProvider
 {
     /**
-     * Register the Swift Transport instance.
+     * Register the Sendgrid Transport instance.
      *
      * @return void
      */
@@ -23,7 +23,7 @@ public function register()
                     $config = $this->app['config']->get('services.sendgrid', []);
                 }
                 $client = new HttpClient(Arr::get($config, 'guzzle', []));
-                $endpoint = isset($config['endpoint']) ? $config['endpoint'] : null;
+                $endpoint = $config['endpoint'] ?? null;
 
                 return new SendgridTransport($client, $config['api_key'], $endpoint);
             });