Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "MIT",
"require": {
"php" : ">=5.3.0",
"swiftmailer/swiftmailer": "~5.2"
"swiftmailer/swiftmailer": "~5.2|^6.0"
},
"require-dev": {
"psr/log": "*"
Expand Down
10 changes: 6 additions & 4 deletions lib/mailer/sfMailer.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,9 @@ public function setDeliveryAddress($address)
*/
public function compose($from = null, $to = null, $subject = null, $body = null)
{
return Swift_Message::newInstance()
$msg = new Swift_Message();

return $msg
->setFrom($from)
->setTo($to)
->setSubject($subject)
Expand Down Expand Up @@ -277,12 +279,12 @@ public function sendNextImmediately()
/**
* Sends the given message.
*
* @param Swift_Transport $transport A transport instance
* @param string[] &$failedRecipients An array of failures by-reference
* @param Swift_Mime_Message|Swift_Mime_SimpleMessage $message The message to send.
* @param string[] &$failedRecipients An array of failures by-reference
*
* @return int|false The number of sent emails
*/
public function send(Swift_Mime_Message $message, &$failedRecipients = null)
public function send($message, &$failedRecipients = null)
{
if ($this->force)
{
Expand Down
2 changes: 1 addition & 1 deletion lib/mailer/sfNoMailer.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function sendNextImmediately()
return null;
}

public function send(Swift_Mime_Message $message, &$failedRecipients = null)
public function send($message, &$failedRecipients = null)
{
return null;
}
Expand Down