From 686ee18d167472b9933ccf7e2fd38ac09ef9c726 Mon Sep 17 00:00:00 2001 From: Rodrigo Primo Date: Mon, 19 Sep 2022 11:45:58 -0300 Subject: [PATCH] Replace calls to assert() with Assert::assertInstanceOf() Doing this as it was mentioned in the review process of the PR. For more context see: https://wp.me/pcNwfB-wR [MAILPOET-4363] --- .../Cron/Workers/SendingQueue/Tasks/LinksTest.php | 4 ++-- .../Cron/Workers/SendingQueue/Tasks/NewsletterTest.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php index 5b9b0723d7..fc062df87b 100644 --- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php @@ -43,7 +43,7 @@ class LinksTest extends \MailPoetTest { $this->links->saveLinks($links, $this->newsletter, $queue); $newsletterLink = $this->newsletterLinkRepository->findOneBy(['hash' => $links[0]['hash']]); - assert($newsletterLink instanceof NewsletterLinkEntity); + $this->assertInstanceOf(NewsletterLinkEntity::class, $newsletterLink); $this->assertInstanceOf(NewsletterEntity::class, $newsletterLink->getNewsletter()); expect($newsletterLink->getNewsletter()->getId())->equals($this->newsletter->getId()); $this->assertInstanceOf(SendingQueueEntity::class, $newsletterLink->getQueue()); @@ -75,7 +75,7 @@ class LinksTest extends \MailPoetTest { $result = $this->links->process($renderedNewsletter, $this->newsletter, $this->queue); $newsletterLink = $this->newsletterLinkRepository->findOneBy(['newsletter' => $this->newsletter->getId()]); - assert($newsletterLink instanceof NewsletterLinkEntity); + $this->assertInstanceOf(NewsletterLinkEntity::class, $newsletterLink); expect($result['html'])->stringContainsString($newsletterLink->getHash()); } diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php index 856ef04292..65f813822c 100644 --- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php @@ -170,7 +170,7 @@ class NewsletterTest extends \MailPoetTest { $newsletterTask->trackingEnabled = true; $newsletterTask->preProcessNewsletter($this->newsletter, $this->sendingTask); $link = $this->newsletterLinkRepository->findOneBy(['newsletter' => $this->newsletter->id]); - assert($link instanceof NewsletterLinkEntity); + $this->assertInstanceOf(NewsletterLinkEntity::class, $link); $updatedQueue = SendingTask::getByNewsletterId($this->newsletter->id); $renderedNewsletter = $updatedQueue->getNewsletterRenderedBody(); expect($renderedNewsletter['html']) @@ -254,7 +254,7 @@ class NewsletterTest extends \MailPoetTest { $this->newslettersRepository->flush(); $this->newsletterTask->markNewsletterAsSent($newsletter, $this->sendingTask); $updatedNewsletter = $this->newslettersRepository->findOneById($newsletter->getId()); - assert($updatedNewsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter); expect($updatedNewsletter->getStatus())->equals(NewsletterEntity::STATUS_SENT); $sentAt = $updatedNewsletter->getSentAt(); $this->assertInstanceOf(\DateTime::class, $sentAt); @@ -267,7 +267,7 @@ class NewsletterTest extends \MailPoetTest { $this->newslettersRepository->flush(); $this->newsletterTask->markNewsletterAsSent($newsletter, $this->sendingTask); $updatedNewsletter = $this->newslettersRepository->findOneById($newsletter->getId()); - assert($updatedNewsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter); expect($updatedNewsletter->getStatus())->equals(NewsletterEntity::STATUS_SENT); $sentAt = $updatedNewsletter->getSentAt(); $this->assertInstanceOf(\DateTime::class, $sentAt); @@ -280,7 +280,7 @@ class NewsletterTest extends \MailPoetTest { $this->newslettersRepository->flush(); $this->newsletterTask->markNewsletterAsSent($newsletter, $this->sendingTask); $updatedNewsletter = $this->newslettersRepository->findOneById($newsletter->getId()); - assert($updatedNewsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter); expect($updatedNewsletter->getStatus())->notEquals(NewsletterEntity::STATUS_SENT); } @@ -479,7 +479,7 @@ class NewsletterTest extends \MailPoetTest { // properly serialized object $sendingQueue = $this->sendingQueuesRepository->findOneById($this->sendingTask->id); - assert($sendingQueue instanceof SendingQueueEntity); + $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue); $sendingQueue->setNewsletterRenderedBody(['html' => 'test', 'text' => 'test']); $this->sendingQueuesRepository->persist($sendingQueue); $this->sendingQueuesRepository->flush();