diff --git a/lib/Models/CustomField.php b/lib/Models/CustomField.php index d5d1b42f4d..aba9c22231 100644 --- a/lib/Models/CustomField.php +++ b/lib/Models/CustomField.php @@ -6,6 +6,7 @@ use MailPoet\Form\Block\Date; use MailPoet\WP\Functions as WPFunctions; /** + * @property string $name * @property string $type * @property string|array|null $params */ diff --git a/lib/Models/Model.php b/lib/Models/Model.php index 866a29a307..30d7ef4055 100644 --- a/lib/Models/Model.php +++ b/lib/Models/Model.php @@ -123,6 +123,8 @@ use MailPoet\WP\Functions as WPFunctions; * @property string|null $created_at * @property string|null $updated_at * @property string|null $id + * @property string|null $first + * @property string|null $last */ class Model extends \MailPoetVendor\Sudzy\ValidModel { diff --git a/lib/Models/Newsletter.php b/lib/Models/Newsletter.php index 5abedb35bd..12ee75d510 100644 --- a/lib/Models/Newsletter.php +++ b/lib/Models/Newsletter.php @@ -20,6 +20,7 @@ use function MailPoetVendor\array_column; /** * @property int $id + * @property int $parent_id * @property string $type * @property object|array|boolean $queue * @property string $hash @@ -29,11 +30,13 @@ use function MailPoetVendor\array_column; * @property array $options * @property int $children_count * @property bool|array $statistics + * @property string $sent_at * @property string $deleted_at * @property int $total_sent * @property int $total_scheduled * @property array $segments * @property string $subject + * @property string $preheader * @property string $body * @property string|null $schedule * @property boolean|null $isScheduled diff --git a/lib/Models/NewsletterOptionField.php b/lib/Models/NewsletterOptionField.php index 7ea5734683..4abeb73a69 100644 --- a/lib/Models/NewsletterOptionField.php +++ b/lib/Models/NewsletterOptionField.php @@ -4,6 +4,11 @@ namespace MailPoet\Models; use MailPoet\WP\Functions as WPFunctions; +/** + * @property string $name + * @property string $newsletter_type + */ + class NewsletterOptionField extends Model { public static $_table = MP_NEWSLETTER_OPTION_FIELDS_TABLE; diff --git a/lib/Models/SendingQueue.php b/lib/Models/SendingQueue.php index 156eefe40b..6fbf35d768 100644 --- a/lib/Models/SendingQueue.php +++ b/lib/Models/SendingQueue.php @@ -19,6 +19,7 @@ use MailPoet\WP\Functions as WPFunctions; * @property string|array $subscribers * @property string|null $deleted_at * @property string $scheduled_at + * @property string $status */ class SendingQueue extends Model { diff --git a/lib/Tasks/Sending.php b/lib/Tasks/Sending.php index 6627cd056d..6ed68429ff 100644 --- a/lib/Tasks/Sending.php +++ b/lib/Tasks/Sending.php @@ -16,6 +16,9 @@ use function MailPoetVendor\array_column; * @property int $task_id * @property int $id * @property int $newsletter_id + * @property string $newsletter_rendered_subject + * @property string $newsletter_rendered_body + * @property bool $non_existent_column */ class Sending { const TASK_TYPE = 'sending'; diff --git a/tests/integration/Cron/Workers/SchedulerTest.php b/tests/integration/Cron/Workers/SchedulerTest.php index 9877dec6ed..b01d3c9cab 100644 --- a/tests/integration/Cron/Workers/SchedulerTest.php +++ b/tests/integration/Cron/Workers/SchedulerTest.php @@ -514,7 +514,6 @@ class SchedulerTest extends \MailPoetTest { 'processWelcomeNewsletter' => Expected::exactly(1), 'cron_helper' => $this->cron_helper, ], $this); - $scheduler->timer = microtime(true); $scheduler->process(); } @@ -527,7 +526,6 @@ class SchedulerTest extends \MailPoetTest { 'processPostNotificationNewsletter' => Expected::exactly(1), 'cron_helper' => $this->cron_helper, ], $this); - $scheduler->timer = microtime(true); $scheduler->process(); } @@ -540,7 +538,6 @@ class SchedulerTest extends \MailPoetTest { 'processScheduledStandardNewsletter' => Expected::exactly(1), 'cron_helper' => $this->cron_helper, ], $this); - $scheduler->timer = microtime(true); $scheduler->process(); } @@ -569,7 +566,6 @@ class SchedulerTest extends \MailPoetTest { 'cron_helper' => $this->cron_helper, ], $this); // scheduled job is not processed - $scheduler->timer = microtime(true); $scheduler->process(); } @@ -584,7 +580,6 @@ class SchedulerTest extends \MailPoetTest { 'cron_helper' => $this->cron_helper, ], $this); // scheduled job is processed - $scheduler->timer = microtime(true); $scheduler->process(); } @@ -631,7 +626,6 @@ class SchedulerTest extends \MailPoetTest { 'cron_helper' => $this->cron_helper, ], $this); // scheduled job is processed - $scheduler->timer = microtime(true); $scheduler->process(); } @@ -722,7 +716,6 @@ class SchedulerTest extends \MailPoetTest { $queue->updated_at = $originalUpdated; $queue->save(); $scheduler = new Scheduler($this->makeEmpty(SubscribersFinder::class), $this->logger_factory, $this->cron_helper); - $scheduler->timer = microtime(true); $scheduler->process(); $newQueue = ScheduledTask::findOne($queue->task_id); expect($newQueue->updated_at)->notEquals($originalUpdated); diff --git a/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php b/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php index c72f115915..1d435530e4 100644 --- a/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php @@ -129,7 +129,7 @@ class MigrationTest extends \MailPoetTest { ]); $next_run_date = $this->worker->getNextRunDate($wp); - expect($next_run_date->timestamp)->equals($timestamp); + expect($next_run_date->getTimestamp())->equals($timestamp); } private function createScheduledTask() {