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

Stop using a deprecated function

Browse Source 
[MAILPOET-3765]
This commit is contained in:
Pavel Dohnal
2021-09-03 11:13:15 +02:00
committed by Veljko V
parent 39e0bd1ad5
commit 6f28228c55
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Cron/Workers/Bounce.php
View File

@@ -27,8 +27,15 @@ class Bounce extends SimpleWorker {
/** @var SettingsController */ /** @var SettingsController */
private $settings; private $settings;
public function __construct(SettingsController $settings) { /** @var Bridge */
private $bridge;
public function __construct(
SettingsController $settings,
Bridge $bridge
) {
$this->settings = $settings; $this->settings = $settings;
$this->bridge = $bridge;
parent::__construct(); parent::__construct();
} }
@@ -39,7 +46,7 @@ class Bounce extends SimpleWorker {
} }
public function checkProcessingRequirements() { public function checkProcessingRequirements() {
return Bridge::isMPSendingServiceEnabled(); return $this->bridge->isMailpoetSendingServiceEnabled();
} }
public function prepareTaskStrategy(ScheduledTask $task, $timer) { public function prepareTaskStrategy(ScheduledTask $task, $timer) {

8
tests/integration/Cron/Workers/BounceTest.php
View File

@@ -8,6 +8,7 @@ use MailPoet\Mailer\Mailer;
use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTask;
use MailPoet\Models\ScheduledTaskSubscriber; use MailPoet\Models\ScheduledTaskSubscriber;
use MailPoet\Models\Subscriber; use MailPoet\Models\Subscriber;
use MailPoet\Services\Bridge;
use MailPoet\Services\Bridge\API; use MailPoet\Services\Bridge\API;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository; use MailPoet\Settings\SettingsRepository;
@@ -36,7 +37,10 @@ class BounceTest extends \MailPoetTest {
]); ]);
} }
$this->worker = new Bounce($this->diContainer->get(SettingsController::class)); $this->worker = new Bounce(
$this->diContainer->get(SettingsController::class),
$this->diContainer->get(Bridge::class)
);
$this->worker->api = new MockAPI(); $this->worker->api = new MockAPI();
} }
@@ -47,7 +51,7 @@ class BounceTest extends \MailPoetTest {
public function testItCanInitializeBridgeAPI() { public function testItCanInitializeBridgeAPI() {
$this->setMailPoetSendingMethod(); $this->setMailPoetSendingMethod();
$worker = new Bounce($this->diContainer->get(SettingsController::class)); $worker = new Bounce($this->diContainer->get(SettingsController::class), $this->diContainer->get(Bridge::class));
$worker->init(); $worker->init();
expect($worker->api instanceof API)->true(); expect($worker->api instanceof API)->true();
} }