Skip to content

Add support for Swiftmailer 6 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 7, 2018
Merged

Add support for Swiftmailer 6 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"require" : {
"php": ">=7.0",
"swiftmailer/swiftmailer": "^5.1",
"swiftmailer/swiftmailer": "^5.1 || ^6.0",
"tijsverkoyen/css-to-inline-styles": "^2.1"
},
"require-dev" : {
Expand Down
176 changes: 146 additions & 30 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions tests/src/CssInlinerPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function setUp()
$this->emailRaw = file_get_contents($dir.'emailRaw.html');
$this->emailConverted = file_get_contents($dir.'emailConverted.html');

$this->mailer = Swift_Mailer::newInstance(Swift_NullTransport::newInstance());
$this->mailer = new Swift_Mailer(new Swift_NullTransport);
Copy link
Contributor Author

@fabpot fabpot Sep 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works well for both 5.1 and 6.0 as newInstance was really just a proxy method to __construct

$this->mailer->registerPLugin(new CssInlinerPlugin());
}

Expand All @@ -44,7 +44,7 @@ public function setUp()
*/
private function createMessage()
{
$message = Swift_Message::newInstance();
$message = new Swift_Message();

$message->setFrom('[email protected]');
$message->setTo('[email protected]');
Expand Down Expand Up @@ -109,7 +109,7 @@ public function testInjectedConverterIsUsedInsteadOfDefault()
$message = $this->createMessage();
$message->setContentType('text/html');

$mailer = Swift_Mailer::newInstance(Swift_NullTransport::newInstance());
$mailer = new Swift_Mailer(new Swift_NullTransport);
$mailer->registerPlugin(new CssInlinerPlugin($converterStub));
$mailer->send($message);
}
Expand Down