From 1c64cbdfd98f76f0bb1d87ee5736643a32f6f627 Mon Sep 17 00:00:00 2001 From: "Thomas A. Hirsch" Date: Thu, 10 Sep 2020 07:42:18 +0200 Subject: [PATCH] PR feedback. --- lib/mailer/sfMailer.class.php | 5 +++-- lib/mailer/sfNoMailer.class.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/mailer/sfMailer.class.php b/lib/mailer/sfMailer.class.php index fc545ff86..86afba3e3 100755 --- a/lib/mailer/sfMailer.class.php +++ b/lib/mailer/sfMailer.class.php @@ -240,6 +240,7 @@ public function setDeliveryAddress($address) public function compose($from = null, $to = null, $subject = null, $body = null) { $msg = new Swift_Message(); + return $msg ->setFrom($from) ->setTo($to) @@ -278,8 +279,8 @@ 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 */ diff --git a/lib/mailer/sfNoMailer.class.php b/lib/mailer/sfNoMailer.class.php index 83324e9a0..507b61a33 100644 --- a/lib/mailer/sfNoMailer.class.php +++ b/lib/mailer/sfNoMailer.class.php @@ -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; }