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/Mailer/Mailer.php
View File

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