Support for Swiftmailer 6 & Laravel 5.5 (#3)

clarification · Dec 1, 2017 · 2f2a5d5 · 2f2a5d5
1 parent 2d4dfe4
commit 2f2a5d5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
   ],
   "require": {
     "illuminate/container": ">=5.0",
-    "swiftmailer/swiftmailer": "~5.1"
+    "swiftmailer/swiftmailer": "~6.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/Transport/SendgridTransport.php b/src/Transport/SendgridTransport.php
@@ -5,7 +5,7 @@
 use Swift_Image;
 use Swift_MimePart;
 use Swift_Attachment;
-use Swift_Mime_Message;
+use Swift_Mime_SimpleMessage;
 use GuzzleHttp\ClientInterface;
 use Illuminate\Mail\Transport\Transport;
 
@@ -31,12 +31,12 @@ public function __construct(ClientInterface $client, $api_key)
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      * @param string[]           $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
         list($from, $fromName) = $this->getFromAddresses($message);
         $payload = $this->options;
@@ -62,9 +62,9 @@ public function send(Swift_Mime_Message $message, &$failedRecipients = null)
     }
     /**
      * @param  $data
-     * @param  Swift_Mime_Message $message
+     * @param  Swift_Mime_SimpleMessage $message
      */
-    protected function setTo(&$data, Swift_Mime_Message $message)
+    protected function setTo(&$data, Swift_Mime_SimpleMessage $message)
     {
         if ($to = $message->getTo()) {
             $data['to'] = array_keys($to);
@@ -73,9 +73,9 @@ protected function setTo(&$data, Swift_Mime_Message $message)
     }
     /**
      * @param $data
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      */
-    protected function setCc(&$data, Swift_Mime_Message $message)
+    protected function setCc(&$data, Swift_Mime_SimpleMessage $message)
     {
         if ($cc = $message->getCc()) {
             $data['cc'] = array_keys($cc);
@@ -84,9 +84,9 @@ protected function setCc(&$data, Swift_Mime_Message $message)
     }
     /**
      * @param $data
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      */
-    protected function setBcc(&$data, Swift_Mime_Message $message)
+    protected function setBcc(&$data, Swift_Mime_SimpleMessage $message)
     {
         if ($bcc = $message->getBcc()) {
             $data['bcc'] = array_keys($bcc);
@@ -95,9 +95,9 @@ protected function setBcc(&$data, Swift_Mime_Message $message)
     }
     /**
      * @param $data
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      */
-    protected function setReplyTo(&$data, Swift_Mime_Message $message)
+    protected function setReplyTo(&$data, Swift_Mime_SimpleMessage $message)
     {
         if ($replyTo = $message->getReplyTo()) {
             $data['replyto'] = array_keys($replyTo);
@@ -107,10 +107,10 @@ protected function setReplyTo(&$data, Swift_Mime_Message $message)
     /**
      * Get From Addresses.
      *
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      * @return array
      */
-    protected function getFromAddresses(Swift_Mime_Message $message)
+    protected function getFromAddresses(Swift_Mime_SimpleMessage $message)
     {
         if ($message->getFrom()) {
             foreach ($message->getFrom() as $address => $name) {
@@ -123,9 +123,9 @@ protected function getFromAddresses(Swift_Mime_Message $message)
      * Set text contents.
      *
      * @param $data
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      */
-    protected function setText(&$data, Swift_Mime_Message $message)
+    protected function setText(&$data, Swift_Mime_SimpleMessage $message)
     {
         foreach ($message->getChildren() as $attachment) {
             if (!$attachment instanceof Swift_MimePart) {
@@ -138,9 +138,9 @@ protected function setText(&$data, Swift_Mime_Message $message)
      * Set Attachment Files.
      *
      * @param $data
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      */
-    protected function setAttachment(&$data, Swift_Mime_Message $message)
+    protected function setAttachment(&$data, Swift_Mime_SimpleMessage $message)
     {
         foreach ($message->getChildren() as $attachment) {
             if (!$attachment instanceof Swift_Attachment || !strlen($attachment->getBody()) > self::MAXIMUM_FILE_SIZE) {
@@ -155,9 +155,9 @@ protected function setAttachment(&$data, Swift_Mime_Message $message)
      * Set Sendgrid SMTP API
      *
      * @param $data
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      */
-    protected function setSmtpApi(&$data, Swift_Mime_Message $message)
+    protected function setSmtpApi(&$data, Swift_Mime_SimpleMessage $message)
     {
         foreach ($message->getChildren() as $attachment) {
             if (!$attachment instanceof Swift_Image