Skip to content

Commit 300eb93

Browse files
mskochevmskochev
authored
Support for SwiftMailer 6.0
2 parents bd1c115 + f7d042a commit 300eb93

7 files changed

+29
-30
lines changed

‎.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
22
php:
3-
- 5.6
43
- 7.0
54
- 7.1
65

‎SwiftMailer/MailjetTransport.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use \Swift_Events_EventDispatcher;
66
use \Swift_Events_EventListener;
77
use \Swift_Events_SendEvent;
8-
use \Swift_Mime_Message;
8+
use \Swift_Mime_SimpleMessage;
99
use \Swift_Transport;
1010
use Mailjet\Resources;
1111
use Mailjet\MailjetSwiftMailer\SwiftMailer\MessageFormat\MessagePayloadV31;
@@ -109,11 +109,11 @@ public function ping() {
109109
}
110110

111111
/**
112-
* @param Swift_Mime_Message $message
112+
* @param Swift_Mime_SimpleMessage $message
113113
* @param null $failedRecipients
114114
* @return int Number of messages sent
115115
*/
116-
public function send(Swift_Mime_Message $message, &$failedRecipients = null) {
116+
public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null) {
117117
$this->resultApi = null;
118118
$failedRecipients = (array) $failedRecipients;
119119
if ($event = $this->eventDispatcher->createSendEvent($this, $message)) {
@@ -158,7 +158,7 @@ public function send(Swift_Mime_Message $message, &$failedRecipients = null) {
158158
}
159159

160160
/**
161-
* @param array $message (of Swift_Mime_Message)
161+
* @param array $message (of Swift_Mime_SimpleMessage)
162162
* @param null $failedRecipients
163163
* @return int Number of messages sent
164164
*/

‎SwiftMailer/MessageFormat/BaseMessagePayload.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
namespace Mailjet\MailjetSwiftMailer\SwiftMailer\MessageFormat;
44

5-
use \Swift_Mime_Message;
5+
use \Swift_Mime_SimpleMessage;
66

77
abstract class BaseMessagePayload implements MessageFormatStrategyInterface
88
{
99
/**
10-
* @param Swift_Mime_Message $message
10+
* @param Swift_Mime_SimpleMessage $message
1111
*
1212
* @return string
1313
* @throws \ReflectionException
1414
*/
15-
protected static function getMessagePrimaryContentType(Swift_Mime_Message $message)
15+
protected static function getMessagePrimaryContentType(Swift_Mime_SimpleMessage $message)
1616
{
1717
$contentType = $message->getContentType();
1818
if (self::supportsContentType($contentType)) {
@@ -56,12 +56,12 @@ protected static function supportsContentType($contentType)
5656
* Extract Mailjet specific header
5757
* return an array of formatted data for Mailjet send API
5858
*
59-
* @param Swift_Mime_Message $message
59+
* @param Swift_Mime_SimpleMessage $message
6060
* @param array $mailjetHeaders
6161
*
6262
* @return array
6363
*/
64-
protected static function prepareHeaders(Swift_Mime_Message $message, $mailjetHeaders)
64+
protected static function prepareHeaders(Swift_Mime_SimpleMessage $message, $mailjetHeaders)
6565
{
6666
$messageHeaders = $message->getHeaders();
6767

@@ -87,11 +87,11 @@ protected static function prepareHeaders(Swift_Mime_Message $message, $mailjetHe
8787
/**
8888
* Extract user defined starting with X-*
8989
*
90-
* @param Swift_Mime_Message $message
90+
* @param Swift_Mime_SimpleMessage $message
9191
*
9292
* @return array
9393
*/
94-
protected static function findUserDefinedHeaders(Swift_Mime_Message $message)
94+
protected static function findUserDefinedHeaders(Swift_Mime_SimpleMessage $message)
9595
{
9696
$messageHeaders = $message->getHeaders();
9797
$userDefinedHeaders = [];
@@ -111,12 +111,12 @@ protected static function findUserDefinedHeaders(Swift_Mime_Message $message)
111111
/**
112112
* Convert Swift_Mime_SimpleMessage into Mailjet Payload for send API
113113
*
114-
* @param Swift_Mime_Message $message
114+
* @param Swift_Mime_SimpleMessage $message
115115
*
116116
* @return array Mailjet Send Message
117117
* @throws \Swift_SwiftException
118118
*/
119-
abstract public function getMailjetMessage(Swift_Mime_Message $message);
119+
abstract public function getMailjetMessage(Swift_Mime_SimpleMessage $message);
120120

121121
/**
122122
* Returns the version of the message format

‎SwiftMailer/MessageFormat/MessageFormatStrategyInterface.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22

33
namespace Mailjet\MailjetSwiftMailer\SwiftMailer\MessageFormat;
4-
use \Swift_Mime_Message;
4+
use \Swift_Mime_SimpleMessage;
55
/**
66
* Description of MessageFormatStrategyInterface
77
*
88
* @author l.atanasov
99
*/
1010
interface MessageFormatStrategyInterface {
1111

12-
public function getMailjetMessage(Swift_Mime_Message $message);
12+
public function getMailjetMessage(Swift_Mime_SimpleMessage $message);
1313

1414
public function getVersion();
1515
}

‎SwiftMailer/MessageFormat/MessagePayloadV3.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Mailjet\MailjetSwiftMailer\SwiftMailer\MessageFormat;
44

5-
use \Swift_Mime_Message;
5+
use \Swift_Mime_SimpleMessage;
66
use \Swift_Attachment;
77
use \Swift_MimePart;
88

@@ -14,11 +14,11 @@ class MessagePayloadV3 extends BaseMessagePayload {
1414
* https://dev.mailjet.com/guides/#send-api-json-properties
1515
* Convert Swift_Mime_SimpleMessage into Mailjet Payload for send API
1616
*
17-
* @param Swift_Mime_Message $message
17+
* @param Swift_Mime_SimpleMessage $message
1818
* @return array Mailjet Send Message
1919
* @throws \Swift_SwiftException
2020
*/
21-
public function getMailjetMessage(Swift_Mime_Message $message) {
21+
public function getMailjetMessage(Swift_Mime_SimpleMessage $message) {
2222
$contentType = $this->getMessagePrimaryContentType($message);
2323
$fromAddresses = $message->getFrom();
2424
$fromEmails = array_keys($fromAddresses);
@@ -128,11 +128,11 @@ private static function getMailjetHeaders() {
128128
/**
129129
* Get the 'reply_to' headers and format as required by Mailjet.
130130
*
131-
* @param Swift_Mime_Message $message
131+
* @param Swift_Mime_SimpleMessage $message
132132
*
133133
* @return string|null
134134
*/
135-
protected function getReplyTo(Swift_Mime_Message $message) {
135+
protected function getReplyTo(Swift_Mime_SimpleMessage $message) {
136136
if (is_array($message->getReplyTo())) {
137137
return current($message->getReplyTo()) . ' <' . key($message->getReplyTo()) . '>';
138138
}
@@ -141,11 +141,11 @@ protected function getReplyTo(Swift_Mime_Message $message) {
141141
/**
142142
* Get all the addresses this message should be sent to.
143143
*
144-
* @param Swift_Mime_Message $message
144+
* @param Swift_Mime_SimpleMessage $message
145145
*
146146
* @return array
147147
*/
148-
protected function getRecipients(Swift_Mime_Message $message) {
148+
protected function getRecipients(Swift_Mime_SimpleMessage $message) {
149149
$to = [];
150150
if ($message->getTo()) {
151151
$to = array_merge($to, $message->getTo());

‎SwiftMailer/MessageFormat/MessagePayloadV31.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Mailjet\MailjetSwiftMailer\SwiftMailer\MessageFormat;
44

5-
use \Swift_Mime_Message;
5+
use \Swift_Mime_SimpleMessage;
66
use \Swift_Attachment;
77
use \Swift_MimePart;
88

@@ -14,11 +14,11 @@ class MessagePayloadV31 extends BaseMessagePayload {
1414
* https://dev.mailjet.com/guides/#send-api-json-properties
1515
* Convert Swift_Mime_SimpleMessage into Mailjet Payload for send API
1616
*
17-
* @param Swift_Mime_Message $message
17+
* @param Swift_Mime_SimpleMessage $message
1818
* @return array Mailjet Send Message
1919
* @throws \Swift_SwiftException
2020
*/
21-
public function getMailjetMessage(Swift_Mime_Message $message) {
21+
public function getMailjetMessage(Swift_Mime_SimpleMessage $message) {
2222
$contentType = $this->getMessagePrimaryContentType($message);
2323
$fromAddresses = $message->getFrom();
2424
$fromEmails = array_keys($fromAddresses);
@@ -177,11 +177,11 @@ private static function getMailjetHeaders() {
177177
/**
178178
* Get the 'reply_to' headers and format as required by Mailjet.
179179
*
180-
* @param Swift_Mime_Message $message
180+
* @param Swift_Mime_SimpleMessage $message
181181
*
182182
* @return array|null
183183
*/
184-
private function getReplyTo(Swift_Mime_Message $message) {
184+
private function getReplyTo(Swift_Mime_SimpleMessage $message) {
185185
if (is_array($message->getReplyTo())) {
186186
return array('Email' => key($message->getReplyTo()), 'Name' => current($message->getReplyTo()));
187187
} elseif (is_string($message->getReplyTo())) {

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"keywords": ["mailjet", "swiftmailer"],
66
"homepage": "https://github.com/mailjet/MailjetSwiftMailer",
77
"require": {
8-
"php": ">=5.4",
8+
"php": ">=7.0",
99
"mailjet/mailjet-apiv3-php": "^1.2",
10-
"swiftmailer/swiftmailer": "~5.4"
10+
"swiftmailer/swiftmailer": "~6.0"
1111
},
1212
"require-dev": {
1313
"phpunit/phpunit": "^5.7",

0 commit comments

Comments
 (0)