diff --git a/lib/API/JSON/v1/Subscribers.php b/lib/API/JSON/v1/Subscribers.php index 0c88a43b25..4d15935ec9 100644 --- a/lib/API/JSON/v1/Subscribers.php +++ b/lib/API/JSON/v1/Subscribers.php @@ -24,7 +24,7 @@ use MailPoet\Subscribers\SubscriberActions; use MailPoet\Subscription\Captcha; use MailPoet\Subscription\CaptchaSession; use MailPoet\Subscription\Throttling as SubscriptionThrottling; -use MailPoet\Subscription\Url as SubscriptionUrl; +use MailPoet\Subscription\SubscriptionUrlFactory as SubscriptionUrl; use MailPoet\WP\Functions as WPFunctions; class Subscribers extends APIEndpoint { diff --git a/lib/Cron/Workers/SendingQueue/Tasks/Links.php b/lib/Cron/Workers/SendingQueue/Tasks/Links.php index 272f29d624..530052f197 100644 --- a/lib/Cron/Workers/SendingQueue/Tasks/Links.php +++ b/lib/Cron/Workers/SendingQueue/Tasks/Links.php @@ -4,7 +4,7 @@ namespace MailPoet\Cron\Workers\SendingQueue\Tasks; use MailPoet\Settings\SettingsController; use MailPoet\Util\Helpers; use MailPoet\Router\Router; -use MailPoet\Subscription\Url; +use MailPoet\Subscription\SubscriptionUrlFactory; use MailPoet\Models\Subscriber; use MailPoet\Router\Endpoints\Track; use MailPoet\Newsletter\Links\Links as NewsletterLinks; @@ -60,7 +60,7 @@ class Links { $data ); } else { - $subscription_url_factory = Url::getInstance(); + $subscription_url_factory = SubscriptionUrlFactory::getInstance(); $url = $subscription_url_factory->getUnsubscribeUrl($subscriber); } return $url; diff --git a/lib/DI/ContainerConfigurator.php b/lib/DI/ContainerConfigurator.php index e9c365cbe4..ae6c7c0adc 100644 --- a/lib/DI/ContainerConfigurator.php +++ b/lib/DI/ContainerConfigurator.php @@ -183,7 +183,7 @@ class ContainerConfigurator implements IContainerConfigurator { $container->autowire(\MailPoet\Subscription\Pages::class)->setPublic(true) ->setShared(false); // Get a new instance each time $container->get() is called, needed for tests $container->autowire(\MailPoet\Subscription\Registration::class)->setPublic(true); - $container->autowire(\MailPoet\Subscription\Url::class); + $container->autowire(\MailPoet\Subscription\SubscriptionUrlFactory::class); // Newsletter $container->autowire(\MailPoet\Newsletter\AutomatedLatestContent::class)->setPublic(true); $container->autowire(\MailPoet\Newsletter\NewslettersRepository::class); diff --git a/lib/Newsletter/Shortcodes/Categories/Link.php b/lib/Newsletter/Shortcodes/Categories/Link.php index d38133fa1b..17759c15a2 100644 --- a/lib/Newsletter/Shortcodes/Categories/Link.php +++ b/lib/Newsletter/Shortcodes/Categories/Link.php @@ -5,7 +5,7 @@ namespace MailPoet\Newsletter\Shortcodes\Categories; use MailPoet\Newsletter\Url as NewsletterUrl; use MailPoet\Settings\SettingsController; use MailPoet\Statistics\Track\Unsubscribes; -use MailPoet\Subscription\Url as SubscriptionUrl; +use MailPoet\Subscription\SubscriptionUrlFactory as SubscriptionUrl; use MailPoet\WP\Functions as WPFunctions; class Link { diff --git a/lib/Settings/Pages.php b/lib/Settings/Pages.php index 02ce01a25b..b008cf5148 100644 --- a/lib/Settings/Pages.php +++ b/lib/Settings/Pages.php @@ -78,7 +78,7 @@ class Pages { } static function getPageData($page) { - $subscription_url_factory = Subscription\Url::getInstance(); + $subscription_url_factory = Subscription\SubscriptionUrlFactory::getInstance(); return [ 'id' => $page->ID, 'title' => $page->post_title, diff --git a/lib/Subscribers/ConfirmationEmailMailer.php b/lib/Subscribers/ConfirmationEmailMailer.php index fa25d3a112..442ceac682 100644 --- a/lib/Subscribers/ConfirmationEmailMailer.php +++ b/lib/Subscribers/ConfirmationEmailMailer.php @@ -9,7 +9,7 @@ use MailPoet\Models\Subscriber; use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\Bridge; use MailPoet\Settings\SettingsController; -use MailPoet\Subscription\Url; +use MailPoet\Subscription\SubscriptionUrlFactory; use MailPoet\Util\Helpers; use MailPoet\WP\Functions as WPFunctions; @@ -29,13 +29,13 @@ class ConfirmationEmailMailer { /** @var MetaInfo */ private $mailerMetaInfo; - /** @var Url */ + /** @var SubscriptionUrlFactory */ private $subscription_url_factory; /** * @param Mailer|null $mailer */ - function __construct($mailer = null, WPFunctions $wp = null, Url $subscription_url_factory = null) { + function __construct($mailer = null, WPFunctions $wp = null, SubscriptionUrlFactory $subscription_url_factory = null) { if ($mailer) { $this->mailer = $mailer; } @@ -49,7 +49,7 @@ class ConfirmationEmailMailer { $this->mailerMetaInfo = new MetaInfo; if ($subscription_url_factory === null) { - $subscription_url_factory = new Url($this->wp, $this->settings); + $subscription_url_factory = new SubscriptionUrlFactory($this->wp, $this->settings); } $this->subscription_url_factory = $subscription_url_factory; } diff --git a/lib/Subscription/CaptchaRenderer.php b/lib/Subscription/CaptchaRenderer.php index 404e43456f..e77baf90b0 100644 --- a/lib/Subscription/CaptchaRenderer.php +++ b/lib/Subscription/CaptchaRenderer.php @@ -17,10 +17,10 @@ class CaptchaRenderer { /** @var CaptchaSession */ private $captcha_session; - /** @var Url */ + /** @var SubscriptionUrlFactory */ private $subscription_url_factory; - function __construct(UrlHelper $url_helper, WPFunctions $wp, CaptchaSession $captcha_session, Url $subscription_url_factory) { + function __construct(UrlHelper $url_helper, WPFunctions $wp, CaptchaSession $captcha_session, SubscriptionUrlFactory $subscription_url_factory) { $this->url_helper = $url_helper; $this->wp = $wp; $this->captcha_session = $captcha_session; diff --git a/lib/Subscription/Pages.php b/lib/Subscription/Pages.php index 62bd73b2d9..ca0bbc887b 100644 --- a/lib/Subscription/Pages.php +++ b/lib/Subscription/Pages.php @@ -48,7 +48,7 @@ class Pages { /** @var LinkTokens */ private $link_tokens; - /** @var Url */ + /** @var SubscriptionUrlFactory */ private $subscription_url_factory; function __construct( @@ -59,7 +59,7 @@ class Pages { CaptchaRenderer $captcha_renderer, WelcomeScheduler $welcome_scheduler, LinkTokens $link_tokens, - Url $subscription_url_factory + SubscriptionUrlFactory $subscription_url_factory ) { $this->wp = $wp; $this->new_subscriber_notification_sender = $new_subscriber_notification_sender; diff --git a/lib/Subscription/Url.php b/lib/Subscription/SubscriptionUrlFactory.php similarity index 92% rename from lib/Subscription/Url.php rename to lib/Subscription/SubscriptionUrlFactory.php index 9f2514b462..5bff561ee8 100644 --- a/lib/Subscription/Url.php +++ b/lib/Subscription/SubscriptionUrlFactory.php @@ -9,9 +9,9 @@ use MailPoet\Settings\SettingsController; use MailPoet\Subscribers\LinkTokens; use MailPoet\WP\Functions as WPFunctions; -class Url { +class SubscriptionUrlFactory { - /** @var Url */ + /** @var SubscriptionUrlFactory */ private static $instance; /** @var WPFunctions */ @@ -90,11 +90,11 @@ class Url { } /** - * @return Url + * @return SubscriptionUrlFactory */ static function getInstance() { - if (!self::$instance) { - self::$instance = new Url(new WPFunctions, new SettingsController); + if (!self::$instance instanceof SubscriptionUrlFactory) { + self::$instance = new SubscriptionUrlFactory(new WPFunctions, new SettingsController); } return self::$instance; } diff --git a/tests/integration/API/JSON/v1/NewslettersTest.php b/tests/integration/API/JSON/v1/NewslettersTest.php index c44579db47..1e333d2e52 100644 --- a/tests/integration/API/JSON/v1/NewslettersTest.php +++ b/tests/integration/API/JSON/v1/NewslettersTest.php @@ -29,7 +29,7 @@ use MailPoet\Newsletter\Url; use MailPoet\Router\Router; use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Settings\SettingsController; -use MailPoet\Subscription\Url as SubscriptionUrl; +use MailPoet\Subscription\SubscriptionUrlFactory as SubscriptionUrl; use MailPoet\Tasks\Sending as SendingTask; use MailPoet\WooCommerce\Helper as WCHelper; use MailPoet\WP\Functions as WPFunctions; diff --git a/tests/integration/API/JSON/v1/SubscribersTest.php b/tests/integration/API/JSON/v1/SubscribersTest.php index 648b857608..e08bf23030 100644 --- a/tests/integration/API/JSON/v1/SubscribersTest.php +++ b/tests/integration/API/JSON/v1/SubscribersTest.php @@ -29,7 +29,7 @@ use MailPoet\Subscribers\Source; use MailPoet\Subscribers\SubscriberActions; use MailPoet\Subscription\Captcha; use MailPoet\Subscription\CaptchaSession; -use MailPoet\Subscription\Url; +use MailPoet\Subscription\SubscriptionUrlFactory; use MailPoet\Util\Cookies; use MailPoet\WP\Functions; @@ -66,7 +66,7 @@ class SubscribersTest extends \MailPoetTest { $settings, $this->captcha_session, $container->get(ConfirmationEmailMailer::class), - new Url($wp, $settings) + new SubscriptionUrlFactory($wp, $settings) ); $obfuscator = new FieldNameObfuscator(); $this->obfuscatedEmail = $obfuscator->obfuscate('email'); diff --git a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php index 39c07df261..c88adb435c 100644 --- a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php @@ -33,7 +33,7 @@ use MailPoet\Router\Router; use MailPoet\Settings\SettingsController; use MailPoet\Subscribers\LinkTokens; use MailPoet\Subscription\Captcha; -use MailPoet\Subscription\Url; +use MailPoet\Subscription\SubscriptionUrlFactory; use MailPoet\Tasks\Sending as SendingTask; use MailPoet\WooCommerce\TransactionalEmails; use MailPoet\WP\Functions as WPFunctions; @@ -97,7 +97,7 @@ class SendingQueueTest extends \MailPoetTest { } private function getDirectUnsubscribeURL() { - return Url::getInstance()->getUnsubscribeUrl($this->subscriber); + return SubscriptionUrlFactory::getInstance()->getUnsubscribeUrl($this->subscriber); } private function getTrackedUnsubscribeURL() { diff --git a/tests/integration/Newsletter/ShortcodesTest.php b/tests/integration/Newsletter/ShortcodesTest.php index 6740d6ca49..170df0c696 100644 --- a/tests/integration/Newsletter/ShortcodesTest.php +++ b/tests/integration/Newsletter/ShortcodesTest.php @@ -14,7 +14,7 @@ use MailPoet\Newsletter\Url as NewsletterUrl; use MailPoet\Referrals\ReferralDetector; use MailPoet\Settings\SettingsController; use MailPoet\Subscription\Captcha; -use MailPoet\Subscription\Url as SubscriptionUrl; +use MailPoet\Subscription\SubscriptionUrlFactory as SubscriptionUrl; use MailPoet\WooCommerce\TransactionalEmails; use MailPoet\WP\Functions as WPFunctions; diff --git a/tests/integration/Subscribers/ConfirmationEmailMailerTest.php b/tests/integration/Subscribers/ConfirmationEmailMailerTest.php index be8f8b19a9..1d5eb05454 100644 --- a/tests/integration/Subscribers/ConfirmationEmailMailerTest.php +++ b/tests/integration/Subscribers/ConfirmationEmailMailerTest.php @@ -9,13 +9,13 @@ use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberSegment; use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Settings\SettingsController; -use MailPoet\Subscription\Url; +use MailPoet\Subscription\SubscriptionUrlFactory; use MailPoet\WP\Functions as WPFunctions; class ConfirmationEmailMailerTest extends \MailPoetTest { function testItSendsConfirmationEmail() { - $subcription_url_facrory_mock = $this->createMock(Url::class); + $subcription_url_facrory_mock = $this->createMock(SubscriptionUrlFactory::class); $subcription_url_facrory_mock->method('getConfirmationUrl')->willReturn('http://example.com'); $subscriber = Subscriber::create(); diff --git a/tests/integration/Subscription/UrlTest.php b/tests/integration/Subscription/UrlTest.php index cc6a827250..dd80189913 100644 --- a/tests/integration/Subscription/UrlTest.php +++ b/tests/integration/Subscription/UrlTest.php @@ -5,7 +5,7 @@ use Codeception\Util\Stub; use MailPoet\Features\FeaturesController; use MailPoet\Referrals\ReferralDetector; use MailPoet\Router\Router; -use MailPoet\Subscription\Url; +use MailPoet\Subscription\SubscriptionUrlFactory; use MailPoet\Models\Subscriber; use MailPoet\Models\Setting; use MailPoet\Config\Populator; @@ -16,7 +16,7 @@ use MailPoet\WP\Functions as WPFunctions; class UrlTest extends \MailPoetTest { - /** @var Url */ + /** @var SubscriptionUrlFactory */ private $url; /** @var SettingsController */ @@ -30,7 +30,7 @@ class UrlTest extends \MailPoetTest { $wc_transactional_emails = new TransactionalEmails(WPFunctions::get(), $this->settings); $populator = new Populator($this->settings, WPFunctions::get(), new Captcha, $referral_detector, $features_controller, $wc_transactional_emails); $populator->up(); - $this->url = new Url(WPFunctions::get(), $this->settings); + $this->url = new SubscriptionUrlFactory(WPFunctions::get(), $this->settings); } function testItReturnsTheDefaultPageUrlIfNoPageIsSetInSettings() {