Skip to content

Commit 9c1ef4e

Browse files
committed
Changes to allow Swiftmailer 5 and 6.
1 parent 2987dcd commit 9c1ef4e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "MIT",
66
"require": {
77
"php" : ">=5.3.0",
8-
"swiftmailer/swiftmailer": "~5.2"
8+
"swiftmailer/swiftmailer": "~5.2|^6.0"
99
},
1010
"require-dev": {
1111
"psr/log": "*"

lib/mailer/sfMailer.class.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,8 @@ public function setDeliveryAddress($address)
239239
*/
240240
public function compose($from = null, $to = null, $subject = null, $body = null)
241241
{
242-
return Swift_Message::newInstance()
242+
$msg = new Swift_Message();
243+
return $msg
243244
->setFrom($from)
244245
->setTo($to)
245246
->setSubject($subject)
@@ -282,7 +283,7 @@ public function sendNextImmediately()
282283
*
283284
* @return int|false The number of sent emails
284285
*/
285-
public function send(Swift_Mime_Message $message, &$failedRecipients = null)
286+
public function send($message, &$failedRecipients = null)
286287
{
287288
if ($this->force)
288289
{

0 commit comments

Comments
 (0)