Merge pull request #12 from fhpimenta/support-laravel-6.0

support for Laravel 6.0

Author: Lidbetter

composer.json

@@ -1,24 +1,31 @@
 {
-  "name": "clarification/sparkpost-laravel-driver",
-  "type": "library",
-  "description" : "Sparkpost mail driver for Laravel",
-  "keywords": ["laravel", "mail", "driver", "sparkpost"],
-  "license": "MIT",
-  "homepage" : "http://clarification.io",
-  "authors": [
-    {
-      "name" : "Robin Lidbetter",
-      "role" : "Developer"
+    "name": "clarification/sparkpost-laravel-driver",
+    "type": "library",
+    "description" : "Sparkpost mail driver for Laravel",
+    "keywords": ["laravel", "mail", "driver", "sparkpost"],
+    "license": "MIT",
+    "homepage" : "http://clarification.io",
+    "authors": [
+        {
+            "name" : "Robin Lidbetter",
+            "role" : "Developer"
+        }
+    ],
+    "require": {
+        "guzzlehttp/guzzle": ">=5.0",
+        "illuminate/container": ">=5.0",
+        "swiftmailer/swiftmailer": "~5.1||~6.0"
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Clarification\\MailDrivers\\Sparkpost\\SparkpostServiceProvider"
+            ]
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Clarification\\MailDrivers\\Sparkpost\\": "src"
+        }
     }
-  ],
-  "require": {
-    "guzzlehttp/guzzle": ">=5.0",
-    "illuminate/container": ">=5.0",
-    "swiftmailer/swiftmailer": "~5.1||~6.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Clarification\\MailDrivers\\Sparkpost\\": "src"
-    }
-  }
 }

src/SparkpostServiceProvider.php

@@ -3,11 +3,13 @@
 namespace Clarification\MailDrivers\Sparkpost;
 
 use GuzzleHttp\Client;
+use Swift_Mime_Message;
 use Illuminate\Mail\TransportManager;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Mail\Transport\Transport as AbstractTransport;
 use Clarification\MailDrivers\Sparkpost\Transport\SparkPostTransport;
 use Clarification\MailDrivers\Sparkpost\Transport\SparkPostTransportFiveZero;
+use Clarification\MailDrivers\Sparkpost\Transport\SparkPostTransportFiveFive;
 use Illuminate\Mail\Transport\SparkPostTransport as LaravelSparkPostTransport;
 
 class SparkpostServiceProvider extends ServiceProvider
@@ -46,6 +48,13 @@ public function register()
                 $client = new Client($guzzleOptions);
 
                 if(class_exists(AbstractTransport::class)) {
+                    // version 6 of swiftmailer removed this class in favor of Swift_Mime_SimpleMessage
+                    // https://github.com/swiftmailer/swiftmailer/blob/5a90a13527e955f2d6e8fcc8876d087a89d37da3/CHANGES#L64-L78
+                    // larvel version 5.5 requires version 6 of swiftmailer and has updated method signatures
+                    if(!interface_exists(Swift_Mime_Message::class)) {
+                        return new SparkPostTransportFiveFive($client, $config['secret'], $sparkpostOptions);
+                    }
+
                     return new SparkPostTransport($client, $config['secret'], $sparkpostOptions);
                 }
 

src/Transport/SparkPostTransportFiveFive.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Clarification\MailDrivers\Sparkpost\Transport;
+
+use Illuminate\Mail\Transport\Transport;
+use Swift_Mime_SimpleMessage;
+
+class SparkPostTransportFiveFive extends Transport
+{
+    use SparkPostTransportTrait;
+
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
+    {
+        $this->beforeSendPerformed($message);
+
+        $recipients = $this->getRecipients($message);
+
+        $message->setBcc([]);
+
+        $options = [
+            'headers' => [
+                'Authorization' => $this->key,
+            ],
+            'json' => [
+                'recipients' => $recipients,
+                'content' => [
+                    'email_rfc822' => $message->toString(),
+                ],
+            ],
+        ];
+
+        if ($this->options) {
+            $options['json']['options'] = $this->options;
+        }
+
+        return $this->client->post('https://api.sparkpost.com/api/v1/transmissions', $options);
+    }
+
+    /**
+     * Get all the addresses this message should be sent to.
+     *
+     * Note that SparkPost still respects CC, BCC headers in raw message itself.
+     *
+     * @param  Swift_Mime_SimpleMessage $message
+     * @return array
+     */
+    protected function getRecipients(Swift_Mime_SimpleMessage $message)
+    {
+        $to = [];
+        if ($getTo = $message->getTo()) {
+            $to = array_merge($to, array_keys($getTo));
+        }
+
+        if ($getCc = $message->getCc()) {
+            $to = array_merge($to, array_keys($getCc));
+        }
+
+        if ($getBcc = $message->getBcc()) {
+            $to = array_merge($to, array_keys($getBcc));
+        }
+
+        $recipients = array_map(function ($address) {
+            return compact('address');
+        }, $to);
+
+        return $recipients;
+    }
+}