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

Rename Subscription\Url to Subscription\SubscriptionUrlFactory

Browse Source 
[MAILPOET-2381]
This commit is contained in:
Rostislav Wolny
2019-09-23 16:03:23 +02:00
committed by Jack Kitterhing
parent 653dbe5783
commit 7dba4d900c
15 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Subscription/CaptchaRenderer.php
View File

@ -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;

4
lib/Subscription/Pages.php
View File

@ -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;

10
lib/Subscription/Url.php → lib/Subscription/SubscriptionUrlFactory.php
View File

@ -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;
}