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

Remove unnecessary test_email extra parameter for mailer->send

Browse Source 
It was used only to prevent appending unprocessed subscribers into error message.
Since the message is now composed by on demand by MailerError the parameter is not needed any more.

[MAILPOET-1154]
This commit is contained in:
Rostislav Wolny
2018-09-11 19:52:50 +02:00
parent 665fce9dbb
commit f5c9d0f7db
13 changed files with 28 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Mailer/Methods/ErrorMappers/AmazonSESMapper.php
View File

@@ -21,7 +21,7 @@ class AmazonSESMapper {
* @see https://docs.aws.amazon.com/ses/latest/DeveloperGuide/api-error-codes.html
* @return MailerError
*/
function getErrorFromResponse($response, $subscriber, $extra_params) {
function getErrorFromResponse($response, $subscriber) {
$message = ($response) ?
$response->Error->Message->__toString() :
sprintf(__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_AMAZONSES);
@@ -30,11 +30,7 @@ class AmazonSESMapper {
if($response && $response->Error->Code->__toString() === 'MessageRejected') {
$level = MailerError::LEVEL_SOFT;
}
$subscriber_errors = [];
if(empty($extra_params['test_email'])) {
$subscriber_errors[] = new SubscriberError($subscriber, null);
}
$subscriber_errors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, $level, $message, null, $subscriber_errors);
}
}