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

Exclude MailPoet data structures from camel case conversion

Browse Source 
[MAILPOET-1796]
This commit is contained in:
Jan Jakeš
2020-01-07 17:12:09 +01:00
committed by Jan Jakeš
parent 685b4885c0
commit e66c76133e
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Config/Updater.php
View File

@ -33,8 +33,8 @@ class Updater {
$latestVersion = $this->getLatestVersion();
if (isset($latestVersion->newVersion)) {
if (version_compare($this->version, $latestVersion->newVersion, '<')) {
if (isset($latestVersion->new_version)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
if (version_compare($this->version, $latestVersion->new_version, '<')) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
$updateTransient->response[$this->plugin] = $latestVersion;
}
$updateTransient->lastChecked = time();

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

@ -29,11 +29,11 @@ class AmazonSESMapper {
*/
public function getErrorFromResponse($response, $subscriber) {
$message = ($response) ?
$response->error->Message->__toString() :
$response->Error->Message->__toString() : // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
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') { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
$level = MailerError::LEVEL_SOFT;
}
$subscriberErrors = [new SubscriberError($subscriber, null)];

2
lib/Models/ScheduledTaskSubscriber.php
View File

@ -23,7 +23,7 @@ class ScheduledTaskSubscriber extends Model {
const SENDING_STATUS_UNPROCESSED = 'unprocessed';
public static $_table = MP_SCHEDULED_TASK_SUBSCRIBERS_TABLE;
public static $idColumn = ['task_id', 'subscriber_id'];
public static $_id_column = ['task_id', 'subscriber_id']; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
public function task() {
return $this->hasOne(__NAMESPACE__ . '\ScheduledTask', 'id', 'task_id');

24
lib/Router/Endpoints/ViewInBrowser.php
View File

@ -58,19 +58,19 @@ class ViewInBrowser {
*/
public function _validateBrowserPreviewData($data) {
// either newsletter ID or hash must be defined, and newsletter must exist
if (empty($data->newsletterId) && empty($data->newsletterHash)) return false;
$data->newsletter = (!empty($data->newsletterHash)) ?
Newsletter::getByHash($data->newsletterHash) :
Newsletter::findOne($data->newsletterId);
if (empty($data->newsletter_id) && empty($data->newsletter_hash)) return false; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
$data->newsletter = (!empty($data->newsletter_hash)) ? // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
Newsletter::getByHash($data->newsletter_hash) : // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
Newsletter::findOne($data->newsletter_id); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
if (!$data->newsletter) return false;
// subscriber is optional; if exists, token must validate
$data->subscriber = (!empty($data->subscriberId)) ?
Subscriber::findOne($data->subscriberId) :
$data->subscriber = (!empty($data->subscriber_id)) ? // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
Subscriber::findOne($data->subscriber_id) : // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
false;
if ($data->subscriber) {
if (empty($data->subscriberToken) ||
!$this->linkTokens->verifyToken($data->subscriber, $data->subscriberToken)
if (empty($data->subscriber_token) || // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
!$this->linkTokens->verifyToken($data->subscriber, $data->subscriber_token) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
) return false;
} else if (!$data->subscriber && !empty($data->preview)) {
// if this is a preview and subscriber does not exist,
@ -79,12 +79,12 @@ class ViewInBrowser {
}
// if newsletter hash is not provided but newsletter ID is defined then subscriber must exist
if (empty($data->newsletterHash) && $data->newsletterId && !$data->subscriber) return false;
if (empty($data->newsletter_hash) && $data->newsletter_id && !$data->subscriber) return false; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
// queue is optional; try to find it if it's not defined and this is not a welcome email
if ($data->newsletter->type !== Newsletter::TYPE_WELCOME) {
$data->queue = (!empty($data->queueId)) ?
SendingQueue::findOne($data->queueId) :
$data->queue = (!empty($data->queue_id)) ? // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
SendingQueue::findOne($data->queue_id) : // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
SendingQueue::where('newsletter_id', $data->newsletter->id)
->findOne();
} else {
@ -101,7 +101,7 @@ class ViewInBrowser {
) return $data;
// allow others to preview newsletters only when newsletter hash is defined
if (!empty($data->preview) && empty($data->newsletterHash)
if (!empty($data->preview) && empty($data->newsletter_hash) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
) return false;
// if queue and subscriber exist, subscriber must have received the newsletter

6
tests/integration/Router/Endpoints/ViewInBrowserTest.php
View File

@ -106,7 +106,7 @@ class ViewInBrowserTest extends \MailPoetTest {
public function testItFailsValidationWhenNewsletterIdIsProvidedButSubscriberDoesNotExist() {
$data = (object)$this->browserPreviewData;
$data->subscriberId = false;
$data->subscriber_id = false; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
expect($this->viewInBrowser->_validateBrowserPreviewData($data))->false();
}
@ -116,10 +116,10 @@ class ViewInBrowserTest extends \MailPoetTest {
$newsletter2->type = 'type';
$newsletter2 = $newsletter2->save();
$data = (object)$this->browserPreviewData;
$data->newsletterHash = $newsletter2->hash;
$data->newsletter_hash = $newsletter2->hash; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
$result = $this->viewInBrowser->_validateBrowserPreviewData($data);
expect($result->newsletter->id)->equals($newsletter2->id);
$data->newsletterHash = false;
$data->newsletter_hash = false; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
$result = $this->viewInBrowser->_validateBrowserPreviewData($data);
expect($result->newsletter->id)->equals($newsletter1->id);
}