Cavemanon/piratepoet
7
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

4
tests/integration/API/JSON/v1/MailerTest.php
View File

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

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

@ -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),

2
tests/integration/API/JSON/v1/SendingQueueTest.php
View File

@ -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',

2
tests/integration/API/JSON/v1/ServicesTest.php
View File

@ -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() {

2
tests/integration/API/JSON/v1/SettingsTest.php
View File

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

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

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

2
tests/integration/API/JSON/v1/SubscribersTest.php
View File

@ -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',