Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix required after optional warning in SMTP mailer

Browse Source 
[MAILPOET-3296]
This commit is contained in:
Rostislav Wolny
2020-11-26 15:41:16 +01:00
committed by Veljko V
parent e2236e45df
commit 0f7f173259
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Mailer/Mailer.php
View File

@ -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:

13
lib/Mailer/Methods/SMTP.php
View File

@ -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;

12
tests/integration/Mailer/Methods/SMTPTest.php
View File

@ -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']);
}