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

Refactor authorized emails validation from Bridge to Controller

Browse Source 
[MAILPOET-2022]
This commit is contained in:
Rostislav Wolny
2019-05-23 17:52:45 +02:00
committed by M. Shull
parent f3d8ac4c7d
commit f86c0c9612
18 changed files with 246 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Cron/Workers/AuthorizedSendingEmailsCheck.php
View File

@@ -3,6 +3,7 @@ namespace MailPoet\Cron\Workers;
use MailPoet\Cron\CronHelper;
use MailPoet\Models\ScheduledTask;
use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController;
use MailPoet\Subscribers\InactiveSubscribersController;
@@ -13,11 +14,11 @@ class AuthorizedSendingEmailsCheck extends SimpleWorker {
const TASK_TYPE = 'authorized_email_addresses_check';
const AUTOMATIC_SCHEDULING = false;
/** @var Bridge */
private $bridge;
/** @var AuthorizedEmailsController */
private $authorized_emails_controller;
function __construct(Bridge $bridge, $timer = false) {
$this->bridge = $bridge;
function __construct(AuthorizedEmailsController $authorized_emails_controller, $timer = false) {
$this->authorized_emails_controller = $authorized_emails_controller;
parent::__construct($timer);
}
@@ -26,7 +27,7 @@ class AuthorizedSendingEmailsCheck extends SimpleWorker {
}
function processTaskStrategy(ScheduledTask $task) {
$this->bridge->checkAuthorizedEmailAddresses();
$this->authorized_emails_controller->checkAuthorizedEmailAddresses();
return true;
}
}

12
lib/Cron/Workers/WorkersFactory.php
View File

@@ -15,7 +15,7 @@ use MailPoet\Cron\Workers\WooCommerceSync as WooCommerceSyncWorker;
use MailPoet\Cron\Workers\SendingQueue\SendingErrorHandler;
use MailPoet\Features\FeaturesController;
use MailPoet\Segments\WooCommerce as WooCommerceSegment;
use MailPoet\Services\Bridge;
use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use MailPoet\Mailer\Mailer;
use MailPoet\Settings\SettingsController;
@@ -47,8 +47,8 @@ class WorkersFactory {
/** @var WooCommerceHelper */
private $woocommerce_helper;
/** @var Bridge */
private $bridge;
/** @var AuthorizedEmailsController */
private $authorized_emails_controller;
/**
* @var Renderer
@@ -65,7 +65,7 @@ class WorkersFactory {
WooCommerceSegment $woocommerce_segment,
InactiveSubscribersController $inactive_subscribers_controller,
WooCommerceHelper $woocommerce_helper,
Bridge $bridge
AuthorizedEmailsController $authorized_emails_controller
) {
$this->sending_error_handler = $sending_error_handler;
$this->scheduler = $scheduler;
@@ -76,7 +76,7 @@ class WorkersFactory {
$this->woocommerce_segment = $woocommerce_segment;
$this->inactive_subscribers_controller = $inactive_subscribers_controller;
$this->woocommerce_helper = $woocommerce_helper;
$this->bridge = $bridge;
$this->authorized_emails_controller = $authorized_emails_controller;
}
/** @return SchedulerWorker */
@@ -130,7 +130,7 @@ class WorkersFactory {
/** @return AuthorizedSendingEmailsCheck */
function createAuthorizedSendingEmailsCheckWorker($timer) {
return new AuthorizedSendingEmailsCheck($this->bridge, $timer);
return new AuthorizedSendingEmailsCheck($this->authorized_emails_controller, $timer);
}
}