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

Make limit parameter optional

Browse Source 
Unification function parameters with a similar method from the repository.
[MAILPOET-4367]
This commit is contained in:
Jan Lysý
2022-08-30 10:28:51 +02:00
committed by Aschepikov
parent 1a65e815b4
commit 6989bd9413
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mailpoet/lib/Newsletter/Sending/ScheduledTasksRepository.php
View File

@@ -239,7 +239,7 @@ class ScheduledTasksRepository extends Repository {
/** /**
* @return ScheduledTaskEntity[] * @return ScheduledTaskEntity[]
*/ */
public function findScheduledSendingTasks(int $limit): array { public function findScheduledSendingTasks(?int $limit = null): array {
$now = Carbon::createFromTimestamp($this->wp->currentTime('timestamp')); $now = Carbon::createFromTimestamp($this->wp->currentTime('timestamp'));
return $this->doctrineRepository->createQueryBuilder('st') return $this->doctrineRepository->createQueryBuilder('st')
->select('st') ->select('st')

2
mailpoet/tests/integration/Newsletter/Sending/ScheduledTasksRepositoryTest.php
View File

@@ -198,7 +198,7 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
$task = $this->scheduledTaskFactory->create(SendingQueueWorker::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->addDay()); $task = $this->scheduledTaskFactory->create(SendingQueueWorker::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->addDay());
$this->sendingQueueFactory->create($task); $this->sendingQueueFactory->create($task);
$tasks = $this->repository->findScheduledSendingTasks(5); $tasks = $this->repository->findScheduledSendingTasks();
$this->assertSame($expectedResult, $tasks); $this->assertSame($expectedResult, $tasks);
} }

4
mailpoet/tests/integration/Tasks/SendingTest.php
View File

@@ -157,7 +157,7 @@ class SendingTest extends \MailPoetTest {
$this->sending->status = ScheduledTask::STATUS_SCHEDULED; $this->sending->status = ScheduledTask::STATUS_SCHEDULED;
$this->sending->scheduled_at = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->subHours(1); $this->sending->scheduled_at = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->subHours(1);
$this->sending->save(); $this->sending->save();
$tasks = $this->scheduledTaskRepository->findScheduledSendingTasks(5); $tasks = $this->scheduledTaskRepository->findScheduledSendingTasks();
expect($tasks)->notEmpty(); expect($tasks)->notEmpty();
foreach ($tasks as $task) { foreach ($tasks as $task) {
expect($task)->isInstanceOf(ScheduledTaskEntity::class); expect($task)->isInstanceOf(ScheduledTaskEntity::class);
@@ -181,7 +181,7 @@ class SendingTest extends \MailPoetTest {
public function testItDoesNotGetPaused() { public function testItDoesNotGetPaused() {
$this->_after(); $this->_after();
$this->createNewSendingTask(['status' => ScheduledTask::STATUS_PAUSED]); $this->createNewSendingTask(['status' => ScheduledTask::STATUS_PAUSED]);
expect($this->scheduledTaskRepository->findScheduledSendingTasks(5))->count(0); expect($this->scheduledTaskRepository->findScheduledSendingTasks())->count(0);
} }
public function testItGetsRunningQueues() { public function testItGetsRunningQueues() {