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

Remove no longer used class parameter

Browse Source
This commit is contained in:
Mustapha Hadid
2024-09-26 20:25:28 +01:00
committed by Aschepikov
parent 73e8ad717d
commit 8f95229288
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mailpoet/lib/API/JSON/v1/Mailer.php
View File

@@ -10,7 +10,6 @@ use MailPoet\Mailer\MailerLog;
use MailPoet\Mailer\MetaInfo; use MailPoet\Mailer\MetaInfo;
use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\AuthorizedSenderDomainController; use MailPoet\Services\AuthorizedSenderDomainController;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
class Mailer extends APIEndpoint { class Mailer extends APIEndpoint {
@@ -18,9 +17,6 @@ class Mailer extends APIEndpoint {
/** @var AuthorizedEmailsController */ /** @var AuthorizedEmailsController */
private $authorizedEmailsController; private $authorizedEmailsController;
/** @var Bridge */
private $bridge;
/** @var SettingsController */ /** @var SettingsController */
private $settings; private $settings;
@@ -40,14 +36,12 @@ class Mailer extends APIEndpoint {
public function __construct( public function __construct(
AuthorizedEmailsController $authorizedEmailsController, AuthorizedEmailsController $authorizedEmailsController,
SettingsController $settings, SettingsController $settings,
Bridge $bridge,
MailerFactory $mailerFactory, MailerFactory $mailerFactory,
MetaInfo $mailerMetaInfo, MetaInfo $mailerMetaInfo,
AuthorizedSenderDomainController $senderDomainController AuthorizedSenderDomainController $senderDomainController
) { ) {
$this->authorizedEmailsController = $authorizedEmailsController; $this->authorizedEmailsController = $authorizedEmailsController;
$this->settings = $settings; $this->settings = $settings;
$this->bridge = $bridge;
$this->mailerFactory = $mailerFactory; $this->mailerFactory = $mailerFactory;
$this->mailerMetaInfo = $mailerMetaInfo; $this->mailerMetaInfo = $mailerMetaInfo;
$this->senderDomainController = $senderDomainController; $this->senderDomainController = $senderDomainController;

7
mailpoet/tests/integration/API/JSON/v1/MailerTest.php
View File

@@ -10,7 +10,6 @@ use MailPoet\Mailer\MailerLog;
use MailPoet\Mailer\MetaInfo; use MailPoet\Mailer\MetaInfo;
use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\AuthorizedEmailsController;
use MailPoet\Services\AuthorizedSenderDomainController; use MailPoet\Services\AuthorizedSenderDomainController;
use MailPoet\Services\Bridge;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
class MailerTest extends \MailPoetTest { class MailerTest extends \MailPoetTest {
@@ -25,8 +24,7 @@ class MailerTest extends \MailPoetTest {
$authorizedEmailsController = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::never()]); $authorizedEmailsController = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::never()]);
$senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class); $senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class);
// resumeSending() method should clear the mailer log's status // resumeSending() method should clear the mailer log's status
$bridge = new Bridge($settings); $mailerEndpoint = new Mailer($authorizedEmailsController, $settings, $this->diContainer->get(MailerFactory::class), new MetaInfo, $senderDomainController);
$mailerEndpoint = new Mailer($authorizedEmailsController, $settings, $bridge, $this->diContainer->get(MailerFactory::class), new MetaInfo, $senderDomainController);
$response = $mailerEndpoint->resumeSending(); $response = $mailerEndpoint->resumeSending();
verify($response->status)->equals(APIResponse::STATUS_OK); verify($response->status)->equals(APIResponse::STATUS_OK);
$mailerLog = MailerLog::getMailerLog(); $mailerLog = MailerLog::getMailerLog();
@@ -38,8 +36,7 @@ class MailerTest extends \MailPoetTest {
$settings->set(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, ['invalid_sender_address' => 'a@b.c']); $settings->set(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, ['invalid_sender_address' => 'a@b.c']);
$authorizedEmailsController = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::once()]); $authorizedEmailsController = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::once()]);
$senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class); $senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class);
$bridge = new Bridge($settings); $mailerEndpoint = new Mailer($authorizedEmailsController, $settings, $this->diContainer->get(MailerFactory::class), new MetaInfo, $senderDomainController);
$mailerEndpoint = new Mailer($authorizedEmailsController, $settings, $bridge, $this->diContainer->get(MailerFactory::class), new MetaInfo, $senderDomainController);
$mailerEndpoint->resumeSending(); $mailerEndpoint->resumeSending();
} }
} }