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

Add check that createdAt is not null

Browse Source 
[MAILPOET-4067]
This commit is contained in:
Jan Lysý
2022-01-19 16:34:19 +01:00
committed by Veljko V
parent 79a40a019c
commit 6a20082782
12 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mailpoet/lib/API/JSON/ResponseBuilders/CustomFieldsResponseBuilder.php
View File

@@ -23,7 +23,7 @@ class CustomFieldsResponseBuilder {
'name' => $customField->getName(),
'type' => $customField->getType(),
'params' => $customField->getParams(),
'created_at' => $customField->getCreatedAt()->format('Y-m-d H:i:s'),
'created_at' => ($createdAt = $customField->getCreatedAt()) ? $createdAt->format('Y-m-d H:i:s') : null,
'updated_at' => $customField->getUpdatedAt()->format('Y-m-d H:i:s'),
];
}

2
mailpoet/lib/API/JSON/ResponseBuilders/FormsResponseBuilder.php
View File

@@ -25,7 +25,7 @@ class FormsResponseBuilder {
'body' => $form->getBody(),
'settings' => $form->getSettings(),
'styles' => $form->getStyles(),
'created_at' => $form->getCreatedAt()->format(self::DATE_FORMAT),
'created_at' => ($createdAt = $form->getCreatedAt()) ? $createdAt->format(self::DATE_FORMAT) : null,
'updated_at' => $form->getUpdatedAt()->format(self::DATE_FORMAT),
'deleted_at' => ($deletedAt = $form->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
];

2
mailpoet/lib/API/JSON/ResponseBuilders/NewsletterTemplatesResponseBuilder.php
View File

@@ -15,7 +15,7 @@ class NewsletterTemplatesResponseBuilder {
'name' => $template->getName(),
'readonly' => $template->getReadonly(),
'body' => $template->getBody(),
'created_at' => $template->getCreatedAt()->format(self::DATE_FORMAT),
'created_at' => ($createdAt = $template->getCreatedAt()) ? $createdAt->format(self::DATE_FORMAT) : null,
'updated_at' => $template->getUpdatedAt()->format(self::DATE_FORMAT),
'newsletter_id' => ($newsletter = $template->getNewsletter()) ? $newsletter->getId() : null,
];

6
mailpoet/lib/API/JSON/ResponseBuilders/NewslettersResponseBuilder.php
View File

@@ -61,7 +61,7 @@ class NewslettersResponseBuilder {
'preheader' => $newsletter->getPreheader(),
'body' => $newsletter->getBody(),
'sent_at' => ($sentAt = $newsletter->getSentAt()) ? $sentAt->format(self::DATE_FORMAT) : null,
'created_at' => $newsletter->getCreatedAt()->format(self::DATE_FORMAT),
'created_at' => ($createdAt = $newsletter->getCreatedAt()) ? $createdAt->format(self::DATE_FORMAT) : null,
'updated_at' => $newsletter->getUpdatedAt()->format(self::DATE_FORMAT),
'deleted_at' => ($deletedAt = $newsletter->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
'parent_id' => ($parent = $newsletter->getParent()) ? $parent->getId() : null,
@@ -204,7 +204,7 @@ class NewslettersResponseBuilder {
'name' => $segment->getName(),
'type' => $segment->getType(),
'description' => $segment->getDescription(),
'created_at' => $segment->getCreatedAt()->format(self::DATE_FORMAT),
'created_at' => ($createdAt = $segment->getCreatedAt()) ? $createdAt->format(self::DATE_FORMAT) : null,
'updated_at' => $segment->getUpdatedAt()->format(self::DATE_FORMAT),
'deleted_at' => ($deletedAt = $segment->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
];
@@ -224,7 +224,7 @@ class NewslettersResponseBuilder {
'priority' => (string)$task->getPriority(), // (string) for BC
'scheduled_at' => ($scheduledAt = $task->getScheduledAt()) ? $scheduledAt->format(self::DATE_FORMAT) : null,
'processed_at' => ($processedAt = $task->getProcessedAt()) ? $processedAt->format(self::DATE_FORMAT) : null,
'created_at' => $queue->getCreatedAt()->format(self::DATE_FORMAT),
'created_at' => ($createdAt = $queue->getCreatedAt()) ? $createdAt->format(self::DATE_FORMAT) : null,
'updated_at' => $queue->getUpdatedAt()->format(self::DATE_FORMAT),
'deleted_at' => ($deletedAt = $queue->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
'meta' => $queue->getMeta(),

2
mailpoet/lib/API/JSON/ResponseBuilders/SegmentsResponseBuilder.php
View File

@@ -29,7 +29,7 @@ class SegmentsResponseBuilder {
'name' => $segment->getName(),
'type' => $segment->getType(),
'description' => $segment->getDescription(),
'created_at' => $segment->getCreatedAt()->format(self::DATE_FORMAT),
'created_at' => ($createdAt = $segment->getCreatedAt()) ? $createdAt->format(self::DATE_FORMAT) : null,
'updated_at' => $segment->getUpdatedAt()->format(self::DATE_FORMAT),
'deleted_at' => ($deletedAt = $segment->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
'average_engagement_score' => $segment->getAverageEngagementScore(),

6
mailpoet/lib/API/JSON/ResponseBuilders/SubscribersResponseBuilder.php
View File

@@ -64,7 +64,7 @@ class SubscribersResponseBuilder {
'count_confirmations' => $subscriber->getConfirmationsCount(),
'wp_user_id' => $subscriber->getWpUserId(),
'is_woocommerce_user' => $subscriber->getIsWoocommerceUser(),
'created_at' => $subscriber->getCreatedAt()->format(self::DATE_FORMAT),
'created_at' => ($createdAt = $subscriber->getCreatedAt()) ? $createdAt->format(self::DATE_FORMAT) : null,
'engagement_score' => $subscriber->getEngagementScore(),
];
}
@@ -80,7 +80,7 @@ class SubscribersResponseBuilder {
'last_name' => $subscriberEntity->getLastName(),
'first_name' => $subscriberEntity->getFirstName(),
'email' => $subscriberEntity->getEmail(),
'created_at' => $subscriberEntity->getCreatedAt()->format(self::DATE_FORMAT),
'created_at' => ($createdAt = $subscriberEntity->getCreatedAt()) ? $createdAt->format(self::DATE_FORMAT) : null,
'updated_at' => $subscriberEntity->getUpdatedAt()->format(self::DATE_FORMAT),
'deleted_at' => ($deletedAt = $subscriberEntity->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
'subscribed_ip' => $subscriberEntity->getSubscribedIp(),
@@ -106,7 +106,7 @@ class SubscribersResponseBuilder {
$result[] = [
'id' => $subscription->getId(),
'subscriber_id' => (string)$subscriberEntity->getId(),
'created_at' => $subscription->getCreatedAt()->format(self::DATE_FORMAT),
'created_at' => ($createdAt = $subscription->getCreatedAt()) ? $createdAt->format(self::DATE_FORMAT) : null,
'segment_id' => (string)$segment->getId(),
'status' => $subscription->getStatus(),
'updated_at' => $subscription->getUpdatedAt()->format(self::DATE_FORMAT),

2
mailpoet/lib/AdminPages/Pages/Logs.php
View File

@@ -42,7 +42,7 @@ class Logs {
'id' => $log->getId(),
'name' => $log->getName(),
'message' => $log->getMessage(),
'created_at' => $log->getCreatedAt()->format('Y-m-d H:i:s'),
'created_at' => ($createdAt = $log->getCreatedAt()) ? $createdAt->format('Y-m-d H:i:s') : null,
];
}
$this->pageRenderer->displayPage('logs.html', $data);

2
mailpoet/lib/AdminPages/Pages/NewsletterEditor.php
View File

@@ -138,7 +138,7 @@ class NewsletterEditor {
'confirmed_ip' => $subscriber->getConfirmedIp(),
'confirmed_at' => ($confirmedAt = $subscriber->getConfirmedAt()) ? $confirmedAt->format(self::DATE_FORMAT) : null,
'last_subscribed_at' => ($lastSubscribedAt = $subscriber->getLastSubscribedAt()) ? $lastSubscribedAt->format(self::DATE_FORMAT) : null,
'created_at' => $subscriber->getCreatedAt()->format(self::DATE_FORMAT),
'created_at' => ($createdAt = $subscriber->getCreatedAt()) ? $createdAt->format(self::DATE_FORMAT) : null,
'updated_at' => $subscriber->getUpdatedAt()->format(self::DATE_FORMAT),
'deleted_at' => ($deletedAt = $subscriber->getDeletedAt()) ? $deletedAt->format(self::DATE_FORMAT) : null,
'unconfirmed_data' => $subscriber->getUnconfirmedData(),

2
mailpoet/lib/Cron/Workers/WooCommercePastOrders.php
View File

@@ -53,7 +53,7 @@ class WooCommercePastOrders extends SimpleWorker {
$orderIds = $this->woocommerceHelper->wcGetOrders([
'status' => 'completed',
'date_completed' => '>=' . $oldestClick->getCreatedAt()->format('Y-m-d H:i:s'),
'date_completed' => '>=' . (($createdAt = $oldestClick->getCreatedAt()) ? $createdAt->format('Y-m-d H:i:s') : null),
'orderby' => 'ID',
'order' => 'ASC',
'limit' => self::BATCH_SIZE,

4
mailpoet/tests/integration/Doctrine/EventListeners/TimestampListenerTest.php
View File

@@ -71,7 +71,9 @@ class TimestampListenerTest extends EventListenersBaseTest {
$entity->setName('Updated');
$this->entityManager->flush();
expect($entity->getCreatedAt()->format('Y-m-d H:i:s'))->equals('2000-01-01 12:00:00');
$createdAt = $entity->getCreatedAt();
$this->assertInstanceOf(\DateTimeInterface::class, $createdAt);
expect($createdAt->format('Y-m-d H:i:s'))->equals('2000-01-01 12:00:00');
expect($entity->getUpdatedAt())->equals($this->now);
}

8
mailpoet/tests/integration/Logging/LogHandlerTest.php
View File

@@ -38,7 +38,9 @@ class LogHandlerTest extends \MailPoetTest {
$log = $this->repository->findOneBy(['name' => 'name'], ['id' => 'desc']);
assert($log instanceof LogEntity);
expect($log->getCreatedAt()->format('Y-m-d H:i:s'))->equals($time->format('Y-m-d H:i:s'));
$createdAt = $log->getCreatedAt();
$this->assertInstanceOf(\DateTimeInterface::class, $createdAt);
expect($createdAt->format('Y-m-d H:i:s'))->equals($time->format('Y-m-d H:i:s'));
}
public function testItPurgesOldLogs() {
@@ -133,7 +135,9 @@ class LogHandlerTest extends \MailPoetTest {
$log = $logRepository->findOneBy(['name' => 'name'], ['id' => 'desc']);
assert($log instanceof LogEntity);
expect($log->getCreatedAt()->format('Y-m-d H:i:s'))->equals($time->format('Y-m-d H:i:s'));
$createdAt = $log->getCreatedAt();
$this->assertInstanceOf(\DateTimeInterface::class, $createdAt);
expect($createdAt->format('Y-m-d H:i:s'))->equals($time->format('Y-m-d H:i:s'));
}
public function _after() {

6
mailpoet/tests/integration/Subscribers/SubscriberActionsTest.php
View File

@@ -155,12 +155,14 @@ class SubscriberActionsTest extends \MailPoetTest {
expect($subscriber->getFirstName())->equals('Donald');
expect($subscriber->getLastName())->equals('Trump');
$createdAt = $subscriber->getCreatedAt();
$this->assertInstanceOf(\DateTimeInterface::class, $createdAt);
expect($subscriber->getWpUserId())->null();
expect($subscriber->getIsWoocommerceUser())->equals(0);
expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
expect($subscriber->getCreatedAt()->format('Y-m-d H:i:s'))->notEquals('1984-03-09 00:00:01');
expect($createdAt->format('Y-m-d H:i:s'))->notEquals('1984-03-09 00:00:01');
expect($subscriber->getUpdatedAt()->format('Y-m-d H:i:s'))->notEquals('1984-03-09 00:00:02');
expect($subscriber->getCreatedAt()->getTimestamp())->equals($subscriber->getUpdatedAt()->getTimestamp(), 2);
expect($createdAt->getTimestamp())->equals($subscriber->getUpdatedAt()->getTimestamp(), 2);
expect($subscriber->getDeletedAt())->null();
}