Merge pull request #2559 from derrabus/swiftmailer-6-compat

XWB · web-flow · commit 6e87556bdc5c · 2017-05-21T21:54:50.000+02:00
SwiftMailer 6 compatibility
diff --git a/Mailer/Mailer.php b/Mailer/Mailer.php
@@ -96,7 +96,7 @@ protected function sendEmailMessage($renderedTemplate, $fromEmail, $toEmail)
         $subject = array_shift($renderedLines);
         $body = implode("\n", $renderedLines);
 
-        $message = \Swift_Message::newInstance()
+        $message = (new \Swift_Message())
             ->setSubject($subject)
             ->setFrom($fromEmail)
             ->setTo($toEmail)
diff --git a/Mailer/TwigSwiftMailer.php b/Mailer/TwigSwiftMailer.php
@@ -105,7 +105,7 @@ protected function sendMessage($templateName, $context, $fromEmail, $toEmail)
             $htmlBody = $template->renderBlock('body_html', $context);
         }
 
-        $message = \Swift_Message::newInstance()
+        $message = (new \Swift_Message())
             ->setSubject($subject)
             ->setFrom($fromEmail)
             ->setTo($toEmail);
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
     "require-dev": {
         "doctrine/doctrine-bundle": "^1.3",
         "friendsofphp/php-cs-fixer": "^1.11",
-        "swiftmailer/swiftmailer": "^4.3 || ^5.0",
+        "swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0",
         "symfony/console": "^2.7 || ^3.0",
         "symfony/phpunit-bridge": "^2.7 || ^3.0",
         "symfony/validator": "^2.7 || ^3.0",

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ protected function sendMessage($templateName, $context, $fromEmail, $toEmail)`
`105`	`105`	`$htmlBody = $template->renderBlock('body_html', $context);`
`106`	`106`	`}`
`107`	`107`
`108`		`- $message = \Swift_Message::newInstance()`
	`108`	`+ $message = (new \Swift_Message())`
`109`	`109`	`->setSubject($subject)`
`110`	`110`	`->setFrom($fromEmail)`
`111`	`111`	`->setTo($toEmail);`