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

Replace "new SettingsController()" with fetch from DI container

Browse Source 
[MAILPOET-2436]
This commit is contained in:
Jan Jakeš
2019-10-24 10:48:58 +02:00
committed by Jack Kitterhing
parent c91cd1255a
commit d970dda637
79 changed files with 132 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Cron/Triggers/WordPress.php
View File

@@ -44,7 +44,7 @@ class WordPress {
}
private static function checkRunInterval() {
$settings = new SettingsController();
$settings = SettingsController::getInstance();
$last_run_at = (int)$settings->get(self::LAST_RUN_AT_SETTING, 0);
$run_interval = WPFunctions::get()->applyFilters('mailpoet_cron_trigger_wordpress_run_interval', self::RUN_INTERVAL);
$run_interval_elapsed = (time() - $last_run_at) >= $run_interval;
@@ -56,7 +56,7 @@ class WordPress {
}
static function resetRunInterval() {
$settings = new SettingsController();
$settings = SettingsController::getInstance();
$settings->set(self::LAST_RUN_AT_SETTING, 0);
}
@@ -64,7 +64,7 @@ class WordPress {
self::loadTasksCounts($wp ?: new WPFunctions);
// migration
$settings = new SettingsController();
$settings = SettingsController::getInstance();
$migration_disabled = $settings->get('cron_trigger.method') === 'none';
$migration_due_tasks = self::getTasksCount([
'type' => MigrationWorker::TASK_TYPE,

2
lib/Cron/Workers/SendingQueue/Tasks/Links.php
View File

@@ -40,7 +40,7 @@ class Links {
static function getUnsubscribeUrl($queue, $subscriber_id) {
$subscriber = Subscriber::where('id', $subscriber_id)->findOne();
$settings = new SettingsController();
$settings = SettingsController::getInstance();
if ((boolean)$settings->get('tracking.enabled')) {
$link_hash = NewsletterLinkModel::where('queue_id', $queue->id)
->where('url', NewsletterLinkModel::UNSUBSCRIBE_LINK_SHORT_CODE)

2
lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php
View File

@@ -38,7 +38,7 @@ class Newsletter {
private $emoji;
function __construct(WPFunctions $wp = null, PostsTask $posts_task = null, GATracking $ga_tracking = null, Emoji $emoji = null) {
$settings = new SettingsController();
$settings = SettingsController::getInstance();
$this->tracking_enabled = (boolean)$settings->get('tracking.enabled');
if ($wp === null) {
$wp = new WPFunctions;