Changes to allow Swiftmailer 5 and 6.

FriendsOfSymfony1 · Sep 9, 2020 · 9c1ef4e · 9c1ef4e
1 parent 2987dcd
commit 9c1ef4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -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": "*"

diff --git a/lib/mailer/sfMailer.class.php b/lib/mailer/sfMailer.class.php
@@ -239,7 +239,8 @@ 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)
@@ -282,7 +283,7 @@ public function sendNextImmediately()
    *
    * @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)
     {