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

Exclude WordPress and WooCommerce variables from camel case conversion

Browse Source 
[MAILPOET-1796]
This commit is contained in:
Jan Jakeš
2020-01-07 17:23:51 +01:00
committed by Jan Jakeš
parent fbcaeaadbc
commit 685b4885c0
25 changed files with 111 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Router/Endpoints/Track.php
View File

@@ -51,23 +51,23 @@ class Track {
public function _processTrackData($data) {
$data = (object)Links::transformUrlDataObject($data);
if (empty($data->queueId) ||
empty($data->subscriberId) ||
empty($data->subscriberToken)
if (empty($data->queue_id) || // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
empty($data->subscriber_id) || // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
empty($data->subscriber_token) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
) {
return false;
}
$data->queue = SendingQueue::findOne($data->queueId);
$data->queue = SendingQueue::findOne($data->queue_id); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
if ($data->queue instanceof SendingQueue) {
$data->queue = SendingTask::createFromQueue($data->queue);
}
$data->subscriber = Subscriber::findOne($data->subscriberId) ?: null;
$data->newsletter = (!empty($data->queue->newsletterId)) ?
Newsletter::findOne($data->queue->newsletterId) :
$data->subscriber = Subscriber::findOne($data->subscriber_id) ?: null; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
$data->newsletter = (!empty($data->queue->newsletter_id)) ? // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
Newsletter::findOne($data->queue->newsletter_id) : // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
false;
if (!empty($data->linkHash)) {
$data->link = NewsletterLink::where('hash', $data->linkHash)
->where('queue_id', $data->queueId)
if (!empty($data->link_hash)) { // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
$data->link = NewsletterLink::where('hash', $data->link_hash) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
->where('queue_id', $data->queue_id) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
->findOne();
}
return $this->_validateTrackData($data);
@@ -75,7 +75,7 @@ class Track {
public function _validateTrackData($data) {
if (!$data->subscriber || !$data->queue || !$data->newsletter) return false;
$subscriberTokenMatch = $this->linkTokens->verifyToken($data->subscriber, $data->subscriberToken);
$subscriberTokenMatch = $this->linkTokens->verifyToken($data->subscriber, $data->subscriber_token); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps
if (!$subscriberTokenMatch) {
$this->terminate(403);
}