Add public keyword to methods

[MAILPOET-2413]
This commit is contained in:
Amine Ben hammou
2019-12-26 12:56:49 +01:00
committed by wxa
parent ec409042d5
commit 43df66d162
823 changed files with 4440 additions and 4440 deletions

View File

@@ -29,13 +29,13 @@ class SchedulerTest extends \MailPoetTest {
/** @var LoggerFactory */
private $logger_factory;
function _before() {
public function _before() {
parent::_before();
$this->logger_factory = LoggerFactory::getInstance();
$this->cron_helper = ContainerWrapper::getInstance()->get(CronHelper::class);
}
function testItThrowsExceptionWhenExecutionLimitIsReached() {
public function testItThrowsExceptionWhenExecutionLimitIsReached() {
try {
$scheduler = new Scheduler($this->makeEmpty(SubscribersFinder::class), $this->logger_factory, $this->cron_helper);
$scheduler->process(microtime(true) - $this->cron_helper->getDaemonExecutionLimit());
@@ -45,7 +45,7 @@ class SchedulerTest extends \MailPoetTest {
}
}
function testItCanGetScheduledQueues() {
public function testItCanGetScheduledQueues() {
expect(Scheduler::getScheduledQueues())->isEmpty();
$queue = SendingTask::create();
$queue->newsletter_id = 1;
@@ -55,7 +55,7 @@ class SchedulerTest extends \MailPoetTest {
expect(Scheduler::getScheduledQueues())->notEmpty();
}
function testItCanCreateNotificationHistory() {
public function testItCanCreateNotificationHistory() {
$newsletter = Newsletter::create();
$newsletter->type = Newsletter::TYPE_NOTIFICATION;
$newsletter->save();
@@ -75,7 +75,7 @@ class SchedulerTest extends \MailPoetTest {
expect($notification_history)->notEmpty();
}
function testItCanDeleteQueueWhenDeliveryIsSetToImmediately() {
public function testItCanDeleteQueueWhenDeliveryIsSetToImmediately() {
$newsletter = $this->_createNewsletter();
$newsletter_option_field =
$this->_createNewsletterOptionField('intervalType', Newsletter::TYPE_WELCOME);
@@ -91,7 +91,7 @@ class SchedulerTest extends \MailPoetTest {
expect(SendingQueue::findMany())->count(0);
}
function testItCanRescheduleQueueDeliveryTime() {
public function testItCanRescheduleQueueDeliveryTime() {
$newsletter = $this->_createNewsletter();
$newsletter_option_field =
$this->_createNewsletterOptionField('intervalType', Newsletter::TYPE_WELCOME);
@@ -114,7 +114,7 @@ class SchedulerTest extends \MailPoetTest {
expect($queue->scheduled_at)->notNull();
}
function testItFailsWPSubscriberVerificationWhenSubscriberIsNotAWPUser() {
public function testItFailsWPSubscriberVerificationWhenSubscriberIsNotAWPUser() {
$WP_user = $this->_createOrUpdateWPUser('editor');
$subscriber = $this->_createSubscriber();
$newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
@@ -137,7 +137,7 @@ class SchedulerTest extends \MailPoetTest {
expect(SendingQueue::findMany())->count(0);
}
function testItFailsWPSubscriberVerificationWhenSubscriberRoleDoesNotMatch() {
public function testItFailsWPSubscriberVerificationWhenSubscriberRoleDoesNotMatch() {
$WP_user = $this->_createOrUpdateWPUser('editor');
$subscriber = $this->_createSubscriber($WP_user->ID);
$newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
@@ -161,7 +161,7 @@ class SchedulerTest extends \MailPoetTest {
expect(count(SendingQueue::findMany()))->equals(0);
}
function testItPassesWPSubscriberVerificationWhenSubscriberExistsAndRoleMatches() {
public function testItPassesWPSubscriberVerificationWhenSubscriberExistsAndRoleMatches() {
$WP_user = $this->_createOrUpdateWPUser('author');
$subscriber = $this->_createSubscriber($WP_user->ID);
$newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
@@ -182,7 +182,7 @@ class SchedulerTest extends \MailPoetTest {
expect(count(SendingQueue::findMany()))->greaterOrEquals(1);
}
function testItPassesWPSubscriberVerificationWhenSubscriberHasAnyRole() {
public function testItPassesWPSubscriberVerificationWhenSubscriberHasAnyRole() {
$WP_user = $this->_createOrUpdateWPUser('author');
$subscriber = $this->_createSubscriber($WP_user->ID);
$newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
@@ -203,7 +203,7 @@ class SchedulerTest extends \MailPoetTest {
expect(count(SendingQueue::findMany()))->greaterOrEquals(1);
}
function testItDoesNotProcessWelcomeNewsletterWhenThereAreNoSubscribersToProcess() {
public function testItDoesNotProcessWelcomeNewsletterWhenThereAreNoSubscribersToProcess() {
$newsletter = $this->_createNewsletter();
$queue = $this->_createQueue($newsletter->id);
$queue->setSubscribers([]);
@@ -215,7 +215,7 @@ class SchedulerTest extends \MailPoetTest {
expect(SendingQueue::findMany())->count(0);
}
function testItDoesNotProcessWelcomeNewsletterWhenWPUserCannotBeVerified() {
public function testItDoesNotProcessWelcomeNewsletterWhenWPUserCannotBeVerified() {
$newsletter = $this->_createNewsletter();
$newsletter->event = 'user';
$queue = $this->_createQueue($newsletter->id);
@@ -230,7 +230,7 @@ class SchedulerTest extends \MailPoetTest {
expect($scheduler->processWelcomeNewsletter($newsletter, $queue))->false();
}
function testItDoesNotProcessWelcomeNewsletterWhenSubscriberCannotBeVerified() {
public function testItDoesNotProcessWelcomeNewsletterWhenSubscriberCannotBeVerified() {
$newsletter = $this->_createNewsletter();
$newsletter->event = 'segment';
$queue = $this->_createQueue($newsletter->id);
@@ -245,7 +245,7 @@ class SchedulerTest extends \MailPoetTest {
expect($scheduler->processWelcomeNewsletter($newsletter, $queue))->false();
}
function testItProcessesWelcomeNewsletterWhenSubscriberIsVerified() {
public function testItProcessesWelcomeNewsletterWhenSubscriberIsVerified() {
$newsletter = $this->_createNewsletter();
$newsletter->event = 'segment';
@@ -261,7 +261,7 @@ class SchedulerTest extends \MailPoetTest {
expect($updated_queue->status)->null();
}
function testItProcessesWelcomeNewsletterWhenWPUserIsVerified() {
public function testItProcessesWelcomeNewsletterWhenWPUserIsVerified() {
$newsletter = $this->_createNewsletter();
$newsletter->event = 'user';
@@ -278,7 +278,7 @@ class SchedulerTest extends \MailPoetTest {
expect($updated_queue->status)->null();
}
function testItFailsMailpoetSubscriberVerificationWhenSubscriberDoesNotExist() {
public function testItFailsMailpoetSubscriberVerificationWhenSubscriberDoesNotExist() {
$scheduler = new Scheduler($this->makeEmpty(SubscribersFinder::class), $this->logger_factory, $this->cron_helper);
$newsletter = $this->_createNewsletter();
$queue = $this->_createQueue($newsletter->id);
@@ -290,7 +290,7 @@ class SchedulerTest extends \MailPoetTest {
expect(SendingQueue::findMany())->count(0);
}
function testItFailsMailpoetSubscriberVerificationWhenSubscriberIsNotInSegment() {
public function testItFailsMailpoetSubscriberVerificationWhenSubscriberIsNotInSegment() {
$subscriber = $this->_createSubscriber();
$segment = $this->_createSegment();
$newsletter = $this->_createNewsletter();
@@ -308,7 +308,7 @@ class SchedulerTest extends \MailPoetTest {
expect(SendingQueue::findMany())->count(0);
}
function testItReschedulesQueueDeliveryWhenMailpoetSubscriberHasNotConfirmedSubscription() {
public function testItReschedulesQueueDeliveryWhenMailpoetSubscriberHasNotConfirmedSubscription() {
$current_time = Carbon::createFromTimestamp(current_time('timestamp'));
Carbon::setTestNow($current_time); // mock carbon to return current time
$subscriber = $this->_createSubscriber($wp_user_id = null, 'unconfirmed');
@@ -337,7 +337,7 @@ class SchedulerTest extends \MailPoetTest {
);
}
function testItDoesntRunQueueDeliveryWhenMailpoetSubscriberHasUnsubscribed() {
public function testItDoesntRunQueueDeliveryWhenMailpoetSubscriberHasUnsubscribed() {
$current_time = Carbon::createFromTimestamp(current_time('timestamp'));
Carbon::setTestNow($current_time); // mock carbon to return current time
$subscriber = $this->_createSubscriber($wp_user_id = null, 'unsubscribed');
@@ -362,7 +362,7 @@ class SchedulerTest extends \MailPoetTest {
expect(SendingQueue::findOne($queue->id))->false();
}
function testItCanVerifyMailpoetSubscriber() {
public function testItCanVerifyMailpoetSubscriber() {
$subscriber = $this->_createSubscriber();
$segment = $this->_createSegment();
$subscriber_segment = $this->_createSubscriberSegment($subscriber->id, $segment->id);
@@ -383,7 +383,7 @@ class SchedulerTest extends \MailPoetTest {
expect($result)->true();
}
function testItProcessesScheduledStandardNewsletter() {
public function testItProcessesScheduledStandardNewsletter() {
$subscriber = $this->_createSubscriber();
$segment = $this->_createSegment();
$subscriber_segment = $this->_createSubscriberSegment($subscriber->id, $segment->id);
@@ -413,7 +413,7 @@ class SchedulerTest extends \MailPoetTest {
expect($updated_newsletter->status)->equals(Newsletter::STATUS_SENDING);
}
function testItFailsToProcessPostNotificationNewsletterWhenSegmentsDontExist() {
public function testItFailsToProcessPostNotificationNewsletterWhenSegmentsDontExist() {
$newsletter = $this->_createNewsletter();
$queue = $this->_createQueue($newsletter->id);
@@ -428,7 +428,7 @@ class SchedulerTest extends \MailPoetTest {
expect($scheduler->processPostNotificationNewsletter($newsletter, $queue))->false();
}
function testItFailsToProcessPostNotificationNewsletterWhenSubscribersNotInSegment() {
public function testItFailsToProcessPostNotificationNewsletterWhenSubscribersNotInSegment() {
$newsletter = $this->_createNewsletter();
$queue = $this->_createQueue($newsletter->id);
$segment = $this->_createSegment();
@@ -443,7 +443,7 @@ class SchedulerTest extends \MailPoetTest {
expect($scheduler->processPostNotificationNewsletter($newsletter, $queue))->false();
}
function testItCanProcessPostNotificationNewsletter() {
public function testItCanProcessPostNotificationNewsletter() {
$newsletter = $this->_createNewsletter();
$queue = $this->_createQueue($newsletter->id);
$segment = $this->_createSegment();
@@ -478,12 +478,12 @@ class SchedulerTest extends \MailPoetTest {
expect($updated_notification_history->status)->equals(Newsletter::STATUS_SENDING);
}
function testItFailsToProcessWhenScheduledQueuesNotFound() {
public function testItFailsToProcessWhenScheduledQueuesNotFound() {
$scheduler = new Scheduler($this->makeEmpty(SubscribersFinder::class), $this->logger_factory, $this->cron_helper);
expect($scheduler->process())->false();
}
function testItDeletesQueueDuringProcessingWhenNewsletterNotFound() {
public function testItDeletesQueueDuringProcessingWhenNewsletterNotFound() {
$queue = $this->_createQueue(1);
$queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
$queue->save();
@@ -492,7 +492,7 @@ class SchedulerTest extends \MailPoetTest {
expect(SendingQueue::findMany())->count(0);
}
function testItDeletesQueueDuringProcessingWhenNewsletterIsSoftDeleted() {
public function testItDeletesQueueDuringProcessingWhenNewsletterIsSoftDeleted() {
$newsletter = $this->_createNewsletter();
$newsletter->deleted_at = Carbon::createFromTimestamp(current_time('timestamp'));
$newsletter->save();
@@ -504,7 +504,7 @@ class SchedulerTest extends \MailPoetTest {
expect(SendingQueue::findMany())->count(0);
}
function testItProcessesWelcomeNewsletters() {
public function testItProcessesWelcomeNewsletters() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME);
$queue = $this->_createQueue($newsletter->id);
$queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
@@ -517,7 +517,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler->process();
}
function testItProcessesNotificationNewsletters() {
public function testItProcessesNotificationNewsletters() {
$newsletter = $this->_createNewsletter();
$queue = $this->_createQueue($newsletter->id);
$queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
@@ -530,7 +530,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler->process();
}
function testItProcessesStandardScheduledNewsletters() {
public function testItProcessesStandardScheduledNewsletters() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_STANDARD);
$queue = $this->_createQueue($newsletter->id);
$queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
@@ -543,7 +543,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler->process();
}
function testItEnforcesExecutionLimitDuringProcessing() {
public function testItEnforcesExecutionLimitDuringProcessing() {
$newsletter = $this->_createNewsletter();
$queue = $this->_createQueue($newsletter->id);
$queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
@@ -557,7 +557,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler->process();
}
function testItDoesNotProcessScheduledJobsWhenNewsletterIsNotActive() {
public function testItDoesNotProcessScheduledJobsWhenNewsletterIsNotActive() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_STANDARD, Newsletter::STATUS_DRAFT);
$queue = $this->_createQueue($newsletter->id);
$queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
@@ -572,7 +572,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler->process();
}
function testItProcessesScheduledJobsWhenNewsletterIsActive() {
public function testItProcessesScheduledJobsWhenNewsletterIsActive() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_STANDARD, Newsletter::STATUS_ACTIVE);
$queue = $this->_createQueue($newsletter->id);
$queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
@@ -587,7 +587,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler->process();
}
function testItReSchedulesBounceTask() {
public function testItReSchedulesBounceTask() {
$task = ScheduledTask::createOrUpdate([
'type' => 'bounce',
'status' => ScheduledTask::STATUS_SCHEDULED,
@@ -603,7 +603,7 @@ class SchedulerTest extends \MailPoetTest {
expect($refetched_task->scheduled_at)->lessThan(Carbon::createFromTimestamp(current_time('timestamp'))->addHours(42));
}
function testItDoesNotReSchedulesBounceTaskWhenSoon() {
public function testItDoesNotReSchedulesBounceTaskWhenSoon() {
$task = ScheduledTask::createOrUpdate([
'type' => 'bounce',
'status' => ScheduledTask::STATUS_SCHEDULED,
@@ -619,7 +619,7 @@ class SchedulerTest extends \MailPoetTest {
expect($refetched_task->scheduled_at)->lessThan(Carbon::createFromTimestamp(current_time('timestamp'))->addHours(1));
}
function testItProcessesScheduledJobsWhenNewsletterIsScheduled() {
public function testItProcessesScheduledJobsWhenNewsletterIsScheduled() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_STANDARD, Newsletter::STATUS_SCHEDULED);
$queue = $this->_createQueue($newsletter->id);
$queue->scheduled_at = Carbon::createFromTimestamp(current_time('timestamp'));
@@ -634,7 +634,7 @@ class SchedulerTest extends \MailPoetTest {
$scheduler->process();
}
function testItProcessesScheduledAutomaticEmailWhenSendingToUser() {
public function testItProcessesScheduledAutomaticEmailWhenSendingToUser() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_AUTOMATIC, Newsletter::STATUS_SCHEDULED);
$subscriber = $this->_createSubscriber();
$task = SendingTask::create();
@@ -657,7 +657,7 @@ class SchedulerTest extends \MailPoetTest {
expect($task->status)->null();
}
function testItDeletesScheduledAutomaticEmailWhenUserDoesNotExist() {
public function testItDeletesScheduledAutomaticEmailWhenUserDoesNotExist() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_AUTOMATIC, Newsletter::STATUS_SCHEDULED);
$subscriber = $this->_createSubscriber();
$task = SendingTask::create();
@@ -681,7 +681,7 @@ class SchedulerTest extends \MailPoetTest {
expect($task)->false();
}
function testItProcessesScheduledAutomaticEmailWhenSendingToSegment() {
public function testItProcessesScheduledAutomaticEmailWhenSendingToSegment() {
$newsletter = $this->_createNewsletter(Newsletter::TYPE_AUTOMATIC, Newsletter::STATUS_SCHEDULED);
$segment = $this->_createSegment();
$subscriber = $this->_createSubscriber();
@@ -713,7 +713,7 @@ class SchedulerTest extends \MailPoetTest {
expect($subscribers[0]->id)->equals($subscriber->id);
}
function testItUpdatesUpdateTime() {
public function testItUpdatesUpdateTime() {
$originalUpdated = Carbon::createFromTimestamp(current_time('timestamp'))->subHours(5)->toDateTimeString();
$newsletter = $this->_createNewsletter(Newsletter::TYPE_WELCOME, Newsletter::STATUS_DRAFT);
$queue = $this->_createQueue($newsletter->id);
@@ -727,7 +727,7 @@ class SchedulerTest extends \MailPoetTest {
expect($newQueue->updated_at)->notEquals($originalUpdated);
}
function _createNewsletterSegment($newsletter_id, $segment_id) {
public function _createNewsletterSegment($newsletter_id, $segment_id) {
$newsletter_segment = NewsletterSegment::create();
$newsletter_segment->newsletter_id = $newsletter_id;
$newsletter_segment->segment_id = $segment_id;
@@ -736,7 +736,7 @@ class SchedulerTest extends \MailPoetTest {
return $newsletter_segment;
}
function _createSubscriberSegment($subscriber_id, $segment_id, $status = 'subscribed') {
public function _createSubscriberSegment($subscriber_id, $segment_id, $status = 'subscribed') {
$subscriber_segment = SubscriberSegment::create();
$subscriber_segment->subscriber_id = $subscriber_id;
$subscriber_segment->segment_id = $segment_id;
@@ -746,7 +746,7 @@ class SchedulerTest extends \MailPoetTest {
return $subscriber_segment;
}
function _createSegment() {
public function _createSegment() {
$segment = Segment::create();
$segment->name = 'test';
$segment->type = 'default';
@@ -755,7 +755,7 @@ class SchedulerTest extends \MailPoetTest {
return $segment;
}
function _createSubscriber($wp_user_id = null, $status = 'subscribed') {
public function _createSubscriber($wp_user_id = null, $status = 'subscribed') {
$subscriber = Subscriber::create();
$subscriber->email = 'john@doe.com';
$subscriber->first_name = 'John';
@@ -767,7 +767,7 @@ class SchedulerTest extends \MailPoetTest {
return $subscriber;
}
function _createNewsletter($type = Newsletter::TYPE_NOTIFICATION, $status = 'active') {
public function _createNewsletter($type = Newsletter::TYPE_NOTIFICATION, $status = 'active') {
$newsletter = Newsletter::create();
$newsletter->type = $type;
$newsletter->status = $status;
@@ -776,7 +776,7 @@ class SchedulerTest extends \MailPoetTest {
return $newsletter;
}
function _createNewsletterOptionField($name, $type) {
public function _createNewsletterOptionField($name, $type) {
$newsletter_option_field = NewsletterOptionField::create();
$newsletter_option_field->name = $name;
$newsletter_option_field->newsletter_type = $type;
@@ -785,7 +785,7 @@ class SchedulerTest extends \MailPoetTest {
return $newsletter_option_field;
}
function _createNewsletterOption($option_field_id, $newsletter_id, $value) {
public function _createNewsletterOption($option_field_id, $newsletter_id, $value) {
$newsletter_option = NewsletterOption::create();
$newsletter_option->option_field_id = $option_field_id;
$newsletter_option->newsletter_id = $newsletter_id;
@@ -795,7 +795,7 @@ class SchedulerTest extends \MailPoetTest {
return $newsletter_option;
}
function _createQueue($newsletter_id, $status = SendingQueue::STATUS_SCHEDULED) {
public function _createQueue($newsletter_id, $status = SendingQueue::STATUS_SCHEDULED) {
$queue = SendingTask::create();
$queue->status = $status;
$queue->newsletter_id = $newsletter_id;
@@ -804,7 +804,7 @@ class SchedulerTest extends \MailPoetTest {
return $queue;
}
function _createOrUpdateWPUser($role = null) {
public function _createOrUpdateWPUser($role = null) {
$email = 'test@example.com';
$username = 'phoenix_test_user';
if (email_exists($email) === false) {
@@ -827,7 +827,7 @@ class SchedulerTest extends \MailPoetTest {
return $user;
}
function _after() {
public function _after() {
Carbon::setTestNow();
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
$this->di_container->get(SettingsRepository::class)->truncate();