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

Remove unused property Daemon::featureSwitch

Browse Source 
This property became obsolete after
074d1ae07cbeaffffeb9c80fb83b32f548b5de97.

[MAILPOET-3859]
This commit is contained in:
Rodrigo Primo
2021-11-24 10:55:11 -03:00
committed by Veljko V
parent 84209851e2
commit 6bea3873b5
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Cron/Daemon.php
View File

@@ -3,7 +3,6 @@
namespace MailPoet\Cron; namespace MailPoet\Cron;
use MailPoet\Cron\Workers\WorkersFactory; use MailPoet\Cron\Workers\WorkersFactory;
use MailPoet\Features\FeaturesController;
class Daemon { class Daemon {
public $timer; public $timer;
@@ -17,19 +16,14 @@ class Daemon {
/** @var WorkersFactory */ /** @var WorkersFactory */
private $workersFactory; private $workersFactory;
/** @var FeaturesController */
private $featureSwitch;
public function __construct( public function __construct(
CronHelper $cronHelper, CronHelper $cronHelper,
CronWorkerRunner $cronWorkerRunner, CronWorkerRunner $cronWorkerRunner,
FeaturesController $featureSwitch,
WorkersFactory $workersFactory WorkersFactory $workersFactory
) { ) {
$this->timer = microtime(true); $this->timer = microtime(true);
$this->workersFactory = $workersFactory; $this->workersFactory = $workersFactory;
$this->cronWorkerRunner = $cronWorkerRunner; $this->cronWorkerRunner = $cronWorkerRunner;
$this->featureSwitch = $featureSwitch;
$this->cronHelper = $cronHelper; $this->cronHelper = $cronHelper;
} }

9
tests/integration/Cron/DaemonHttpRunnerTest.php
View File

@@ -11,7 +11,6 @@ use MailPoet\Cron\DaemonHttpRunner;
use MailPoet\Cron\Triggers\WordPress; use MailPoet\Cron\Triggers\WordPress;
use MailPoet\Cron\Workers\SimpleWorker; use MailPoet\Cron\Workers\SimpleWorker;
use MailPoet\Cron\Workers\WorkersFactory; use MailPoet\Cron\Workers\WorkersFactory;
use MailPoet\Features\FeaturesController;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository; use MailPoet\Settings\SettingsRepository;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
@@ -80,7 +79,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
->method('run') ->method('run')
->willThrowException(new \Exception()); ->willThrowException(new \Exception());
$daemon = new Daemon($this->cronHelper, $cronWorkerRunnerMock, $this->diContainer->get(FeaturesController::class), $this->createWorkersFactoryMock()); $daemon = new Daemon($this->cronHelper, $cronWorkerRunnerMock, $this->createWorkersFactoryMock());
$daemonHttpRunner = $this->make(DaemonHttpRunner::class, [ $daemonHttpRunner = $this->make(DaemonHttpRunner::class, [
'pauseExecution' => null, 'pauseExecution' => null,
'callSelf' => null, 'callSelf' => null,
@@ -206,7 +205,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
$cronWorkerRunner = $this->make(CronWorkerRunner::class, [ $cronWorkerRunner = $this->make(CronWorkerRunner::class, [
'run' => null, 'run' => null,
]); ]);
$daemon = new Daemon($this->cronHelper, $cronWorkerRunner, $this->diContainer->get(FeaturesController::class), $this->createWorkersFactoryMock()); $daemon = new Daemon($this->cronHelper, $cronWorkerRunner, $this->createWorkersFactoryMock());
$daemonHttpRunner->__construct($daemon, $this->cronHelper, SettingsController::getInstance(), $this->diContainer->get(WordPress::class)); $daemonHttpRunner->__construct($daemon, $this->cronHelper, SettingsController::getInstance(), $this->diContainer->get(WordPress::class));
$daemonHttpRunner->run($data); $daemonHttpRunner->run($data);
$updatedDaemon = $this->settings->get(CronHelper::DAEMON_SETTING); $updatedDaemon = $this->settings->get(CronHelper::DAEMON_SETTING);
@@ -226,7 +225,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
->method('run') ->method('run')
->willThrowException(new \Exception()); ->willThrowException(new \Exception());
$daemon = new Daemon($this->cronHelper, $cronWorkerRunnerMock, $this->diContainer->get(FeaturesController::class), $this->createWorkersFactoryMock()); $daemon = new Daemon($this->cronHelper, $cronWorkerRunnerMock, $this->createWorkersFactoryMock());
$daemonHttpRunner = $this->make(DaemonHttpRunner::class, [ $daemonHttpRunner = $this->make(DaemonHttpRunner::class, [
'pauseExecution' => null, 'pauseExecution' => null,
'callSelf' => null, 'callSelf' => null,
@@ -262,7 +261,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
$cronWorkerRunnerMock = $this->make(CronWorkerRunner::class, [ $cronWorkerRunnerMock = $this->make(CronWorkerRunner::class, [
'run' => null, 'run' => null,
]); ]);
$daemon = new Daemon($this->cronHelper, $cronWorkerRunnerMock, $this->diContainer->get(FeaturesController::class), $this->createWorkersFactoryMock()); $daemon = new Daemon($this->cronHelper, $cronWorkerRunnerMock, $this->createWorkersFactoryMock());
$daemonHttpRunner->__construct($daemon, $this->cronHelper, SettingsController::getInstance(), $this->diContainer->get(WordPress::class)); $daemonHttpRunner->__construct($daemon, $this->cronHelper, SettingsController::getInstance(), $this->diContainer->get(WordPress::class));
$daemonHttpRunner->run($data); $daemonHttpRunner->run($data);
expect(ignore_user_abort())->equals(true); expect(ignore_user_abort())->equals(true);

3
tests/integration/Cron/DaemonTest.php
View File

@@ -8,7 +8,6 @@ use MailPoet\Cron\CronWorkerRunner;
use MailPoet\Cron\Daemon; use MailPoet\Cron\Daemon;
use MailPoet\Cron\Workers\SimpleWorker; use MailPoet\Cron\Workers\SimpleWorker;
use MailPoet\Cron\Workers\WorkersFactory; use MailPoet\Cron\Workers\WorkersFactory;
use MailPoet\Features\FeaturesController;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Settings\SettingsRepository; use MailPoet\Settings\SettingsRepository;
@@ -32,7 +31,7 @@ class DaemonTest extends \MailPoetTest {
'token' => 123, 'token' => 123,
]; ];
$this->settings->set(CronHelper::DAEMON_SETTING, $data); $this->settings->set(CronHelper::DAEMON_SETTING, $data);
$daemon = new Daemon($this->cronHelper, $cronWorkerRunner, $this->diContainer->get(FeaturesController::class), $this->createWorkersFactoryMock()); $daemon = new Daemon($this->cronHelper, $cronWorkerRunner, $this->createWorkersFactoryMock());
$daemon->run($data); $daemon->run($data);
} }