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

Refactor getUnsubscribeUrl to instance method

Browse Source 
[MAILPOET-2381]
This commit is contained in:
Rostislav Wolny
2019-09-23 15:25:59 +02:00
committed by Jack Kitterhing
parent 4e75f8883e
commit d90d5c6385
7 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Cron/Workers/SendingQueue/Tasks/Links.php
View File

@ -60,7 +60,8 @@ class Links {
$data $data
); );
} else { } else {
$url = Url::getUnsubscribeUrl($subscriber); $subscription_url_factory = Url::getInstance();
$url = $subscription_url_factory->getUnsubscribeUrl($subscriber);
} }
return $url; return $url;
} }

4
lib/Newsletter/Shortcodes/Categories/Link.php
View File

@ -24,7 +24,7 @@ class Link {
case 'subscription_unsubscribe_url': case 'subscription_unsubscribe_url':
return self::processUrl( return self::processUrl(
$shortcode_details['action'], $shortcode_details['action'],
SubscriptionUrl::getUnsubscribeUrl($wp_user_preview ? null : $subscriber), $subscription_url_factory->getUnsubscribeUrl($wp_user_preview ? null : $subscriber),
$queue, $queue,
$wp_user_preview $wp_user_preview
); );
@ -83,7 +83,7 @@ class Link {
$unsubscribe_event = new Unsubscribes(); $unsubscribe_event = new Unsubscribes();
$unsubscribe_event->track($newsletter->id, $subscriber->id, $queue->id); $unsubscribe_event->track($newsletter->id, $subscriber->id, $queue->id);
} }
$url = SubscriptionUrl::getUnsubscribeUrl($subscriber); $url = $subscription_url_factory->getUnsubscribeUrl($subscriber);
break; break;
case 'subscription_manage_url': case 'subscription_manage_url':
$url = $subscription_url_factory->getManageUrl($subscriber); $url = $subscription_url_factory->getManageUrl($subscriber);

9
lib/Subscription/Url.php
View File

@ -45,8 +45,8 @@ class Url {
return self::getSubscriptionUrl($post, 'manage', $subscriber); return self::getSubscriptionUrl($post, 'manage', $subscriber);
} }
static function getUnsubscribeUrl(Subscriber $subscriber = null) { function getUnsubscribeUrl(Subscriber $subscriber = null) {
$post = self::getPost(self::getSetting('subscription.pages.unsubscribe')); $post = self::getPost($this->settings->get('subscription.pages.unsubscribe'));
return self::getSubscriptionUrl($post, 'unsubscribe', $subscriber); return self::getSubscriptionUrl($post, 'unsubscribe', $subscriber);
} }
@ -110,9 +110,4 @@ class Url {
$pages = SettingsPages::getMailPoetPages(); $pages = SettingsPages::getMailPoetPages();
return reset($pages); return reset($pages);
} }
static private function getSetting($key) {
$setting = new SettingsController();
return $setting->get($key);
}
} }

2
tests/integration/API/JSON/v1/NewslettersTest.php
View File

@ -805,7 +805,7 @@ class NewslettersTest extends \MailPoetTest {
function testItCanSendAPreview() { function testItCanSendAPreview() {
$subscriber = 'test@subscriber.com'; $subscriber = 'test@subscriber.com';
$unsubscribeLink = SubscriptionUrl::getUnsubscribeUrl(null); $unsubscribeLink = $this->subscription_url_factory->getUnsubscribeUrl(null);
$manageLink = $this->subscription_url_factory->getManageUrl(null); $manageLink = $this->subscription_url_factory->getManageUrl(null);
$viewInBrowserLink = Url::getViewInBrowserUrl(null, $this->newsletter, false, false, true); $viewInBrowserLink = Url::getViewInBrowserUrl(null, $this->newsletter, false, false, true);
$mailerMetaInfo = new MetaInfo; $mailerMetaInfo = new MetaInfo;

2
tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
View File

@ -97,7 +97,7 @@ class SendingQueueTest extends \MailPoetTest {
} }
private function getDirectUnsubscribeURL() { private function getDirectUnsubscribeURL() {
return Url::getUnsubscribeUrl($this->subscriber); return Url::getInstance()->getUnsubscribeUrl($this->subscriber);
} }
private function getTrackedUnsubscribeURL() { private function getTrackedUnsubscribeURL() {

2
tests/integration/Newsletter/ShortcodesTest.php
View File

@ -302,7 +302,7 @@ class ShortcodesTest extends \MailPoetTest {
'[link:newsletter_view_in_browser_url]', '[link:newsletter_view_in_browser_url]',
]; ];
$links = [ $links = [
SubscriptionUrl::getUnsubscribeUrl(null), $this->subscription_url_factory->getUnsubscribeUrl(null),
$this->subscription_url_factory->getManageUrl(null), $this->subscription_url_factory->getManageUrl(null),
NewsletterUrl::getViewInBrowserUrl(null, $this->newsletter, false, false, true), NewsletterUrl::getViewInBrowserUrl(null, $this->newsletter, false, false, true),
]; ];

6
tests/integration/Subscription/UrlTest.php
View File

@ -41,7 +41,7 @@ class UrlTest extends \MailPoetTest {
expect($url)->contains('action=captcha'); expect($url)->contains('action=captcha');
expect($url)->contains('endpoint=subscription'); expect($url)->contains('endpoint=subscription');
$url = Url::getUnsubscribeUrl(null); $url = $this->url->getUnsubscribeUrl(null);
expect($url)->notNull(); expect($url)->notNull();
expect($url)->contains('action=unsubscribe'); expect($url)->contains('action=unsubscribe');
expect($url)->contains('endpoint=subscription'); expect($url)->contains('endpoint=subscription');
@ -99,7 +99,7 @@ class UrlTest extends \MailPoetTest {
function testItReturnsTheUnsubscribeUrl() { function testItReturnsTheUnsubscribeUrl() {
// preview // preview
$url = Url::getUnsubscribeUrl(null); $url = $this->url->getUnsubscribeUrl(null);
expect($url)->notNull(); expect($url)->notNull();
expect($url)->contains('action=unsubscribe'); expect($url)->contains('action=unsubscribe');
expect($url)->contains('endpoint=subscription'); expect($url)->contains('endpoint=subscription');
@ -108,7 +108,7 @@ class UrlTest extends \MailPoetTest {
$subscriber = Subscriber::createOrUpdate([ $subscriber = Subscriber::createOrUpdate([
'email' => 'john@mailpoet.com', 'email' => 'john@mailpoet.com',
]); ]);
$url = Url::getUnsubscribeUrl($subscriber); $url = $this->url->getUnsubscribeUrl($subscriber);
expect($url)->contains('action=unsubscribe'); expect($url)->contains('action=unsubscribe');
expect($url)->contains('endpoint=subscription'); expect($url)->contains('endpoint=subscription');