From ae8336429760b1c331a03492c68a4d85df29e57b Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta@mailpoet.com>
Date: Mon, 23 Sep 2019 15:36:57 +0200
Subject: [PATCH] Refactor getSubscriptionUrl to instance method

[MAILPOET-2381]
---
 lib/Settings/Pages.php   |  7 ++++---
 lib/Subscription/Url.php | 16 ++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/Settings/Pages.php b/lib/Settings/Pages.php
index 108e78af37..02ce01a25b 100644
--- a/lib/Settings/Pages.php
+++ b/lib/Settings/Pages.php
@@ -78,13 +78,14 @@ class Pages {
   }
 
   static function getPageData($page) {
+    $subscription_url_factory = Subscription\Url::getInstance();
     return [
       'id' => $page->ID,
       'title' => $page->post_title,
       'url' => [
-        'unsubscribe' => Subscription\Url::getSubscriptionUrl($page, 'unsubscribe'),
-        'manage' => Subscription\Url::getSubscriptionUrl($page, 'manage'),
-        'confirm' => Subscription\Url::getSubscriptionUrl($page, 'confirm'),
+        'unsubscribe' => $subscription_url_factory->getSubscriptionUrl($page, 'unsubscribe'),
+        'manage' => $subscription_url_factory->getSubscriptionUrl($page, 'manage'),
+        'confirm' => $subscription_url_factory->getSubscriptionUrl($page, 'confirm'),
       ],
     ];
   }
diff --git a/lib/Subscription/Url.php b/lib/Subscription/Url.php
index 6849007d04..ba82c13f25 100644
--- a/lib/Subscription/Url.php
+++ b/lib/Subscription/Url.php
@@ -27,30 +27,30 @@ class Url {
 
   function getCaptchaUrl() {
     $post = self::getPost($this->settings->get('subscription.pages.captcha'));
-    return self::getSubscriptionUrl($post, 'captcha', null);
+    return $this->getSubscriptionUrl($post, 'captcha', null);
   }
 
   function getCaptchaImageUrl($width, $height) {
     $post = self::getPost($this->settings->get('subscription.pages.captcha'));
-    return self::getSubscriptionUrl($post, 'captchaImage', null, ['width' => $width, 'height' => $height]);
+    return $this->getSubscriptionUrl($post, 'captchaImage', null, ['width' => $width, 'height' => $height]);
   }
 
   function getConfirmationUrl(Subscriber $subscriber = null) {
     $post = self::getPost($this->settings->get('subscription.pages.confirmation'));
-    return self::getSubscriptionUrl($post, 'confirm', $subscriber);
+    return $this->getSubscriptionUrl($post, 'confirm', $subscriber);
   }
 
   function getManageUrl(Subscriber $subscriber = null) {
     $post = self::getPost($this->settings->get('subscription.pages.manage'));
-    return self::getSubscriptionUrl($post, 'manage', $subscriber);
+    return $this->getSubscriptionUrl($post, 'manage', $subscriber);
   }
 
   function getUnsubscribeUrl(Subscriber $subscriber = null) {
     $post = self::getPost($this->settings->get('subscription.pages.unsubscribe'));
-    return self::getSubscriptionUrl($post, 'unsubscribe', $subscriber);
+    return $this->getSubscriptionUrl($post, 'unsubscribe', $subscriber);
   }
 
-  static function getSubscriptionUrl(
+  function getSubscriptionUrl(
     $post = null,
     $action = null,
     Subscriber $subscriber = null,
@@ -58,7 +58,7 @@ class Url {
   ) {
     if ($post === null || $action === null) return;
 
-    $url = WPFunctions::get()->getPermalink($post);
+    $url = $this->wp->getPermalink($post);
     $link_tokens = new LinkTokens;
     if ($subscriber !== null) {
       $data = [
@@ -83,7 +83,7 @@ class Url {
 
     $url_params = parse_url($url);
     if (empty($url_params['scheme'])) {
-      $url = WPFunctions::get()->getBloginfo('url') . $url;
+      $url = $this->wp->getBloginfo('url') . $url;
     }
 
     return $url;