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

Remove unnecessary aliases for SubcriptionUrlFactory

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

6
lib/API/JSON/v1/Subscribers.php
View File

@ -24,7 +24,7 @@ use MailPoet\Subscribers\SubscriberActions;
use MailPoet\Subscription\Captcha; use MailPoet\Subscription\Captcha;
use MailPoet\Subscription\CaptchaSession; use MailPoet\Subscription\CaptchaSession;
use MailPoet\Subscription\Throttling as SubscriptionThrottling; use MailPoet\Subscription\Throttling as SubscriptionThrottling;
use MailPoet\Subscription\SubscriptionUrlFactory as SubscriptionUrl; use MailPoet\Subscription\SubscriptionUrlFactory;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
class Subscribers extends APIEndpoint { class Subscribers extends APIEndpoint {
@ -65,7 +65,7 @@ class Subscribers extends APIEndpoint {
/** @var ConfirmationEmailMailer; */ /** @var ConfirmationEmailMailer; */
private $confirmation_email_mailer; private $confirmation_email_mailer;
/** @var SubscriptionUrl */ /** @var SubscriptionUrlFactory */
private $subscription_url_factory; private $subscription_url_factory;
public function __construct( public function __construct(
@ -79,7 +79,7 @@ class Subscribers extends APIEndpoint {
SettingsController $settings, SettingsController $settings,
CaptchaSession $captcha_session, CaptchaSession $captcha_session,
ConfirmationEmailMailer $confirmation_email_mailer, ConfirmationEmailMailer $confirmation_email_mailer,
SubscriptionUrl $subscription_url_factory SubscriptionUrlFactory $subscription_url_factory
) { ) {
$this->bulk_action_controller = $bulk_action_controller; $this->bulk_action_controller = $bulk_action_controller;
$this->subscribers_listings = $subscribers_listings; $this->subscribers_listings = $subscribers_listings;

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

@ -5,7 +5,7 @@ namespace MailPoet\Newsletter\Shortcodes\Categories;
use MailPoet\Newsletter\Url as NewsletterUrl; use MailPoet\Newsletter\Url as NewsletterUrl;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Statistics\Track\Unsubscribes; use MailPoet\Statistics\Track\Unsubscribes;
use MailPoet\Subscription\SubscriptionUrlFactory as SubscriptionUrl; use MailPoet\Subscription\SubscriptionUrlFactory;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
class Link { class Link {
@ -19,7 +19,7 @@ class Link {
$content, $content,
$wp_user_preview $wp_user_preview
) { ) {
$subscription_url_factory = SubscriptionUrl::getInstance(); $subscription_url_factory = SubscriptionUrlFactory::getInstance();
switch ($shortcode_details['action']) { switch ($shortcode_details['action']) {
case 'subscription_unsubscribe_url': case 'subscription_unsubscribe_url':
return self::processUrl( return self::processUrl(
@ -74,7 +74,7 @@ class Link {
static function processShortcodeAction( static function processShortcodeAction(
$shortcode_action, $newsletter, $subscriber, $queue, $wp_user_preview $shortcode_action, $newsletter, $subscriber, $queue, $wp_user_preview
) { ) {
$subscription_url_factory = SubscriptionUrl::getInstance(); $subscription_url_factory = SubscriptionUrlFactory::getInstance();
switch ($shortcode_action) { switch ($shortcode_action) {
case 'subscription_unsubscribe_url': case 'subscription_unsubscribe_url':
$settings = new SettingsController(); $settings = new SettingsController();

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

@ -29,7 +29,7 @@ use MailPoet\Newsletter\Url;
use MailPoet\Router\Router; use MailPoet\Router\Router;
use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Subscription\SubscriptionUrlFactory as SubscriptionUrl; use MailPoet\Subscription\SubscriptionUrlFactory;
use MailPoet\Tasks\Sending as SendingTask; use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\WooCommerce\Helper as WCHelper; use MailPoet\WooCommerce\Helper as WCHelper;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@ -38,12 +38,12 @@ class NewslettersTest extends \MailPoetTest {
/** @var Newsletters */ /** @var Newsletters */
private $endpoint; private $endpoint;
/** @var SubscriptionUrl */ /** @var SubscriptionUrlFactory */
private $subscription_url_factory; private $subscription_url_factory;
function _before() { function _before() {
parent::_before(); parent::_before();
$this->subscription_url_factory = SubscriptionUrl::getInstance(); $this->subscription_url_factory = SubscriptionUrlFactory::getInstance();
$this->endpoint = ContainerWrapper::getInstance()->get(Newsletters::class); $this->endpoint = ContainerWrapper::getInstance()->get(Newsletters::class);
$this->newsletter = Newsletter::createOrUpdate( $this->newsletter = Newsletter::createOrUpdate(
[ [

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

@ -14,7 +14,7 @@ use MailPoet\Newsletter\Url as NewsletterUrl;
use MailPoet\Referrals\ReferralDetector; use MailPoet\Referrals\ReferralDetector;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Subscription\Captcha; use MailPoet\Subscription\Captcha;
use MailPoet\Subscription\SubscriptionUrlFactory as SubscriptionUrl; use MailPoet\Subscription\SubscriptionUrlFactory;
use MailPoet\WooCommerce\TransactionalEmails; use MailPoet\WooCommerce\TransactionalEmails;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@ -26,7 +26,7 @@ class ShortcodesTest extends \MailPoetTest {
public $subscriber; public $subscriber;
/** @var SettingsController */ /** @var SettingsController */
private $settings; private $settings;
/** @var SubscriptionUrl */ /** @var SubscriptionUrlFactory */
private $subscription_url_factory; private $subscription_url_factory;
function _before() { function _before() {
@ -46,7 +46,7 @@ class ShortcodesTest extends \MailPoetTest {
$this->subscriber $this->subscriber
); );
$this->settings->set('tracking.enabled', false); $this->settings->set('tracking.enabled', false);
$this->subscription_url_factory = new SubscriptionUrl(WPFunctions::get(), $this->settings); $this->subscription_url_factory = new SubscriptionUrlFactory(WPFunctions::get(), $this->settings);
} }
function testItCanExtractShortcodes() { function testItCanExtractShortcodes() {