diff --git a/lib/Cron/Workers/SendingQueue/SendingQueue.php b/lib/Cron/Workers/SendingQueue/SendingQueue.php index 1091e4b91d..1f761ae2cb 100644 --- a/lib/Cron/Workers/SendingQueue/SendingQueue.php +++ b/lib/Cron/Workers/SendingQueue/SendingQueue.php @@ -194,7 +194,7 @@ class SendingQueue { $subscriber ); $preparedSubscribersIds[] = $subscriber->id; - // save personalized unsubsribe link + // create personalized instant unsubsribe link $unsubscribeUrls[] = Links::getUnsubscribeUrl($queue, $subscriber->id); $metas[] = $this->mailerMetaInfo->getNewsletterMetaInfo($newsletter, $subscriber); // keep track of values for statistics purposes diff --git a/lib/Cron/Workers/SendingQueue/Tasks/Links.php b/lib/Cron/Workers/SendingQueue/Tasks/Links.php index 1f55f3f581..a41bf02f90 100644 --- a/lib/Cron/Workers/SendingQueue/Tasks/Links.php +++ b/lib/Cron/Workers/SendingQueue/Tasks/Links.php @@ -24,7 +24,7 @@ class Links { // join HTML and TEXT rendered body into a text string $content = Helpers::joinObject($renderedNewsletter); list($content, $links) = NewsletterLinks::process($content, $newsletterId, $queueId); - $links = NewsletterLinks::ensureUnsubscribeLink($links); + $links = NewsletterLinks::ensureInstantUnsubscribeLink($links); // split the processed body with hashed links back to HTML and TEXT list($renderedNewsletter['html'], $renderedNewsletter['text']) = Helpers::splitObject($content); @@ -43,7 +43,7 @@ class Links { $settings = SettingsController::getInstance(); if ((boolean)$settings->get('tracking.enabled')) { $linkHash = NewsletterLinkModel::where('queue_id', $queue->id) - ->where('url', NewsletterLinkModel::UNSUBSCRIBE_LINK_SHORT_CODE) + ->where('url', NewsletterLinkModel::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE) ->findOne(); if (!$linkHash instanceof NewsletterLinkModel) { return ''; diff --git a/lib/Models/NewsletterLink.php b/lib/Models/NewsletterLink.php index 47b064bfca..d0e9d545f2 100644 --- a/lib/Models/NewsletterLink.php +++ b/lib/Models/NewsletterLink.php @@ -12,4 +12,5 @@ namespace MailPoet\Models; class NewsletterLink extends Model { public static $_table = MP_NEWSLETTER_LINKS_TABLE; // phpcs:ignore PSR2.Classes.PropertyDeclaration const UNSUBSCRIBE_LINK_SHORT_CODE = '[link:subscription_unsubscribe_url]'; + const INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE = '[link:subscription_instant_unsubscribe_url]'; } diff --git a/lib/Newsletter/Links/Links.php b/lib/Newsletter/Links/Links.php index 199df28067..520e55301a 100644 --- a/lib/Newsletter/Links/Links.php +++ b/lib/Newsletter/Links/Links.php @@ -136,15 +136,15 @@ class Links { } } - public static function ensureUnsubscribeLink(array $processedLinks) { + public static function ensureInstantUnsubscribeLink(array $processedLinks) { if (in_array( - NewsletterLink::UNSUBSCRIBE_LINK_SHORT_CODE, + NewsletterLink::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE, array_column($processedLinks, 'link')) ) { return $processedLinks; } $processedLinks[] = self::hashLink( - NewsletterLink::UNSUBSCRIBE_LINK_SHORT_CODE, + NewsletterLink::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE, Links::LINK_TYPE_SHORTCODE ); return $processedLinks; diff --git a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php index c34f19659e..83308425a8 100644 --- a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php @@ -104,7 +104,7 @@ class SendingQueueTest extends \MailPoetTest { $this->newsletterLink = NewsletterLink::create(); $this->newsletterLink->newsletterId = $this->newsletter->id; $this->newsletterLink->queueId = $this->queue->id; - $this->newsletterLink->url = '[link:subscription_unsubscribe_url]'; + $this->newsletterLink->url = '[link:subscription_instant_unsubscribe_url]'; $this->newsletterLink->hash = 'abcde'; $this->newsletterLink->save(); $this->sendingErrorHandler = new SendingErrorHandler(); diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php index e7468e113f..64dbb8d674 100644 --- a/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php @@ -55,7 +55,7 @@ class LinksTest extends \MailPoetTest { expect($result['html'])->contains($newsletterLink->hash); } - public function testItCanEnsureThatUnsubscribeLinkIsAlwaysPresent() { + public function testItCanEnsureThatInstantUnsubscribeLinkIsAlwaysPresent() { $newsletter = Newsletter::create(); $newsletter->type = Newsletter::TYPE_STANDARD; $newsletter->save(); @@ -66,7 +66,7 @@ class LinksTest extends \MailPoetTest { $queue = (object)['id' => 2]; Links::process($renderedNewsletter, $newsletter, $queue); $unsubscribeCount = NewsletterLink::where('newsletter_id', $newsletter->id) - ->where('url', NewsletterLink::UNSUBSCRIBE_LINK_SHORT_CODE)->count(); + ->where('url', NewsletterLink::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE)->count(); expect($unsubscribeCount)->equals(1); } diff --git a/tests/integration/Newsletter/Links/LinksTest.php b/tests/integration/Newsletter/Links/LinksTest.php index 16f202a59e..c56a547a3b 100644 --- a/tests/integration/Newsletter/Links/LinksTest.php +++ b/tests/integration/Newsletter/Links/LinksTest.php @@ -246,13 +246,13 @@ class LinksTest extends \MailPoetTest { 'hash' => 'abcdfgh', ], ]; - $links = Links::ensureUnsubscribeLink($links); + $links = Links::ensureInstantUnsubscribeLink($links); expect(count($links))->equals(2); - expect($links[1]['link'])->equals(NewsletterLink::UNSUBSCRIBE_LINK_SHORT_CODE); + expect($links[1]['link'])->equals(NewsletterLink::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE); expect($links[1]['type'])->equals(Links::LINK_TYPE_SHORTCODE); expect($links[1])->hasKey('processed_link'); expect($links[1])->hasKey('hash'); - $links = Links::ensureUnsubscribeLink($links); + $links = Links::ensureInstantUnsubscribeLink($links); expect(count($links))->equals(2); }