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

Convert variable names to camel case

Browse Source 
[MAILPOET-1796]
This commit is contained in:
Jan Jakeš
2020-01-09 15:02:58 +01:00
committed by Jan Jakeš
parent f5da704106
commit 54549ff037
687 changed files with 15890 additions and 15887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,8 +19,8 @@ class AmazonSESMapper {
if ($e instanceof Swift_RfcComplianceException) {
$level = MailerError::LEVEL_SOFT;
}
$subscriber_errors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, $level, $e->getMessage(), null, $subscriber_errors);
$subscriberErrors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, $level, $e->getMessage(), null, $subscriberErrors);
}
/**
@ -29,14 +29,14 @@ class AmazonSESMapper {
*/
public function getErrorFromResponse($response, $subscriber) {
$message = ($response) ?
$response->Error->Message->__toString() :
$response->error->Message->__toString() :
sprintf(WPFunctions::get()->__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_AMAZONSES);
$level = MailerError::LEVEL_HARD;
if ($response && $response->Error->Code->__toString() === 'MessageRejected') {
if ($response && $response->error->Code->__toString() === 'MessageRejected') {
$level = MailerError::LEVEL_SOFT;
}
$subscriber_errors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, $level, $message, null, $subscriber_errors);
$subscriberErrors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, $level, $message, null, $subscriberErrors);
}
}

4
lib/Mailer/Methods/ErrorMappers/BlacklistErrorMapperTrait.php
View File

@ -9,7 +9,7 @@ use MailPoet\WP\Functions as WPFunctions;
trait BlacklistErrorMapperTrait {
public function getBlacklistError($subscriber) {
$message = sprintf(WPFunctions::get()->__('%s has returned an unknown error.', 'mailpoet'), self::METHOD);
$subscriber_errors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, MailerError::LEVEL_SOFT, $message, null, $subscriber_errors);
$subscriberErrors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, MailerError::LEVEL_SOFT, $message, null, $subscriberErrors);
}
}

40
lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php
View File

@ -29,23 +29,23 @@ class MailPoetMapper {
public function getErrorForResult(array $result, $subscribers, $sender = null, $newsletter = null) {
$level = MailerError::LEVEL_HARD;
$operation = MailerError::OPERATION_SEND;
$retry_interval = null;
$subscribers_errors = [];
$result_code = !empty($result['code']) ? $result['code'] : null;
$retryInterval = null;
$subscribersErrors = [];
$resultCode = !empty($result['code']) ? $result['code'] : null;
switch ($result_code) {
switch ($resultCode) {
case API::RESPONSE_CODE_NOT_ARRAY:
$message = WPFunctions::get()->__('JSON input is not an array', 'mailpoet');
break;
case API::RESPONSE_CODE_PAYLOAD_ERROR:
$result_parsed = json_decode($result['message'], true);
$resultParsed = json_decode($result['message'], true);
$message = WPFunctions::get()->__('Error while sending.', 'mailpoet');
if (!is_array($result_parsed)) {
if (!is_array($resultParsed)) {
$message .= ' ' . $result['message'];
break;
}
try {
$subscribers_errors = $this->getSubscribersErrors($result_parsed, $subscribers);
$subscribersErrors = $this->getSubscribersErrors($resultParsed, $subscribers);
$level = MailerError::LEVEL_SOFT;
} catch (InvalidArgumentException $e) {
$message .= ' ' . $e->getMessage();
@ -53,7 +53,7 @@ class MailPoetMapper {
break;
case API::RESPONSE_CODE_TEMPORARY_UNAVAILABLE:
$message = WPFunctions::get()->__('Email service is temporarily not available, please try again in a few minutes.', 'mailpoet');
$retry_interval = self::TEMPORARY_UNAVAILABLE_RETRY_INTERVAL;
$retryInterval = self::TEMPORARY_UNAVAILABLE_RETRY_INTERVAL;
break;
case API::RESPONSE_CODE_CAN_NOT_SEND:
if ($result['message'] === MailerError::MESSAGE_EMAIL_NOT_AUTHORIZED) {
@ -68,23 +68,23 @@ class MailPoetMapper {
default:
$message = $result['message'];
}
return new MailerError($operation, $level, $message, $retry_interval, $subscribers_errors);
return new MailerError($operation, $level, $message, $retryInterval, $subscribersErrors);
}
private function getSubscribersErrors($result_parsed, $subscribers) {
private function getSubscribersErrors($resultParsed, $subscribers) {
$errors = [];
foreach ($result_parsed as $result_error) {
if (!is_array($result_error) || !isset($result_error['index']) || !isset($subscribers[$result_error['index']])) {
foreach ($resultParsed as $resultError) {
if (!is_array($resultError) || !isset($resultError['index']) || !isset($subscribers[$resultError['index']])) {
throw new InvalidArgumentException( WPFunctions::get()->__('Invalid MSS response format.', 'mailpoet'));
}
$subscriber_errors = [];
if (isset($result_error['errors']) && is_array($result_error['errors'])) {
array_walk_recursive($result_error['errors'], function($item) use (&$subscriber_errors) {
$subscriber_errors[] = $item;
$subscriberErrors = [];
if (isset($resultError['errors']) && is_array($resultError['errors'])) {
array_walk_recursive($resultError['errors'], function($item) use (&$subscriberErrors) {
$subscriberErrors[] = $item;
});
}
$message = join(', ', $subscriber_errors);
$errors[] = new SubscriberError($subscribers[$result_error['index']], $message);
$message = join(', ', $subscriberErrors);
$errors[] = new SubscriberError($subscribers[$resultError['index']], $message);
}
return $errors;
}
@ -111,7 +111,7 @@ class MailPoetMapper {
private function getAccountBannedMessage() {
$message = WPFunctions::get()->__('The MailPoet Sending Service has stopped sending your emails for one of the following reasons:', 'mailpoet');
$subscriber_limit_message = Helpers::replaceLinkTags(
$subscriberLimitMessage = Helpers::replaceLinkTags(
WPFunctions::get()->__('You may have reached the subscriber limit of your plan. [link]Manage your subscriptions[/link].', 'mailpoet'),
'https://account.mailpoet.com/account',
[
@ -120,7 +120,7 @@ class MailPoetMapper {
]
);
$deliverability_message = Helpers::replaceLinkTags(
$deliverabilityMessage = Helpers::replaceLinkTags(
WPFunctions::get()->__('You may have had a poor deliverability rate. Please [link]contact our support team[/link] to resolve the issue.', 'mailpoet'),
'https://www.mailpoet.com/support/',
[

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

@ -19,13 +19,13 @@ class PHPMailMapper {
$level = MailerError::LEVEL_SOFT;
}
$subscriber_errors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, $level, $e->getMessage(), null, $subscriber_errors);
$subscriberErrors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, $level, $e->getMessage(), null, $subscriberErrors);
}
public function getErrorForSubscriber($subscriber) {
$message = sprintf(WPFunctions::get()->__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_PHPMAIL);
$subscriber_errors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, MailerError::LEVEL_HARD, $message, null, $subscriber_errors);
$subscriberErrors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, MailerError::LEVEL_HARD, $message, null, $subscriberErrors);
}
}

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

@ -26,8 +26,8 @@ class SMTPMapper {
if ($e instanceof Swift_RfcComplianceException) {
$level = MailerError::LEVEL_SOFT;
}
$subscriber_errors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, $level, $message[0], null, $subscriber_errors);
$subscriberErrors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, $level, $message[0], null, $subscriberErrors);
}
public function getErrorFromLog($log, $subscriber) {
@ -40,7 +40,7 @@ class SMTPMapper {
} else {
$message = sprintf(WPFunctions::get()->__('%s has returned an unknown error.', 'mailpoet'), Mailer::METHOD_SMTP);
}
$subscriber_errors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, MailerError::LEVEL_HARD, $message, null, $subscriber_errors);
$subscriberErrors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, MailerError::LEVEL_HARD, $message, null, $subscriberErrors);
}
}

4
lib/Mailer/Methods/ErrorMappers/SendGridMapper.php
View File

@ -22,7 +22,7 @@ class SendGridMapper {
if (strpos($response, 'Invalid email address') === 0) {
$level = MailerError::LEVEL_SOFT;
}
$subscriber_errors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, $level, $response, null, $subscriber_errors);
$subscriberErrors = [new SubscriberError($subscriber, null)];
return new MailerError(MailerError::OPERATION_SEND, $level, $response, null, $subscriberErrors);
}
}