Fix required after optional warning in SMTP mailer
[MAILPOET-3296]
This commit is contained in:
committed by
Veljko V
parent
e2236e45df
commit
0f7f173259
@ -98,13 +98,13 @@ class Mailer {
|
||||
$this->mailerConfig['host'],
|
||||
$this->mailerConfig['port'],
|
||||
$this->mailerConfig['authentication'],
|
||||
$this->mailerConfig['login'],
|
||||
$this->mailerConfig['password'],
|
||||
$this->mailerConfig['encryption'],
|
||||
$this->sender,
|
||||
$this->replyTo,
|
||||
$this->returnPath,
|
||||
new SMTPMapper()
|
||||
new SMTPMapper(),
|
||||
$this->mailerConfig['login'],
|
||||
$this->mailerConfig['password']
|
||||
);
|
||||
break;
|
||||
default:
|
||||
|
@ -35,8 +35,17 @@ class SMTP {
|
||||
private $wp;
|
||||
|
||||
public function __construct(
|
||||
$host, $port, $authentication, $login = null, $password = null, $encryption,
|
||||
$sender, $replyTo, $returnPath, SMTPMapper $errorMapper) {
|
||||
$host,
|
||||
$port,
|
||||
$authentication,
|
||||
$encryption,
|
||||
$sender,
|
||||
$replyTo,
|
||||
$returnPath,
|
||||
SMTPMapper $errorMapper,
|
||||
$login = null,
|
||||
$password = null
|
||||
) {
|
||||
$this->wp = new WPFunctions;
|
||||
$this->host = $host;
|
||||
$this->port = $port;
|
||||
|
@ -51,13 +51,13 @@ class SMTPTest extends \MailPoetTest {
|
||||
$this->settings['host'],
|
||||
$this->settings['port'],
|
||||
$this->settings['authentication'],
|
||||
$this->settings['login'],
|
||||
$this->settings['password'],
|
||||
$this->settings['encryption'],
|
||||
$this->sender,
|
||||
$this->replyTo,
|
||||
$this->returnPath,
|
||||
new SMTPMapper()
|
||||
new SMTPMapper(),
|
||||
$this->settings['login'],
|
||||
$this->settings['password']
|
||||
);
|
||||
$this->subscriber = 'Recipient <mailpoet-phoenix-test@mailinator.com>';
|
||||
$this->newsletter = [
|
||||
@ -91,13 +91,13 @@ class SMTPTest extends \MailPoetTest {
|
||||
$this->settings['host'],
|
||||
$this->settings['port'],
|
||||
$this->settings['authentication'],
|
||||
$this->settings['login'],
|
||||
$this->settings['password'],
|
||||
$this->settings['encryption'],
|
||||
$this->sender,
|
||||
$this->replyTo,
|
||||
$returnPath = false,
|
||||
new SMTPMapper()
|
||||
new SMTPMapper(),
|
||||
$this->settings['login'],
|
||||
$this->settings['password']
|
||||
);
|
||||
expect($mailer->returnPath)->equals($this->sender['from_email']);
|
||||
}
|
||||
|
Reference in New Issue
Block a user