Support for SwiftMailer 6.0

mailjet · Jun 13, 2019 · 300eb93 · 300eb93
2 parents bd1c115 + f7d042a
commit 300eb93
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: php
 php:
-  - 5.6
   - 7.0
   - 7.1
 

diff --git a/SwiftMailer/MailjetTransport.php b/SwiftMailer/MailjetTransport.php
@@ -5,7 +5,7 @@
 use \Swift_Events_EventDispatcher;
 use \Swift_Events_EventListener;
 use \Swift_Events_SendEvent;
-use \Swift_Mime_Message;
+use \Swift_Mime_SimpleMessage;
 use \Swift_Transport;
 use Mailjet\Resources;
 use Mailjet\MailjetSwiftMailer\SwiftMailer\MessageFormat\MessagePayloadV31;
@@ -109,11 +109,11 @@ public function ping() {
     }
 
     /**
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      * @param null $failedRecipients
      * @return int Number of messages sent
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null) {
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null) {
         $this->resultApi = null;
         $failedRecipients = (array) $failedRecipients;
         if ($event = $this->eventDispatcher->createSendEvent($this, $message)) {
@@ -158,7 +158,7 @@ public function send(Swift_Mime_Message $message, &$failedRecipients = null) {
     }
 
     /**
-     * @param array $message (of Swift_Mime_Message)
+     * @param array $message (of Swift_Mime_SimpleMessage)
      * @param null $failedRecipients
      * @return int Number of messages sent
      */

diff --git a/SwiftMailer/MessageFormat/BaseMessagePayload.php b/SwiftMailer/MessageFormat/BaseMessagePayload.php
@@ -2,17 +2,17 @@
 
 namespace Mailjet\MailjetSwiftMailer\SwiftMailer\MessageFormat;
 
-use \Swift_Mime_Message;
+use \Swift_Mime_SimpleMessage;
 
 abstract class BaseMessagePayload implements MessageFormatStrategyInterface
 {
     /**
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      *
      * @return string
      * @throws \ReflectionException
      */
-    protected static function getMessagePrimaryContentType(Swift_Mime_Message $message)
+    protected static function getMessagePrimaryContentType(Swift_Mime_SimpleMessage $message)
     {
         $contentType = $message->getContentType();
         if (self::supportsContentType($contentType)) {
@@ -56,12 +56,12 @@ protected static function supportsContentType($contentType)
      * Extract Mailjet specific header
      * return an array of formatted data for Mailjet send API
      *
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      * @param array              $mailjetHeaders
      *
      * @return array
      */
-    protected static function prepareHeaders(Swift_Mime_Message $message, $mailjetHeaders)
+    protected static function prepareHeaders(Swift_Mime_SimpleMessage $message, $mailjetHeaders)
     {
         $messageHeaders = $message->getHeaders();
 
@@ -87,11 +87,11 @@ protected static function prepareHeaders(Swift_Mime_Message $message, $mailjetHe
     /**
      * Extract user defined starting with X-*
      *
-     * @param  Swift_Mime_Message $message
+     * @param  Swift_Mime_SimpleMessage $message
      *
      * @return array
      */
-    protected static function findUserDefinedHeaders(Swift_Mime_Message $message)
+    protected static function findUserDefinedHeaders(Swift_Mime_SimpleMessage $message)
     {
         $messageHeaders = $message->getHeaders();
         $userDefinedHeaders = [];
@@ -111,12 +111,12 @@ protected static function findUserDefinedHeaders(Swift_Mime_Message $message)
     /**
      * Convert Swift_Mime_SimpleMessage into Mailjet Payload for send API
      *
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      *
      * @return array Mailjet Send Message
      * @throws \Swift_SwiftException
      */
-    abstract public function getMailjetMessage(Swift_Mime_Message $message);
+    abstract public function getMailjetMessage(Swift_Mime_SimpleMessage $message);
 
     /**
      * Returns the version of the message format

diff --git a/SwiftMailer/MessageFormat/MessageFormatStrategyInterface.php b/SwiftMailer/MessageFormat/MessageFormatStrategyInterface.php
@@ -1,15 +1,15 @@
 <?php
 
 namespace Mailjet\MailjetSwiftMailer\SwiftMailer\MessageFormat;
-use \Swift_Mime_Message;
+use \Swift_Mime_SimpleMessage;
 /**
  * Description of MessageFormatStrategyInterface
  *
  * @author l.atanasov
  */
 interface MessageFormatStrategyInterface {
 
-    public function getMailjetMessage(Swift_Mime_Message $message);
+    public function getMailjetMessage(Swift_Mime_SimpleMessage $message);
 
     public function getVersion();
 }
diff --git a/SwiftMailer/MessageFormat/MessagePayloadV3.php b/SwiftMailer/MessageFormat/MessagePayloadV3.php
@@ -2,7 +2,7 @@
 
 namespace Mailjet\MailjetSwiftMailer\SwiftMailer\MessageFormat;
 
-use \Swift_Mime_Message;
+use \Swift_Mime_SimpleMessage;
 use \Swift_Attachment;
 use \Swift_MimePart;
 
@@ -14,11 +14,11 @@ class MessagePayloadV3 extends BaseMessagePayload {
      * https://dev.mailjet.com/guides/#send-api-json-properties
      * Convert Swift_Mime_SimpleMessage into Mailjet Payload for send API
      *
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      * @return array Mailjet Send Message
      * @throws \Swift_SwiftException
      */
-    public function getMailjetMessage(Swift_Mime_Message $message) {
+    public function getMailjetMessage(Swift_Mime_SimpleMessage $message) {
         $contentType = $this->getMessagePrimaryContentType($message);
         $fromAddresses = $message->getFrom();
         $fromEmails = array_keys($fromAddresses);
@@ -128,11 +128,11 @@ private static function getMailjetHeaders() {
     /**
      * Get the 'reply_to' headers and format as required by Mailjet.
      *
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      *
      * @return string|null
      */
-    protected function getReplyTo(Swift_Mime_Message $message) {
+    protected function getReplyTo(Swift_Mime_SimpleMessage $message) {
         if (is_array($message->getReplyTo())) {
             return current($message->getReplyTo()) . ' <' . key($message->getReplyTo()) . '>';
         }
@@ -141,11 +141,11 @@ protected function getReplyTo(Swift_Mime_Message $message) {
     /**
      * Get all the addresses this message should be sent to.
      *
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      *
      * @return array
      */
-    protected function getRecipients(Swift_Mime_Message $message) {
+    protected function getRecipients(Swift_Mime_SimpleMessage $message) {
         $to = [];
         if ($message->getTo()) {
             $to = array_merge($to, $message->getTo());

diff --git a/SwiftMailer/MessageFormat/MessagePayloadV31.php b/SwiftMailer/MessageFormat/MessagePayloadV31.php
@@ -2,7 +2,7 @@
 
 namespace Mailjet\MailjetSwiftMailer\SwiftMailer\MessageFormat;
 
-use \Swift_Mime_Message;
+use \Swift_Mime_SimpleMessage;
 use \Swift_Attachment;
 use \Swift_MimePart;
 
@@ -14,11 +14,11 @@ class MessagePayloadV31 extends BaseMessagePayload {
      * https://dev.mailjet.com/guides/#send-api-json-properties
      * Convert Swift_Mime_SimpleMessage into Mailjet Payload for send API
      *
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      * @return array Mailjet Send Message
      * @throws \Swift_SwiftException
      */
-    public function getMailjetMessage(Swift_Mime_Message $message) {
+    public function getMailjetMessage(Swift_Mime_SimpleMessage $message) {
         $contentType = $this->getMessagePrimaryContentType($message);
         $fromAddresses = $message->getFrom();
         $fromEmails = array_keys($fromAddresses);
@@ -177,11 +177,11 @@ private static function getMailjetHeaders() {
     /**
      * Get the 'reply_to' headers and format as required by Mailjet.
      *
-     * @param Swift_Mime_Message $message
+     * @param Swift_Mime_SimpleMessage $message
      *
      * @return array|null
      */
-    private function getReplyTo(Swift_Mime_Message $message) {
+    private function getReplyTo(Swift_Mime_SimpleMessage $message) {
         if (is_array($message->getReplyTo())) {
             return array('Email' => key($message->getReplyTo()), 'Name' => current($message->getReplyTo()));
         } elseif (is_string($message->getReplyTo())) {

diff --git a/composer.json b/composer.json
@@ -5,9 +5,9 @@
     "keywords": ["mailjet", "swiftmailer"],
     "homepage": "https://github.com/mailjet/MailjetSwiftMailer",
     "require": {
-        "php": ">=5.4",
+        "php": ">=7.0",
         "mailjet/mailjet-apiv3-php": "^1.2",
-        "swiftmailer/swiftmailer": "~5.4"
+        "swiftmailer/swiftmailer": "~6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",
-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     language: php
     php:
-      - 5.6
       - 7.0
       - 7.1
@@ Expand Down @@