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

Refactor sending task variable name and add typehint

Browse Source 
[MAILPOET-1154]
This commit is contained in:
Rostislav Wolny
2018-08-29 15:29:20 +02:00
parent 8a2e9d2170
commit 8cf5d17cfd
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Cron/Workers/SendingQueue/SendingQueue.php
View File

@ -153,7 +153,7 @@ class SendingQueue {
}
function sendNewsletters(
$queue, $prepared_subscribers_ids, $prepared_newsletters,
SendingTask $sending_task, $prepared_subscribers_ids, $prepared_newsletters,
$prepared_subscribers, $statistics, $extra_params = array()
) {
// send newsletter
@ -171,10 +171,10 @@ class SendingQueue {
}
}
// update processed/to process list
if(!$queue->updateProcessedSubscribers($prepared_subscribers_ids)) {
if(!$sending_task->updateProcessedSubscribers($prepared_subscribers_ids)) {
MailerLog::processError(
'processed_list_update',
sprintf('QUEUE-%d-PROCESSED-LIST-UPDATE', $queue->id),
sprintf('QUEUE-%d-PROCESSED-LIST-UPDATE', $sending_task->id),
null,
true
);
@ -184,10 +184,10 @@ class SendingQueue {
// update the sent count
$this->mailer_task->updateSentCount();
// enforce execution limits if queue is still being processed
if($queue->status !== ScheduledTaskModel::STATUS_COMPLETED) {
if($sending_task->status !== ScheduledTaskModel::STATUS_COMPLETED) {
$this->enforceSendingAndExecutionLimits();
}
return $queue;
return $sending_task;
}
function enforceSendingAndExecutionLimits() {

6
tests/unit/Cron/Workers/SendingQueue/SendingQueueTest.php
View File

@ -573,10 +573,10 @@ class SendingQueueTest extends \MailPoetTest {
}
function testItPausesSendingWhenProcessedSubscriberListCannotBeUpdated() {
$queue = Mock::double(new \stdClass(), array(
$sending_task = Mock::double(SendingTask::create(), array(
'updateProcessedSubscribers' => false
));
$queue->id = 100;
$sending_task->id = 100;
$sending_queue_worker = Stub::make(new SendingQueueWorker());
$sending_queue_worker->__construct(
$timer = false,
@ -589,7 +589,7 @@ class SendingQueueTest extends \MailPoetTest {
);
try {
$sending_queue_worker->sendNewsletters(
$queue,
$sending_task->getObject(),
$prepared_subscribers = array(),
$prepared_newsletters = false,
$prepared_subscribers = false,