Fix incompatibilities with new version of Swiftmailer

[MAILPOET-2589]
This commit is contained in:
Jan Jakeš
2020-01-29 11:45:01 +01:00
committed by Jack Kitterhing
parent aeac8c664d
commit 43873306cd
2 changed files with 4 additions and 5 deletions

View File

@@ -78,8 +78,7 @@ class SMTP {
}
public function buildMailer() {
$transport = Swift_SmtpTransport::newInstance(
$this->host, $this->port, $this->encryption);
$transport = new Swift_SmtpTransport($this->host, $this->port, $this->encryption);
$connectionTimeout = $this->wp->applyFilters('mailpoet_mailer_smtp_connection_timeout', self::SMTP_CONNECTION_TIMEOUT);
$transport->setTimeout($connectionTimeout);
if ($this->authentication) {
@@ -88,11 +87,11 @@ class SMTP {
->setPassword($this->password);
}
$transport = $this->wp->applyFilters('mailpoet_mailer_smtp_transport_agent', $transport);
return Swift_Mailer::newInstance($transport);
return new Swift_Mailer($transport);
}
public function createMessage($newsletter, $subscriber, $extraParams = []) {
$message = Swift_Message::newInstance()
$message = (new Swift_Message())
->setTo($this->processSubscriber($subscriber))
->setFrom(
[