From d970dda6376e014c341565f9b86ad883d051aafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Thu, 24 Oct 2019 10:48:58 +0200 Subject: [PATCH] Replace "new SettingsController()" with fetch from DI container [MAILPOET-2436] --- lib/Config/Installer.php | 2 +- lib/Config/ServicesChecker.php | 2 +- lib/Config/Updater.php | 2 +- lib/Cron/Triggers/WordPress.php | 6 +++--- lib/Cron/Workers/SendingQueue/Tasks/Links.php | 2 +- .../Workers/SendingQueue/Tasks/Newsletter.php | 2 +- lib/Form/Renderer.php | 2 +- lib/Form/Widget.php | 2 +- lib/Logging/LoggerFactory.php | 2 +- lib/Mailer/Mailer.php | 6 +++--- lib/Mailer/MailerLog.php | 6 +++--- lib/Models/Form.php | 2 +- lib/Models/Newsletter.php | 2 +- lib/Models/Setting.php | 2 +- lib/Models/Subscriber.php | 2 +- lib/Newsletter/Shortcodes/Categories/Link.php | 4 ++-- lib/Segments/WP.php | 4 ++-- lib/Services/Bridge.php | 8 ++++---- lib/Settings/SettingsController.php | 6 ++++++ lib/Subscribers/ConfirmationEmailMailer.php | 2 +- .../NewSubscriberNotificationMailer.php | 2 +- lib/Subscription/SubscriptionUrlFactory.php | 2 +- lib/Twig/Analytics.php | 2 +- lib/Twig/Functions.php | 2 +- lib/Twig/Polls.php | 2 +- lib/Util/Notices/AfterMigrationNotice.php | 2 +- lib/Util/Notices/PermanentNotices.php | 6 +++--- tests/DataFactories/Settings.php | 2 +- tests/integration/API/JSON/v1/MailerTest.php | 4 ++-- .../API/JSON/v1/NewslettersTest.php | 8 ++++---- .../API/JSON/v1/SendingQueueTest.php | 2 +- .../integration/API/JSON/v1/ServicesTest.php | 2 +- .../integration/API/JSON/v1/SettingsTest.php | 2 +- tests/integration/API/JSON/v1/SetupTest.php | 6 +++--- .../API/JSON/v1/SubscribersTest.php | 2 +- tests/integration/API/MP/APITest.php | 6 +++--- tests/integration/Analytics/AnalyticsTest.php | 10 +++++----- tests/integration/Config/MP2MigratorTest.php | 2 +- .../Config/ServicesCheckerTest.php | 2 +- tests/integration/Cron/CronHelperTest.php | 2 +- tests/integration/Cron/CronTriggerTest.php | 2 +- .../integration/Cron/DaemonHttpRunnerTest.php | 20 +++++++++---------- tests/integration/Cron/DaemonTest.php | 2 +- tests/integration/Cron/SupervisorTest.php | 2 +- .../Cron/Triggers/MailPoetTest.php | 2 +- .../Cron/Triggers/WordPressTest.php | 2 +- .../AuthorizedSendingEmailsCheckTest.php | 2 +- tests/integration/Cron/Workers/BeamerTest.php | 8 ++++---- tests/integration/Cron/Workers/BounceTest.php | 2 +- .../Cron/Workers/InactiveSubscribersTest.php | 2 +- .../Workers/KeyCheck/PremiumKeyCheckTest.php | 2 +- .../KeyCheck/SendingServiceKeyCheckTest.php | 2 +- .../Workers/SendingQueue/SendingQueueTest.php | 2 +- .../Workers/SendingQueue/Tasks/MailerTest.php | 2 +- .../AutomatedEmailsTest.php | 2 +- .../Workers/StatsNotifications/WorkerTest.php | 2 +- tests/integration/Helpscout/BeaconTest.php | 2 +- tests/integration/Mailer/MailerLogTest.php | 2 +- tests/integration/Mailer/MailerTest.php | 2 +- tests/integration/Models/FormTest.php | 2 +- tests/integration/Models/SettingTest.php | 6 +++--- tests/integration/Models/SubscriberTest.php | 2 +- .../integration/Newsletter/ShortcodesTest.php | 2 +- .../Newsletter/ViewInBrowserTest.php | 4 ++-- .../Referrals/UrlDecoratorTest.php | 2 +- .../Router/Endpoints/TrackTest.php | 2 +- .../Router/Endpoints/ViewInBrowserTest.php | 10 +++++----- .../AuthorizedEmailsControllerTest.php | 2 +- tests/integration/Services/BridgeTest.php | 2 +- .../Settings/SettingsControllerTest.php | 2 +- .../ConfirmationEmailMailerTest.php | 2 +- .../NewSubscriberNotificationMailerTest.php | 2 +- .../Subscribers/SubscriberActionsTest.php | 2 +- tests/integration/Subscription/FormTest.php | 2 +- tests/integration/Subscription/UrlTest.php | 2 +- .../Notices/InactiveSubscribersNoticeTest.php | 8 ++++---- .../WooCommerce/SubscriptionTest.php | 2 +- .../WooCommerce/TransactionalEmailsTest.php | 2 +- tests/integration/_bootstrap.php | 3 ++- 79 files changed, 132 insertions(+), 125 deletions(-) diff --git a/lib/Config/Installer.php b/lib/Config/Installer.php index fff774f1ed..b36249c7c1 100644 --- a/lib/Config/Installer.php +++ b/lib/Config/Installer.php @@ -18,7 +18,7 @@ class Installer { function __construct($slug) { $this->slug = $slug; - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function init() { diff --git a/lib/Config/ServicesChecker.php b/lib/Config/ServicesChecker.php index deb957e309..0aa1f8e6e1 100644 --- a/lib/Config/ServicesChecker.php +++ b/lib/Config/ServicesChecker.php @@ -17,7 +17,7 @@ class ServicesChecker { private $settings; public function __construct() { - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function isMailPoetAPIKeyValid($display_error_notice = true, $force_check = false) { diff --git a/lib/Config/Updater.php b/lib/Config/Updater.php index 02858145e2..eb39e2bbee 100644 --- a/lib/Config/Updater.php +++ b/lib/Config/Updater.php @@ -19,7 +19,7 @@ class Updater { $this->plugin = WPFunctions::get()->pluginBasename($plugin_name); $this->slug = $slug; $this->version = $version; - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function init() { diff --git a/lib/Cron/Triggers/WordPress.php b/lib/Cron/Triggers/WordPress.php index 8c084d724e..081ef74520 100644 --- a/lib/Cron/Triggers/WordPress.php +++ b/lib/Cron/Triggers/WordPress.php @@ -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, diff --git a/lib/Cron/Workers/SendingQueue/Tasks/Links.php b/lib/Cron/Workers/SendingQueue/Tasks/Links.php index 1a3f585590..aa4c7d3833 100644 --- a/lib/Cron/Workers/SendingQueue/Tasks/Links.php +++ b/lib/Cron/Workers/SendingQueue/Tasks/Links.php @@ -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) diff --git a/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php b/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php index 04dea2a5f4..630c558147 100644 --- a/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php +++ b/lib/Cron/Workers/SendingQueue/Tasks/Newsletter.php @@ -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; diff --git a/lib/Form/Renderer.php b/lib/Form/Renderer.php index be7a30f1aa..4be422f786 100644 --- a/lib/Form/Renderer.php +++ b/lib/Form/Renderer.php @@ -42,7 +42,7 @@ class Renderer { } static function renderBlocks($blocks = [], $honeypot_enabled = true) { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); // add honeypot for spambots $html = ($honeypot_enabled) ? '' : diff --git a/lib/Form/Widget.php b/lib/Form/Widget.php index 2b8bd915e6..e93aecd4d0 100644 --- a/lib/Form/Widget.php +++ b/lib/Form/Widget.php @@ -25,7 +25,7 @@ class Widget extends \WP_Widget { ); $this->wp = new WPFunctions; $this->renderer = new \MailPoet\Config\Renderer(!WP_DEBUG, !WP_DEBUG); - $this->assets_controller = new AssetsController($this->wp, $this->renderer, new SettingsController()); + $this->assets_controller = new AssetsController($this->wp, $this->renderer, SettingsController::getInstance()); if (!is_admin()) { $this->setupIframe(); } else { diff --git a/lib/Logging/LoggerFactory.php b/lib/Logging/LoggerFactory.php index a74913e8d5..2eb093be3f 100644 --- a/lib/Logging/LoggerFactory.php +++ b/lib/Logging/LoggerFactory.php @@ -66,7 +66,7 @@ class LoggerFactory { static function getInstance() { if (!self::$instance instanceof LoggerFactory) { - self::$instance = new LoggerFactory(new SettingsController); + self::$instance = new LoggerFactory(SettingsController::getInstance()); } return self::$instance; } diff --git a/lib/Mailer/Mailer.php b/lib/Mailer/Mailer.php index 967e554536..1472a26b42 100644 --- a/lib/Mailer/Mailer.php +++ b/lib/Mailer/Mailer.php @@ -29,7 +29,7 @@ class Mailer { function __construct(SettingsController $settings = null) { if (!$settings) { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); } $this->settings = $settings; } @@ -69,7 +69,7 @@ class Mailer { $this->sender, $this->reply_to, new MailPoetMapper(), - new AuthorizedEmailsController(new SettingsController, new Bridge) + new AuthorizedEmailsController(SettingsController::getInstance(), new Bridge) ); break; case self::METHOD_SENDGRID: @@ -109,7 +109,7 @@ class Mailer { } static function getMailerConfig($mailer = false) { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); if (!$mailer) { $mailer = $settings->get(self::MAILER_CONFIG_SETTING_NAME); if (!$mailer || !isset($mailer['method'])) throw new \Exception(__('Mailer is not configured.', 'mailpoet')); diff --git a/lib/Mailer/MailerLog.php b/lib/Mailer/MailerLog.php index a91559ec57..ff8c16f998 100644 --- a/lib/Mailer/MailerLog.php +++ b/lib/Mailer/MailerLog.php @@ -12,7 +12,7 @@ class MailerLog { static function getMailerLog($mailer_log = false) { if ($mailer_log) return $mailer_log; - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $mailer_log = $settings->get(self::SETTING_NAME); if (!$mailer_log) { $mailer_log = self::createMailerLog(); @@ -29,7 +29,7 @@ class MailerLog { 'retry_at' => null, 'error' => null, ]; - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set(self::SETTING_NAME, $mailer_log); return $mailer_log; } @@ -39,7 +39,7 @@ class MailerLog { } static function updateMailerLog($mailer_log) { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set(self::SETTING_NAME, $mailer_log); return $mailer_log; } diff --git a/lib/Models/Form.php b/lib/Models/Form.php index 80926a212b..2e47978faa 100644 --- a/lib/Models/Form.php +++ b/lib/Models/Form.php @@ -121,7 +121,7 @@ class Form extends Model { } static function getDefaultSuccessMessage() { - $settings = new SettingsController; + $settings = SettingsController::getInstance(); if ($settings->get('signup_confirmation.enabled')) { return __('Check your inbox or spam folder to confirm your subscription.', 'mailpoet'); } diff --git a/lib/Models/Newsletter.php b/lib/Models/Newsletter.php index 84ed75cc11..92df7086ae 100644 --- a/lib/Models/Newsletter.php +++ b/lib/Models/Newsletter.php @@ -1045,7 +1045,7 @@ class Newsletter extends Model { static function createOrUpdate($data = []) { $data['unsubscribe_token'] = Security::generateUnsubscribeToken(self::class); return parent::_createOrUpdate($data, false, function($data) { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); // set default sender based on settings if (empty($data['sender'])) { $sender = $settings->get('sender', []); diff --git a/lib/Models/Setting.php b/lib/Models/Setting.php index 9a8da338cf..c9c9383ef1 100644 --- a/lib/Models/Setting.php +++ b/lib/Models/Setting.php @@ -46,7 +46,7 @@ class Setting extends Model { } public static function saveDefaultSenderIfNeeded($sender_address, $sender_name) { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); if (empty($sender_address) || empty($sender_name) || $settings->get('sender')) { return; } diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php index a490f7082a..e7501c1d69 100644 --- a/lib/Models/Subscriber.php +++ b/lib/Models/Subscriber.php @@ -787,7 +787,7 @@ class Subscriber extends Model { } static function setRequiredFieldsDefaultValues($data) { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $required_field_default_values = [ 'first_name' => '', 'last_name' => '', diff --git a/lib/Newsletter/Shortcodes/Categories/Link.php b/lib/Newsletter/Shortcodes/Categories/Link.php index 23e3167cbf..4d86442576 100644 --- a/lib/Newsletter/Shortcodes/Categories/Link.php +++ b/lib/Newsletter/Shortcodes/Categories/Link.php @@ -65,7 +65,7 @@ class Link { static function processUrl($action, $url, $queue, $wp_user_preview = false) { if ($wp_user_preview) return $url; - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); return ($queue !== false && (boolean)$settings->get('tracking.enabled')) ? self::getFullShortcode($action) : $url; @@ -77,7 +77,7 @@ class Link { $subscription_url_factory = SubscriptionUrlFactory::getInstance(); switch ($shortcode_action) { case 'subscription_unsubscribe_url': - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); // track unsubscribe event if ((boolean)$settings->get('tracking.enabled') && !$wp_user_preview) { $unsubscribe_event = new Unsubscribes(); diff --git a/lib/Segments/WP.php b/lib/Segments/WP.php index 9da4588458..65b6d7368d 100644 --- a/lib/Segments/WP.php +++ b/lib/Segments/WP.php @@ -44,7 +44,7 @@ class WP { if (empty($wp_user->first_name) && empty($wp_user->last_name)) { $first_name = $wp_user->display_name; } - $signup_confirmation_enabled = (new SettingsController())->get('signup_confirmation.enabled'); + $signup_confirmation_enabled = SettingsController::getInstance()->get('signup_confirmation.enabled'); // subscriber data $data = [ 'wp_user_id' => $wp_user->ID, @@ -135,7 +135,7 @@ class WP { private static function insertSubscribers() { global $wpdb; $subscribers_table = Subscriber::$_table; - $signup_confirmation_enabled = (new SettingsController())->get('signup_confirmation.enabled'); + $signup_confirmation_enabled = SettingsController::getInstance()->get('signup_confirmation.enabled'); $inserterd_user_ids = \ORM::for_table($wpdb->users)->raw_query(sprintf( 'SELECT %2$s.id, %2$s.user_email as email FROM %2$s diff --git a/lib/Services/Bridge.php b/lib/Services/Bridge.php index bbdc062f0b..db9fea3118 100644 --- a/lib/Services/Bridge.php +++ b/lib/Services/Bridge.php @@ -38,7 +38,7 @@ class Bridge { function __construct(SettingsController $settingsController = null) { if ($settingsController === null) { - $settingsController = new SettingsController; + $settingsController = SettingsController::getInstance(); } $this->settings = $settingsController; } @@ -54,13 +54,13 @@ class Bridge { } static function isMSSKeySpecified() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $key = $settings->get(self::API_KEY_SETTING_NAME); return !empty($key); } static function isPremiumKeySpecified() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $key = $settings->get(self::PREMIUM_KEY_SETTING_NAME); return !empty($key); } @@ -187,7 +187,7 @@ class Bridge { } static function invalidateKey() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set( self::API_KEY_STATE_SETTING_NAME, ['state' => self::KEY_INVALID] diff --git a/lib/Settings/SettingsController.php b/lib/Settings/SettingsController.php index 3c4a4ba734..c5df6ca540 100644 --- a/lib/Settings/SettingsController.php +++ b/lib/Settings/SettingsController.php @@ -3,6 +3,7 @@ namespace MailPoet\Settings; use MailPoet\Cron\CronTrigger; +use MailPoet\DI\ContainerWrapper; use MailPoet\Models\Setting; use MailPoet\Util\Helpers; use MailPoet\WP\Functions as WPFunctions; @@ -164,4 +165,9 @@ class SettingsController { self::$settings = []; self::$loaded = false; } + + /** @return SettingsController */ + static function getInstance() { + return ContainerWrapper::getInstance()->get(SettingsController::class); + } } diff --git a/lib/Subscribers/ConfirmationEmailMailer.php b/lib/Subscribers/ConfirmationEmailMailer.php index 6dd336b67f..963ef6c1a4 100644 --- a/lib/Subscribers/ConfirmationEmailMailer.php +++ b/lib/Subscribers/ConfirmationEmailMailer.php @@ -45,7 +45,7 @@ class ConfirmationEmailMailer { $this->wp = new WPFunctions; } - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->mailerMetaInfo = new MetaInfo; if ($subscription_url_factory === null) { diff --git a/lib/Subscribers/NewSubscriberNotificationMailer.php b/lib/Subscribers/NewSubscriberNotificationMailer.php index ff08c580e1..6f523ce5e4 100644 --- a/lib/Subscribers/NewSubscriberNotificationMailer.php +++ b/lib/Subscribers/NewSubscriberNotificationMailer.php @@ -39,7 +39,7 @@ class NewSubscriberNotificationMailer { $this->renderer = new Renderer($caching, $debugging); } $this->mailer = $mailer; - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->mailerMetaInfo = new MetaInfo(); } diff --git a/lib/Subscription/SubscriptionUrlFactory.php b/lib/Subscription/SubscriptionUrlFactory.php index e9ec8e98a1..4d2e0a8ec2 100644 --- a/lib/Subscription/SubscriptionUrlFactory.php +++ b/lib/Subscription/SubscriptionUrlFactory.php @@ -103,7 +103,7 @@ class SubscriptionUrlFactory { */ static function getInstance() { if (!self::$instance instanceof SubscriptionUrlFactory) { - self::$instance = new SubscriptionUrlFactory(new WPFunctions, new SettingsController, new LinkTokens); + self::$instance = new SubscriptionUrlFactory(new WPFunctions, SettingsController::getInstance(), new LinkTokens); } return self::$instance; } diff --git a/lib/Twig/Analytics.php b/lib/Twig/Analytics.php index 9ba49cd838..fbf83b834f 100644 --- a/lib/Twig/Analytics.php +++ b/lib/Twig/Analytics.php @@ -12,7 +12,7 @@ use MailPoetVendor\Twig\TwigFunction; class Analytics extends AbstractExtension { public function getFunctions() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $analytics = new AnalyticsGenerator( new Reporter($settings, new WooCommerceHelper()), $settings diff --git a/lib/Twig/Functions.php b/lib/Twig/Functions.php index 562278b2b4..60a80075fb 100644 --- a/lib/Twig/Functions.php +++ b/lib/Twig/Functions.php @@ -27,7 +27,7 @@ class Functions extends AbstractExtension { private $referral_url_decorator; public function __construct() { - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->woocommerce_helper = new WooCommerceHelper(); $this->wp = WPFunctions::get(); $this->referral_url_decorator = new UrlDecorator($this->wp, $this->settings); diff --git a/lib/Twig/Polls.php b/lib/Twig/Polls.php index db6eda9fd1..2319ed79dc 100644 --- a/lib/Twig/Polls.php +++ b/lib/Twig/Polls.php @@ -12,7 +12,7 @@ class Polls extends AbstractExtension { private $settings; public function __construct() { - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } public function getFunctions() { diff --git a/lib/Util/Notices/AfterMigrationNotice.php b/lib/Util/Notices/AfterMigrationNotice.php index d8f07b75f0..266d6c4e81 100644 --- a/lib/Util/Notices/AfterMigrationNotice.php +++ b/lib/Util/Notices/AfterMigrationNotice.php @@ -14,7 +14,7 @@ class AfterMigrationNotice { private $settings; function __construct() { - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function enable() { diff --git a/lib/Util/Notices/PermanentNotices.php b/lib/Util/Notices/PermanentNotices.php index 8e2227ec95..636dbe0231 100644 --- a/lib/Util/Notices/PermanentNotices.php +++ b/lib/Util/Notices/PermanentNotices.php @@ -33,9 +33,9 @@ class PermanentNotices { $this->wp = $wp; $this->php_version_warnings = new PHPVersionWarnings(); $this->after_migration_notice = new AfterMigrationNotice(); - $this->unauthorized_emails_notice = new UnauthorizedEmailNotice(new SettingsController, $wp); - $this->unauthorized_emails_in_newsletters_notice = new UnauthorizedEmailInNewslettersNotice(new SettingsController, $wp); - $this->inactive_subscribers_notice = new InactiveSubscribersNotice(new SettingsController, $wp); + $this->unauthorized_emails_notice = new UnauthorizedEmailNotice(SettingsController::getInstance(), $wp); + $this->unauthorized_emails_in_newsletters_notice = new UnauthorizedEmailInNewslettersNotice(SettingsController::getInstance(), $wp); + $this->inactive_subscribers_notice = new InactiveSubscribersNotice(SettingsController::getInstance(), $wp); $this->black_friday_notice = new BlackFridayNotice(); } diff --git a/tests/DataFactories/Settings.php b/tests/DataFactories/Settings.php index 2b387ece76..c547b8f512 100644 --- a/tests/DataFactories/Settings.php +++ b/tests/DataFactories/Settings.php @@ -11,7 +11,7 @@ class Settings { public function __construct() { SettingsController::resetCache(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function withDefaultSettings() { diff --git a/tests/integration/API/JSON/v1/MailerTest.php b/tests/integration/API/JSON/v1/MailerTest.php index cc81499f17..52b2196d40 100644 --- a/tests/integration/API/JSON/v1/MailerTest.php +++ b/tests/integration/API/JSON/v1/MailerTest.php @@ -18,7 +18,7 @@ class MailerTest extends \MailPoetTest { MailerLog::updateMailerLog($mailer_log); $mailer_log = MailerLog::getMailerLog(); expect($mailer_log['status'])->equals(MailerLog::STATUS_PAUSED); - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $authorized_emails_controller = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::never()]); // resumeSending() method should clear the mailer log's status $bridge = new Bridge($settings); @@ -30,7 +30,7 @@ class MailerTest extends \MailPoetTest { } function testItRunsAuhtorizedEmailsCheckIfErrorIsPresent() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, ['invalid_sender_address' => 'a@b.c']); $authorized_emails_controller = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::once()]); $bridge = new Bridge($settings); diff --git a/tests/integration/API/JSON/v1/NewslettersTest.php b/tests/integration/API/JSON/v1/NewslettersTest.php index d1d75b16f0..080f7f1f97 100644 --- a/tests/integration/API/JSON/v1/NewslettersTest.php +++ b/tests/integration/API/JSON/v1/NewslettersTest.php @@ -139,7 +139,7 @@ class NewslettersTest extends \MailPoetTest { ContainerWrapper::getInstance()->get(Handler::class), $wp, $this->makeEmpty(WCHelper::class), - new SettingsController(), + SettingsController::getInstance(), $this->cron_helper, $this->make(AuthorizedEmailsController::class, ['onNewsletterUpdate' => Expected::never()]), ContainerWrapper::getInstance()->get(NewslettersRepository::class), @@ -194,7 +194,7 @@ class NewslettersTest extends \MailPoetTest { ContainerWrapper::getInstance()->get(Handler::class), $wp, $this->makeEmpty(WCHelper::class), - new SettingsController(), + SettingsController::getInstance(), $this->cron_helper, $this->make(AuthorizedEmailsController::class, ['onNewsletterUpdate' => Expected::once()]), ContainerWrapper::getInstance()->get(NewslettersRepository::class), @@ -568,7 +568,7 @@ class NewslettersTest extends \MailPoetTest { ContainerWrapper::getInstance()->get(Handler::class), $wp, $this->makeEmpty(WCHelper::class), - new SettingsController(), + SettingsController::getInstance(), $this->cron_helper, $this->make(AuthorizedEmailsController::class, ['onNewsletterUpdate' => Expected::never()]), ContainerWrapper::getInstance()->get(NewslettersRepository::class), @@ -909,7 +909,7 @@ class NewslettersTest extends \MailPoetTest { ContainerWrapper::getInstance()->get(Handler::class), $wp, $this->makeEmpty(WCHelper::class), - new SettingsController(), + SettingsController::getInstance(), $this->cron_helper, ContainerWrapper::getInstance()->get(AuthorizedEmailsController::class), ContainerWrapper::getInstance()->get(NewslettersRepository::class), diff --git a/tests/integration/API/JSON/v1/SendingQueueTest.php b/tests/integration/API/JSON/v1/SendingQueueTest.php index 2f8d7d97e3..48a353ddcc 100644 --- a/tests/integration/API/JSON/v1/SendingQueueTest.php +++ b/tests/integration/API/JSON/v1/SendingQueueTest.php @@ -23,7 +23,7 @@ class SendingQueueTest extends \MailPoetTest { 'type' => Newsletter::TYPE_STANDARD, ] ); - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set('sender', [ 'name' => 'John Doe', 'address' => 'john.doe@example.com', diff --git a/tests/integration/API/JSON/v1/ServicesTest.php b/tests/integration/API/JSON/v1/ServicesTest.php index 39ebd6a4c8..8abbfd8953 100644 --- a/tests/integration/API/JSON/v1/ServicesTest.php +++ b/tests/integration/API/JSON/v1/ServicesTest.php @@ -20,7 +20,7 @@ class ServicesTest extends \MailPoetTest { parent::_before(); $this->services_endpoint = $this->di_container->get(Services::class); $this->data = ['key' => '1234567890abcdef']; - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function testItRespondsWithErrorIfSPFCheckFails() { diff --git a/tests/integration/API/JSON/v1/SettingsTest.php b/tests/integration/API/JSON/v1/SettingsTest.php index aa525d3445..c70a818d86 100644 --- a/tests/integration/API/JSON/v1/SettingsTest.php +++ b/tests/integration/API/JSON/v1/SettingsTest.php @@ -25,7 +25,7 @@ class SettingsTest extends \MailPoetTest { function _before() { parent::_before(); \ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->settings->set('some.setting.key', true); $this->endpoint = new Settings( $this->settings, diff --git a/tests/integration/API/JSON/v1/SetupTest.php b/tests/integration/API/JSON/v1/SetupTest.php index 4e02b8233f..5119551cfe 100644 --- a/tests/integration/API/JSON/v1/SetupTest.php +++ b/tests/integration/API/JSON/v1/SetupTest.php @@ -19,7 +19,7 @@ use MailPoet\WP\Functions as WPFunctions; class SetupTest extends \MailPoetTest { function _before() { parent::_before(); - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set('signup_confirmation.enabled', false); } @@ -30,7 +30,7 @@ class SetupTest extends \MailPoetTest { $features_controller = Stub::makeEmpty(FeaturesController::class); - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $referral_detector = new ReferralDetector($wp, $settings); $wc_transactional_emails = new TransactionalEmails($wp, $settings); $populator = new Populator($settings, $wp, new Captcha(), $referral_detector, $features_controller, $wc_transactional_emails); @@ -38,7 +38,7 @@ class SetupTest extends \MailPoetTest { $response = $router->reset(); expect($response->status)->equals(APIResponse::STATUS_OK); - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $signup_confirmation = $settings->fetch('signup_confirmation.enabled'); expect($signup_confirmation)->true(); diff --git a/tests/integration/API/JSON/v1/SubscribersTest.php b/tests/integration/API/JSON/v1/SubscribersTest.php index 4968639e14..efdb0b6dc6 100644 --- a/tests/integration/API/JSON/v1/SubscribersTest.php +++ b/tests/integration/API/JSON/v1/SubscribersTest.php @@ -102,7 +102,7 @@ class SubscribersTest extends \MailPoetTest { ], ]); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); // setup mailer $this->settings->set('sender', [ 'address' => 'sender@mailpoet.com', diff --git a/tests/integration/API/MP/APITest.php b/tests/integration/API/MP/APITest.php index 92a9e911c8..8df05a1ae2 100644 --- a/tests/integration/API/MP/APITest.php +++ b/tests/integration/API/MP/APITest.php @@ -511,7 +511,7 @@ class APITest extends \MailPoetTest { } function testItSchedulesWelcomeNotificationByDefaultAfterAddingSubscriber() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set('signup_confirmation.enabled', false); $API = Stub::makeEmptyExcept( \MailPoet\API\MP\v1\API::class, @@ -529,7 +529,7 @@ class APITest extends \MailPoetTest { } function testItThrowsIfWelcomeEmailFails() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set('signup_confirmation.enabled', false); $task = ScheduledTask::create(); $task->type = 'sending'; @@ -861,7 +861,7 @@ class APITest extends \MailPoetTest { } function _before() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set('signup_confirmation.enabled', true); } diff --git a/tests/integration/Analytics/AnalyticsTest.php b/tests/integration/Analytics/AnalyticsTest.php index 251a004732..ff36fe2244 100644 --- a/tests/integration/Analytics/AnalyticsTest.php +++ b/tests/integration/Analytics/AnalyticsTest.php @@ -21,7 +21,7 @@ class AnalyticsTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->analytics = new Analytics( new Reporter($this->settings, new WooCommerceHelper()), $this->settings @@ -54,7 +54,7 @@ class AnalyticsTest extends \MailPoetTest { $this ); $this->settings->set('analytics', ['enabled' => '']); - $analytics = new Analytics($reporter, new SettingsController()); + $analytics = new Analytics($reporter, SettingsController::getInstance()); expect($analytics->generateAnalytics())->null(); } @@ -69,7 +69,7 @@ class AnalyticsTest extends \MailPoetTest { ); $this->settings->set('analytics', ['enabled' => '1']); $this->settings->set('analytics_last_sent', Carbon::now()->subHours(1)); - $analytics = new Analytics($reporter, new SettingsController()); + $analytics = new Analytics($reporter, SettingsController::getInstance()); expect($analytics->generateAnalytics())->null(); } @@ -88,7 +88,7 @@ class AnalyticsTest extends \MailPoetTest { $this->settings->set('analytics', ['enabled' => '1']); $this->settings->set('analytics_last_sent', null); - $analytics = new Analytics($reporter, new SettingsController()); + $analytics = new Analytics($reporter, SettingsController::getInstance()); expect($analytics->generateAnalytics())->equals(apply_filters(Analytics::ANALYTICS_FILTER, $data)); } @@ -106,7 +106,7 @@ class AnalyticsTest extends \MailPoetTest { $this->settings->set('analytics', ['enabled' => '1']); $this->settings->set('analytics_last_sent', Carbon::now()->subYear()); - $analytics = new Analytics($reporter, new SettingsController()); + $analytics = new Analytics($reporter, SettingsController::getInstance()); expect($analytics->generateAnalytics())->equals(apply_filters(Analytics::ANALYTICS_FILTER, $data)); } diff --git a/tests/integration/Config/MP2MigratorTest.php b/tests/integration/Config/MP2MigratorTest.php index ecb59693f6..7480ed994e 100644 --- a/tests/integration/Config/MP2MigratorTest.php +++ b/tests/integration/Config/MP2MigratorTest.php @@ -21,7 +21,7 @@ class MP2MigratorTest extends \MailPoetTest { public function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->MP2Migrator = new MP2Migrator($this->settings, ContainerWrapper::getInstance()->get(Activator::class)); } diff --git a/tests/integration/Config/ServicesCheckerTest.php b/tests/integration/Config/ServicesCheckerTest.php index 49d5ab0bca..51e8960fc4 100644 --- a/tests/integration/Config/ServicesCheckerTest.php +++ b/tests/integration/Config/ServicesCheckerTest.php @@ -17,7 +17,7 @@ class ServicesCheckerTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->setMailPoetSendingMethod(); $this->fillPremiumKey(); $this->services_checker = new ServicesChecker(); diff --git a/tests/integration/Cron/CronHelperTest.php b/tests/integration/Cron/CronHelperTest.php index da7070b7bc..6d6f556b50 100644 --- a/tests/integration/Cron/CronHelperTest.php +++ b/tests/integration/Cron/CronHelperTest.php @@ -19,7 +19,7 @@ class CronHelperTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->settings->set('db_version', MAILPOET_VERSION); // Disable cron trigger to not run tasks like migration when pinging the daemon $this->settings->set('cron_trigger', [ diff --git a/tests/integration/Cron/CronTriggerTest.php b/tests/integration/Cron/CronTriggerTest.php index 2c50b448b5..14155debea 100644 --- a/tests/integration/Cron/CronTriggerTest.php +++ b/tests/integration/Cron/CronTriggerTest.php @@ -17,7 +17,7 @@ class CronTriggerTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->cron_trigger = new CronTrigger($this->settings); } diff --git a/tests/integration/Cron/DaemonHttpRunnerTest.php b/tests/integration/Cron/DaemonHttpRunnerTest.php index 60ee1795ec..fdab78f2bf 100644 --- a/tests/integration/Cron/DaemonHttpRunnerTest.php +++ b/tests/integration/Cron/DaemonHttpRunnerTest.php @@ -21,7 +21,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->cron_helper = ContainerWrapper::getInstance()->get(CronHelper::class); } @@ -86,7 +86,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest { 'callSelf' => null, ]); $this->settings->set(CronHelper::DAEMON_SETTING, $data); - $daemon_http_runner->__construct($daemon, $this->cron_helper, new SettingsController()); + $daemon_http_runner->__construct($daemon, $this->cron_helper, SettingsController::getInstance()); $daemon_http_runner->run($data); $updated_daemon = $this->settings->get(CronHelper::DAEMON_SETTING); expect($updated_daemon['last_error'][0]['message'])->equals('Message'); @@ -107,7 +107,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest { 'token' => 123, ]; $this->settings->set(CronHelper::DAEMON_SETTING, $data); - $daemon_http_runner->__construct($daemon, $this->cron_helper, new SettingsController()); + $daemon_http_runner->__construct($daemon, $this->cron_helper, SettingsController::getInstance()); $daemon_http_runner->run($data); } @@ -129,7 +129,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest { 'token' => 123, ]; $this->settings->set(CronHelper::DAEMON_SETTING, $data); - $daemon->__construct(new Daemon($workers_factory_mock, $this->cron_helper), $this->cron_helper, new SettingsController()); + $daemon->__construct(new Daemon($workers_factory_mock, $this->cron_helper), $this->cron_helper, SettingsController::getInstance()); $daemon->run($data); } @@ -153,7 +153,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest { 'token' => 123, ]; $this->settings->set(CronHelper::DAEMON_SETTING, $data); - $daemon->__construct(new Daemon($workers_factory_mock, $this->cron_helper), $this->cron_helper, new SettingsController()); + $daemon->__construct(new Daemon($workers_factory_mock, $this->cron_helper), $this->cron_helper, SettingsController::getInstance()); $daemon->run($data); $data_after_run = $this->settings->get(CronHelper::DAEMON_SETTING); expect($data_after_run['token'])->equals(567); @@ -170,7 +170,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest { 'status' => CronHelper::DAEMON_STATUS_INACTIVE, ]; $this->settings->set(CronHelper::DAEMON_SETTING, $data); - $daemon->__construct($this->makeEmpty(Daemon::class), $this->cron_helper, new SettingsController()); + $daemon->__construct($this->makeEmpty(Daemon::class), $this->cron_helper, SettingsController::getInstance()); $daemon->run($data); } @@ -189,7 +189,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest { $this->settings->set(CronHelper::DAEMON_SETTING, $data); $this->settings->set(CronTrigger::SETTING_NAME . '.method', 'WordPress'); WPFunctions::get()->addFilter('mailpoet_cron_enable_self_deactivation', '__return_true'); - $daemon_http_runner->__construct($daemon, $this->cron_helper, new SettingsController()); + $daemon_http_runner->__construct($daemon, $this->cron_helper, SettingsController::getInstance()); $daemon_http_runner->run($data); WPFunctions::get()->removeAllFilters('mailpoet_cron_enable_self_deactivation'); } @@ -204,7 +204,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest { 'token' => 123, ]; $this->settings->set(CronHelper::DAEMON_SETTING, $data); - $daemon_http_runner->__construct(new Daemon($this->createWorkersFactoryMock(), $this->cron_helper), $this->cron_helper, new SettingsController()); + $daemon_http_runner->__construct(new Daemon($this->createWorkersFactoryMock(), $this->cron_helper), $this->cron_helper, SettingsController::getInstance()); $daemon_http_runner->run($data); $updated_daemon = $this->settings->get(CronHelper::DAEMON_SETTING); expect($updated_daemon['token'])->equals($daemon_http_runner->token); @@ -234,7 +234,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest { ]; $now = time(); $this->settings->set(CronHelper::DAEMON_SETTING, $data); - $daemon_http_runner->__construct($daemon, $this->cron_helper, new SettingsController()); + $daemon_http_runner->__construct($daemon, $this->cron_helper, SettingsController::getInstance()); $daemon_http_runner->run($data); $updated_daemon = $this->settings->get(CronHelper::DAEMON_SETTING); expect($updated_daemon['run_started_at'])->greaterOrEquals($now); @@ -256,7 +256,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest { 'token' => 123, ]; $this->settings->set(CronHelper::DAEMON_SETTING, $data); - $daemon->__construct(new Daemon($this->createWorkersFactoryMock(), $this->cron_helper), $this->cron_helper, new SettingsController()); + $daemon->__construct(new Daemon($this->createWorkersFactoryMock(), $this->cron_helper), $this->cron_helper, SettingsController::getInstance()); $daemon->run($data); expect(ignore_user_abort())->equals(1); } diff --git a/tests/integration/Cron/DaemonTest.php b/tests/integration/Cron/DaemonTest.php index e03ee8d123..0e2dda83af 100644 --- a/tests/integration/Cron/DaemonTest.php +++ b/tests/integration/Cron/DaemonTest.php @@ -18,7 +18,7 @@ class DaemonTest extends \MailPoetTest { public function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->cron_helper = ContainerWrapper::getInstance()->get(CronHelper::class); } diff --git a/tests/integration/Cron/SupervisorTest.php b/tests/integration/Cron/SupervisorTest.php index c3cc552711..ab21a29f72 100644 --- a/tests/integration/Cron/SupervisorTest.php +++ b/tests/integration/Cron/SupervisorTest.php @@ -18,7 +18,7 @@ class SupervisorTest extends \MailPoetTest { // detect any queues to process, it deletes the daemon setting, so Supervisor and // CronHelper's getDaemon() methods do not work. for that matter, we need to set // the trigger setting to anything but 'WordPress'. - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->settings->set('cron_trigger', [ 'method' => 'none', ]); diff --git a/tests/integration/Cron/Triggers/MailPoetTest.php b/tests/integration/Cron/Triggers/MailPoetTest.php index 96e6f1d613..9cda25eae6 100644 --- a/tests/integration/Cron/Triggers/MailPoetTest.php +++ b/tests/integration/Cron/Triggers/MailPoetTest.php @@ -17,7 +17,7 @@ class MailPoetTest extends \MailPoetTest { // detect any queues to process, it deletes the daemon setting, so Supervisor that's // called by the MailPoet cron trigger does not work. for that matter, we need to set // the trigger setting to anything but 'WordPress'. - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->settings->set('cron_trigger', [ 'method' => 'none', ]); diff --git a/tests/integration/Cron/Triggers/WordPressTest.php b/tests/integration/Cron/Triggers/WordPressTest.php index 223b41a652..f3af8eeee6 100644 --- a/tests/integration/Cron/Triggers/WordPressTest.php +++ b/tests/integration/Cron/Triggers/WordPressTest.php @@ -29,7 +29,7 @@ class WordPressTest extends \MailPoetTest { // detect any queues to process, it deletes the daemon setting, so Supervisor that's // called by the MailPoet cron trigger does not work. for that matter, we need to set // the trigger setting to anything but 'WordPress'. - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->settings->set('cron_trigger', [ 'method' => 'none', ]); diff --git a/tests/integration/Cron/Workers/AuthorizedSendingEmailsCheckTest.php b/tests/integration/Cron/Workers/AuthorizedSendingEmailsCheckTest.php index 97f99e027f..998d17c479 100644 --- a/tests/integration/Cron/Workers/AuthorizedSendingEmailsCheckTest.php +++ b/tests/integration/Cron/Workers/AuthorizedSendingEmailsCheckTest.php @@ -15,7 +15,7 @@ class AuthorizedSendingEmailsCheckTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); \ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); } diff --git a/tests/integration/Cron/Workers/BeamerTest.php b/tests/integration/Cron/Workers/BeamerTest.php index 6a10625169..718e470508 100644 --- a/tests/integration/Cron/Workers/BeamerTest.php +++ b/tests/integration/Cron/Workers/BeamerTest.php @@ -13,7 +13,7 @@ class BeamerTest extends \MailPoetTest { function testItSetsLastAnnouncementDate() { $oldDate = '2019-05-18T10:25:00.000Z'; $newDate = '2019-05-22T10:25:00.000Z'; - $settings = new SettingsController; + $settings = SettingsController::getInstance(); $settings->set('last_announcement_date', Carbon::createFromTimeString($oldDate)->getTimestamp()); $wp = Stub::make(new WPFunctions, [ 'wpRemoteGet' => null, @@ -29,7 +29,7 @@ class BeamerTest extends \MailPoetTest { function testItDoesNothingIfNoResponse() { $oldDate = '2019-05-18T10:25:00.000Z'; - $settings = new SettingsController; + $settings = SettingsController::getInstance(); $settings->set('last_announcement_date', Carbon::createFromTimeString($oldDate)->getTimestamp()); $wp = Stub::make(new WPFunctions, [ 'wpRemoteGet' => null, @@ -43,7 +43,7 @@ class BeamerTest extends \MailPoetTest { function testItDoesNothingIfWrongResponse() { $oldDate = '2019-05-18T10:25:00.000Z'; - $settings = new SettingsController; + $settings = SettingsController::getInstance(); $settings->set('last_announcement_date', Carbon::createFromTimeString($oldDate)->getTimestamp()); $wp = Stub::make(new WPFunctions, [ 'wpRemoteGet' => null, @@ -57,7 +57,7 @@ class BeamerTest extends \MailPoetTest { function testItDoesNothingIfEmptyList() { $oldDate = '2019-05-18T10:25:00.000Z'; - $settings = new SettingsController; + $settings = SettingsController::getInstance(); $settings->set('last_announcement_date', Carbon::createFromTimeString($oldDate)->getTimestamp()); $wp = Stub::make(new WPFunctions, [ 'wpRemoteGet' => null, diff --git a/tests/integration/Cron/Workers/BounceTest.php b/tests/integration/Cron/Workers/BounceTest.php index 37dc87bd27..ebd8ce2b0d 100644 --- a/tests/integration/Cron/Workers/BounceTest.php +++ b/tests/integration/Cron/Workers/BounceTest.php @@ -100,7 +100,7 @@ class BounceTest extends \MailPoetTest { } private function setMailPoetSendingMethod() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set( Mailer::MAILER_CONFIG_SETTING_NAME, [ diff --git a/tests/integration/Cron/Workers/InactiveSubscribersTest.php b/tests/integration/Cron/Workers/InactiveSubscribersTest.php index d2d9f44814..92fcde86f8 100644 --- a/tests/integration/Cron/Workers/InactiveSubscribersTest.php +++ b/tests/integration/Cron/Workers/InactiveSubscribersTest.php @@ -17,7 +17,7 @@ class InactiveSubscribersTest extends \MailPoetTest { private $settings; function _before() { - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); \ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table); $this->settings->set('tracking.enabled', true); $this->cron_helper = ContainerWrapper::getInstance()->get(CronHelper::class); diff --git a/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php b/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php index d93fa75cbb..f3ed12c8df 100644 --- a/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php @@ -15,7 +15,7 @@ class PremiumKeyCheckTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->premium_key = '123457890abcdef'; $this->worker = new PremiumKeyCheck($this->settings, microtime(true)); } diff --git a/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php b/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php index b74d5540de..f1686f13d3 100644 --- a/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php @@ -48,7 +48,7 @@ class SendingServiceKeyCheckTest extends \MailPoetTest { } private function setMailPoetSendingMethod() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set( Mailer::MAILER_CONFIG_SETTING_NAME, [ diff --git a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php index b894960e98..40eccf5ab1 100644 --- a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php @@ -58,7 +58,7 @@ class SendingQueueTest extends \MailPoetTest { parent::_before(); $wp_users = get_users(); wp_set_current_user($wp_users[0]->ID); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $referral_detector = new ReferralDetector(WPFunctions::get(), $this->settings); $features_controller = Stub::makeEmpty(FeaturesController::class); $wc_transactional_emails = new TransactionalEmails(WPFunctions::get(), $this->settings); diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php index 6743ed13c6..0aa9f4c909 100644 --- a/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php @@ -27,7 +27,7 @@ class MailerTest extends \MailPoetTest { parent::_before(); $wp_users = get_users(); wp_set_current_user($wp_users[0]->ID); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $referral_detector = new ReferralDetector(WPFunctions::get(), $this->settings); $features_controller = Stub::makeEmpty(FeaturesController::class); $wc_transactional_emails = new TransactionalEmails(WPFunctions::get(), $this->settings); diff --git a/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php b/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php index 14375136e7..c9abf367d7 100644 --- a/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php +++ b/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php @@ -42,7 +42,7 @@ class AutomatedEmailsTest extends \MailPoetTest { ]); $this->mailer = $this->createMock(Mailer::class); $this->renderer = $this->createMock(Renderer::class); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->stats_notifications = new AutomatedEmails( $this->mailer, $this->renderer, diff --git a/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php b/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php index eebb5858d0..c850e44eef 100644 --- a/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php +++ b/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php @@ -59,7 +59,7 @@ class WorkerTest extends \MailPoetTest { $this->repository->truncate(); $this->mailer = $this->createMock(Mailer::class); $this->renderer = $this->createMock(Renderer::class); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->cron_helper = ContainerWrapper::getInstance()->get(CronHelper::class); $this->stats_notifications = new Worker( $this->mailer, diff --git a/tests/integration/Helpscout/BeaconTest.php b/tests/integration/Helpscout/BeaconTest.php index bff060f384..0e20971000 100644 --- a/tests/integration/Helpscout/BeaconTest.php +++ b/tests/integration/Helpscout/BeaconTest.php @@ -30,7 +30,7 @@ class BeaconTest extends \MailPoetTest { ]); $this->beacon_data = $this->di_container->get(Beacon::class)->getData(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function testItReturnsPhpVersion() { diff --git a/tests/integration/Mailer/MailerLogTest.php b/tests/integration/Mailer/MailerLogTest.php index 074762e576..89fb4c3759 100644 --- a/tests/integration/Mailer/MailerLogTest.php +++ b/tests/integration/Mailer/MailerLogTest.php @@ -14,7 +14,7 @@ class MailerLogTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function testItGetsMailerLogWhenOneExists() { diff --git a/tests/integration/Mailer/MailerTest.php b/tests/integration/Mailer/MailerTest.php index 7a4c693fc5..4aea75339b 100644 --- a/tests/integration/Mailer/MailerTest.php +++ b/tests/integration/Mailer/MailerTest.php @@ -64,7 +64,7 @@ class MailerTest extends \MailPoetTest { 'text' => 'TEXT body', ], ]; - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function testItRequiresMailerMethod() { diff --git a/tests/integration/Models/FormTest.php b/tests/integration/Models/FormTest.php index 2494f177cf..4a6f6648a4 100644 --- a/tests/integration/Models/FormTest.php +++ b/tests/integration/Models/FormTest.php @@ -11,7 +11,7 @@ class FormTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->form = Form::createOrUpdate([ 'name' => 'My Form', ]); diff --git a/tests/integration/Models/SettingTest.php b/tests/integration/Models/SettingTest.php index 6884814c4f..a7278a408c 100644 --- a/tests/integration/Models/SettingTest.php +++ b/tests/integration/Models/SettingTest.php @@ -63,13 +63,13 @@ class SettingTest extends \MailPoetTest { } function testSaveDefaultSenderIfNeededNotSaveEmptyValue() { - $settings_controller = new SettingsController(); + $settings_controller = SettingsController::getInstance(); Setting::saveDefaultSenderIfNeeded('', null); expect($settings_controller->get('sender'))->null(); } function testSaveDefaultSenderIfNeededDoesntOverride() { - $settings_controller = new SettingsController(); + $settings_controller = SettingsController::getInstance(); $settings_controller->set('sender', ['name' => 'sender1', 'address' => 'sender1address']); Setting::saveDefaultSenderIfNeeded('sender2address', 'sender1'); $settings = $settings_controller->get('sender'); @@ -78,7 +78,7 @@ class SettingTest extends \MailPoetTest { } function testSaveDefaultSenderIfNeeded() { - $settings_controller = new SettingsController(); + $settings_controller = SettingsController::getInstance(); Setting::saveDefaultSenderIfNeeded('senderAddress', 'sender'); $settings = $settings_controller->get('sender'); expect($settings['name'])->equals('sender'); diff --git a/tests/integration/Models/SubscriberTest.php b/tests/integration/Models/SubscriberTest.php index e9cf4ccaf0..8935f63724 100644 --- a/tests/integration/Models/SubscriberTest.php +++ b/tests/integration/Models/SubscriberTest.php @@ -35,7 +35,7 @@ class SubscriberTest extends \MailPoetTest { $this->subscriber = Subscriber::create(); $this->subscriber->hydrate($this->test_data); $this->saved = $this->subscriber->save(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->settings->set('sender', [ 'name' => 'John Doe', 'address' => 'john.doe@example.com', diff --git a/tests/integration/Newsletter/ShortcodesTest.php b/tests/integration/Newsletter/ShortcodesTest.php index 6466e573cf..160c635ca3 100644 --- a/tests/integration/Newsletter/ShortcodesTest.php +++ b/tests/integration/Newsletter/ShortcodesTest.php @@ -33,7 +33,7 @@ class ShortcodesTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $referral_detector = new ReferralDetector(WPFunctions::get(), $this->settings); $features_controller = Stub::makeEmpty(FeaturesController::class); $wc_transactional_emails = new TransactionalEmails(WPFunctions::get(), $this->settings); diff --git a/tests/integration/Newsletter/ViewInBrowserTest.php b/tests/integration/Newsletter/ViewInBrowserTest.php index 8a479bf97b..13dce9dd97 100644 --- a/tests/integration/Newsletter/ViewInBrowserTest.php +++ b/tests/integration/Newsletter/ViewInBrowserTest.php @@ -136,7 +136,7 @@ class ViewInBrowserTest extends \MailPoetTest { } function testItConvertsShortcodes() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set('tracking.enabled', false); $rendered_body = $this->view_in_browser->renderNewsletter( $this->newsletter, @@ -149,7 +149,7 @@ class ViewInBrowserTest extends \MailPoetTest { } function testItRewritesLinksToRouterEndpointWhenTrackingIsEnabled() { - $settings = new SettingsController(); + $settings = SettingsController::getInstance(); $settings->set('tracking.enabled', true); $view_in_browser = new ViewInBrowser($this->emoji, true); $queue = $this->queue; diff --git a/tests/integration/Referrals/UrlDecoratorTest.php b/tests/integration/Referrals/UrlDecoratorTest.php index bf1e20d362..7851cc2d41 100644 --- a/tests/integration/Referrals/UrlDecoratorTest.php +++ b/tests/integration/Referrals/UrlDecoratorTest.php @@ -16,7 +16,7 @@ class UrlDecoratorTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->url_decorator = new UrlDecorator(WPFunctions::get(), $this->settings); } diff --git a/tests/integration/Router/Endpoints/TrackTest.php b/tests/integration/Router/Endpoints/TrackTest.php index fe275425d6..c989d1c39a 100644 --- a/tests/integration/Router/Endpoints/TrackTest.php +++ b/tests/integration/Router/Endpoints/TrackTest.php @@ -54,7 +54,7 @@ class TrackTest extends \MailPoetTest { 'preview' => false, ]; // instantiate class - $this->track = new Track(new Clicks(new SettingsController(), new Cookies()), new Opens(), new LinkTokens()); + $this->track = new Track(new Clicks(SettingsController::getInstance(), new Cookies()), new Opens(), new LinkTokens()); } function testItReturnsFalseWhenTrackDataIsMissing() { diff --git a/tests/integration/Router/Endpoints/ViewInBrowserTest.php b/tests/integration/Router/Endpoints/ViewInBrowserTest.php index 080a1222d1..12807daea7 100644 --- a/tests/integration/Router/Endpoints/ViewInBrowserTest.php +++ b/tests/integration/Router/Endpoints/ViewInBrowserTest.php @@ -45,7 +45,7 @@ class ViewInBrowserTest extends \MailPoetTest { 'preview' => false, ]; // instantiate class - $this->view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), new SettingsController(), new LinkTokens(), new Emoji()); + $this->view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji()); } function testItAbortsWhenBrowserPreviewDataIsMissing() { @@ -155,12 +155,12 @@ class ViewInBrowserTest extends \MailPoetTest { $wp_user = wp_set_current_user(0); // when WP user does not have 'manage options' permission, false should be returned $wp_user->remove_role('administrator'); - $view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), new SettingsController(), new LinkTokens(), new Emoji()); + $view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji()); expect($view_in_browser->_validateBrowserPreviewData($data))->false(); // when WP has 'manage options' permission, data should be returned $wp_user->add_role('administrator'); - $view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), new SettingsController(), new LinkTokens(), new Emoji()); + $view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji()); expect($view_in_browser->_validateBrowserPreviewData($data))->equals($data); } @@ -176,7 +176,7 @@ class ViewInBrowserTest extends \MailPoetTest { ); $data->preview = true; wp_set_current_user(1); - $view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), new SettingsController(), new LinkTokens(), new Emoji()); + $view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji()); $result = $view_in_browser->_validateBrowserPreviewData($data); expect($result->subscriber->id)->equals(1); } @@ -211,7 +211,7 @@ class ViewInBrowserTest extends \MailPoetTest { $view_in_browser = Stub::make($this->view_in_browser, [ 'link_tokens' => new LinkTokens, '_displayNewsletter' => Expected::exactly(1), - 'settings' => new SettingsController(), + 'settings' => SettingsController::getInstance(), 'emoji' => new Emoji(), ], $this); $view_in_browser->view($this->browser_preview_data); diff --git a/tests/integration/Services/AuthorizedEmailsControllerTest.php b/tests/integration/Services/AuthorizedEmailsControllerTest.php index 529d09b742..8f9a18b243 100644 --- a/tests/integration/Services/AuthorizedEmailsControllerTest.php +++ b/tests/integration/Services/AuthorizedEmailsControllerTest.php @@ -20,7 +20,7 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function testItResetsAuthorisedEmailsErrorIfMssIsNotActive() { diff --git a/tests/integration/Services/BridgeTest.php b/tests/integration/Services/BridgeTest.php index 276ae2b1b8..ea624ce396 100644 --- a/tests/integration/Services/BridgeTest.php +++ b/tests/integration/Services/BridgeTest.php @@ -36,7 +36,7 @@ class BridgeTest extends \MailPoetTest { $this->bridge = new Bridge(); $this->bridge->api = new MockAPI('key'); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function testItChecksIfCurrentSendingMethodIsMailpoet() { diff --git a/tests/integration/Settings/SettingsControllerTest.php b/tests/integration/Settings/SettingsControllerTest.php index e32ca02583..f2aeaccd9d 100644 --- a/tests/integration/Settings/SettingsControllerTest.php +++ b/tests/integration/Settings/SettingsControllerTest.php @@ -13,7 +13,7 @@ class SettingsControllerTest extends \MailPoetTest { function _before() { parent::_before(); - $this->controller = new SettingsController(); + $this->controller = SettingsController::getInstance(); } function testItReturnsStoredValue() { diff --git a/tests/integration/Subscribers/ConfirmationEmailMailerTest.php b/tests/integration/Subscribers/ConfirmationEmailMailerTest.php index 1d5eb05454..09a7505b31 100644 --- a/tests/integration/Subscribers/ConfirmationEmailMailerTest.php +++ b/tests/integration/Subscribers/ConfirmationEmailMailerTest.php @@ -90,7 +90,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest { 'send' => Stub\Expected::never(), ]); - $settings = new SettingsController; + $settings = SettingsController::getInstance(); $settings->set(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, ['invalid_sender_address' => 'email@email.com']); $settings->set(Mailer::MAILER_CONFIG_SETTING_NAME, ['method' => Mailer::METHOD_MAILPOET]); $sender = new ConfirmationEmailMailer($mailer); diff --git a/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php b/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php index 885b688245..1a973449a7 100644 --- a/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php +++ b/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php @@ -27,7 +27,7 @@ class NewSubscriberNotificationMailerTest extends \MailPoetTest { $this->segments = [Segment::create(), Segment::create()]; $this->segments[0]->name = 'List1'; $this->segments[1]->name = 'List2'; - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); } function testItDoesNotSendIfNoSettings() { diff --git a/tests/integration/Subscribers/SubscriberActionsTest.php b/tests/integration/Subscribers/SubscriberActionsTest.php index a88adcdea1..be8b3889b0 100644 --- a/tests/integration/Subscribers/SubscriberActionsTest.php +++ b/tests/integration/Subscribers/SubscriberActionsTest.php @@ -33,7 +33,7 @@ class SubscriberActionsTest extends \MailPoetTest { 'email' => 'john@mailpoet.com', ]; $this->subscriber_actions = ContainerWrapper::getInstance()->get(SubscriberActions::class); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->settings->set('sender', [ 'name' => 'John Doe', 'address' => 'john.doe@example.com', diff --git a/tests/integration/Subscription/FormTest.php b/tests/integration/Subscription/FormTest.php index be5b156072..2078465801 100644 --- a/tests/integration/Subscription/FormTest.php +++ b/tests/integration/Subscription/FormTest.php @@ -24,7 +24,7 @@ class FormTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->settings->set('sender', [ 'name' => 'John Doe', 'address' => 'john.doe@example.com', diff --git a/tests/integration/Subscription/UrlTest.php b/tests/integration/Subscription/UrlTest.php index ada26d634d..eab84e2687 100644 --- a/tests/integration/Subscription/UrlTest.php +++ b/tests/integration/Subscription/UrlTest.php @@ -26,7 +26,7 @@ class UrlTest extends \MailPoetTest { function _before() { parent::_before(); - $this->settings = new SettingsController; + $this->settings = SettingsController::getInstance(); $referral_detector = new ReferralDetector(WPFunctions::get(), $this->settings); $features_controller = Stub::makeEmpty(FeaturesController::class); $wc_transactional_emails = new TransactionalEmails(WPFunctions::get(), $this->settings); diff --git a/tests/integration/Util/Notices/InactiveSubscribersNoticeTest.php b/tests/integration/Util/Notices/InactiveSubscribersNoticeTest.php index 06352d6472..175d4535bd 100644 --- a/tests/integration/Util/Notices/InactiveSubscribersNoticeTest.php +++ b/tests/integration/Util/Notices/InactiveSubscribersNoticeTest.php @@ -13,7 +13,7 @@ class InactiveSubscribersNoticeTest extends \MailPoetTest { function testItDisplays() { $this->createSubscribers(50); - $notice = new InactiveSubscribersNotice(new SettingsController(), new WPFunctions()); + $notice = new InactiveSubscribersNotice(SettingsController::getInstance(), new WPFunctions()); $result = $notice->init(true); expect($result)->contains('Good news! MailPoet won’t send emails to your 50 inactive subscribers.'); expect($result)->contains('https://kb.mailpoet.com/article/264-inactive-subscribers'); @@ -23,7 +23,7 @@ class InactiveSubscribersNoticeTest extends \MailPoetTest { function testItDoesntDisplayWhenDisabled() { $this->createSubscribers(50); - $notice = new InactiveSubscribersNotice(new SettingsController(), new WPFunctions()); + $notice = new InactiveSubscribersNotice(SettingsController::getInstance(), new WPFunctions()); $notice->disable(); $result = $notice->init(true); expect($result)->null(); @@ -35,7 +35,7 @@ class InactiveSubscribersNoticeTest extends \MailPoetTest { $settings_factory = new Settings(); $settings_factory->withDeactivateSubscriberAfter3Months(); - $notice = new InactiveSubscribersNotice(new SettingsController(), new WPFunctions()); + $notice = new InactiveSubscribersNotice(SettingsController::getInstance(), new WPFunctions()); $result = $notice->init(true); expect($result)->null(); } @@ -43,7 +43,7 @@ class InactiveSubscribersNoticeTest extends \MailPoetTest { function testItDoesntDisplayWhenNotEnoughInactiveSubscribers() { $this->createSubscribers(49); - $notice = new InactiveSubscribersNotice(new SettingsController(), new WPFunctions()); + $notice = new InactiveSubscribersNotice(SettingsController::getInstance(), new WPFunctions()); $result = $notice->init(true); expect($result)->null(); } diff --git a/tests/integration/WooCommerce/SubscriptionTest.php b/tests/integration/WooCommerce/SubscriptionTest.php index 525cee92a1..2cdb28b17d 100644 --- a/tests/integration/WooCommerce/SubscriptionTest.php +++ b/tests/integration/WooCommerce/SubscriptionTest.php @@ -30,7 +30,7 @@ class SubscriptionTest extends \MailPoetTest { function _before() { $this->order_id = 123; // dummy $this->subscription = ContainerWrapper::getInstance()->get(Subscription::class); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->wc_segment = Segment::getWooCommerceSegment(); $subscriber = Subscriber::create(); diff --git a/tests/integration/WooCommerce/TransactionalEmailsTest.php b/tests/integration/WooCommerce/TransactionalEmailsTest.php index 715ca98ee1..b84264ee03 100644 --- a/tests/integration/WooCommerce/TransactionalEmailsTest.php +++ b/tests/integration/WooCommerce/TransactionalEmailsTest.php @@ -22,7 +22,7 @@ class TransactionalEmailsTest extends \MailPoetTest { function _before() { $this->wp = new WPFunctions(); - $this->settings = new SettingsController(); + $this->settings = SettingsController::getInstance(); $this->original_wc_settings = $this->settings->get('woocommerce'); $this->transactional_emails = new TransactionalEmails($this->wp, $this->settings); } diff --git a/tests/integration/_bootstrap.php b/tests/integration/_bootstrap.php index 4b58097e61..494db6951d 100644 --- a/tests/integration/_bootstrap.php +++ b/tests/integration/_bootstrap.php @@ -1,6 +1,7 @@ set('db_version', \MailPoet\Config\Env::$version); $cacheDir = '/tmp';