From d2ec7bba42161d655f93caa2f239288586a5421c Mon Sep 17 00:00:00 2001 From: David Remer Date: Thu, 24 Nov 2022 14:55:16 +0200 Subject: [PATCH] Replace instance_of asserts in integration tests [MAILPOET-4258] --- .../DynamicSegmentsResponseBuilderTest.php | 2 +- .../JSON/v1/AutomatedLatestContentTest.php | 2 +- .../API/JSON/v1/CustomFieldsTest.php | 4 +- .../API/JSON/v1/DynamicSegmentsTest.php | 6 +- .../integration/API/JSON/v1/FormsTest.php | 4 +- .../API/JSON/v1/ImportExportTest.php | 6 +- .../API/JSON/v1/NewsletterTemplatesTest.php | 4 +- .../API/JSON/v1/NewslettersTest.php | 18 +++--- .../integration/API/JSON/v1/SegmentsTest.php | 12 ++-- .../integration/API/JSON/v1/SettingsTest.php | 2 +- .../AutomationStatisticsStorageTest.php | 14 ++--- .../Triggers/UserRegistrationTriggerTest.php | 2 +- .../integration/Config/CapabilitiesTest.php | 8 +-- .../integration/Cron/CronWorkerRunnerTest.php | 14 ++--- .../Cron/Workers/InactiveSubscribersTest.php | 4 +- .../Cron/Workers/SchedulerTest.php | 40 ++++++------- .../Workers/SendingQueue/MigrationTest.php | 2 +- .../Workers/SendingQueue/SendingQueueTest.php | 20 +++---- .../SendingQueue/Tasks/ShortcodesTest.php | 2 +- .../Workers/StatsNotifications/WorkerTest.php | 6 +- .../SubscribersLifetimeEmailCountTest.php | 16 ++--- .../Cron/Workers/UnsubscribeTokensTest.php | 4 +- .../Cron/Workers/WooCommerceOrdersTest.php | 10 ++-- .../EventListeners/TimestampListenerTest.php | 2 +- .../Doctrine/Types/JsonTypesTest.php | 8 +-- .../Entities/NewsletterEntityTest.php | 4 +- .../tests/integration/Form/RendererTest.php | 2 +- .../integration/Logging/LogHandlerTest.php | 4 +- .../integration/Models/CustomFieldTest.php | 12 ++-- .../integration/Models/NewsletterTest.php | 32 +++++----- .../integration/Models/ScheduledTaskTest.php | 18 +++--- .../tests/integration/Models/SegmentTest.php | 16 ++--- .../integration/Models/SendingQueueTest.php | 12 ++-- .../Models/SubscriberSegmentTest.php | 4 +- .../Newsletter/Links/LinksTest.php | 2 +- .../Newsletter/NewsletterRepositoryTest.php | 34 +++++------ .../NewsletterSaveControllerTest.php | 20 +++---- .../Scheduler/PostNotificationTest.php | 6 +- .../Newsletter/Scheduler/WelcomeTest.php | 28 ++++----- .../integration/Newsletter/ShortcodesTest.php | 2 +- .../Router/Endpoints/TrackTest.php | 2 +- .../DynamicSegmentFilterRepositoryTest.php | 2 +- .../DynamicSegments/FilterHandlerTest.php | 12 ++-- .../Filters/EmailActionClickAnyTest.php | 4 +- .../Filters/WooCommerceCountryTest.php | 10 ++-- .../Filters/WooCommerceTotalSpentTest.php | 14 ++--- .../SegmentSaveControllerTest.php | 4 +- .../Segments/SegmentSaveControllerTest.php | 4 +- .../SegmentSubscribersRepositoryTest.php | 4 +- .../SegmentsSimpleListRepositoryTest.php | 2 +- .../tests/integration/Segments/WPTest.php | 6 +- .../integration/Segments/WooCommerceTest.php | 58 +++++++++---------- .../Settings/SettingsChangeHandlerTest.php | 12 ++-- .../Settings/UserFlagsControllerTest.php | 2 +- .../StatisticsFormsRepositoryTest.php | 4 +- .../StatisticsOpensRepositoryTest.php | 16 ++--- .../Statistics/Track/OpensTest.php | 14 ++--- .../Track/WooCommercePurchasesTest.php | 42 +++++++------- .../ImportExport/Export/ExportTest.php | 14 ++--- .../ImportExport/Import/ImportTest.php | 26 ++++----- .../ImportExportRepositoryTest.php | 24 ++++---- .../InactiveSubscribersControllerTest.php | 38 ++++++------ .../SubscriberSubscribeControllerTest.php | 8 +-- .../SubscribersEmailCountsControllerTest.php | 30 +++++----- .../Subscribers/SubscribersRepositoryTest.php | 16 ++--- .../integration/Subscription/PagesTest.php | 2 +- .../tests/integration/Tasks/SendingTest.php | 6 +- .../WooCommerce/SubscriptionTest.php | 18 +++--- .../WooCommerce/TransactionalEmailsTest.php | 6 +- 69 files changed, 406 insertions(+), 402 deletions(-) diff --git a/mailpoet/tests/integration/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilderTest.php b/mailpoet/tests/integration/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilderTest.php index 62f54304b8..e9cc377151 100644 --- a/mailpoet/tests/integration/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilderTest.php +++ b/mailpoet/tests/integration/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilderTest.php @@ -83,7 +83,7 @@ class DynamicSegmentsResponseBuilderTest extends \MailPoetTest { $wpUserSubscriber = $this->entityManager ->getRepository(SubscriberEntity::class) ->findOneBy(['email' => $wpUserEmail]); - assert($wpUserSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $wpUserSubscriber); $wpUserSubscriber->setStatus(SubscriberEntity::STATUS_SUBSCRIBED); $segment = $this->createDynamicSegmentEntity($name, $description); $this->addDynamicFilter($segment, 'editor'); diff --git a/mailpoet/tests/integration/API/JSON/v1/AutomatedLatestContentTest.php b/mailpoet/tests/integration/API/JSON/v1/AutomatedLatestContentTest.php index a6fe0dbdcf..561bc78cfe 100644 --- a/mailpoet/tests/integration/API/JSON/v1/AutomatedLatestContentTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/AutomatedLatestContentTest.php @@ -30,7 +30,7 @@ class AutomatedLatestContentTest extends \MailPoetTest { // WP's default post type 'revision' is excluded from search // https://codex.wordpress.org/Post_Types $revisionPostType = get_post_type_object('revision'); - assert($revisionPostType instanceof \WP_Post_Type); + $this->assertInstanceOf(\WP_Post_Type::class, $revisionPostType); expect($revisionPostType->exclude_from_search)->true(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect(isset($response->data['revision']))->false(); } diff --git a/mailpoet/tests/integration/API/JSON/v1/CustomFieldsTest.php b/mailpoet/tests/integration/API/JSON/v1/CustomFieldsTest.php index 0fafa0c9c2..b46ef78f19 100644 --- a/mailpoet/tests/integration/API/JSON/v1/CustomFieldsTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/CustomFieldsTest.php @@ -83,7 +83,7 @@ class CustomFieldsTest extends \MailPoetTest { public function testItCanDeleteACustomField() { $customField = $this->repository->findOneBy(['type' => 'date']); - assert($customField instanceof CustomFieldEntity); + $this->assertInstanceOf(CustomFieldEntity::class, $customField); $customFieldId = $customField->getId(); $router = new CustomFields($this->repository, new CustomFieldsResponseBuilder()); @@ -123,7 +123,7 @@ class CustomFieldsTest extends \MailPoetTest { public function testItCanGetACustomField() { $customField = $this->repository->findOneBy(['name' => 'CF: text']); - assert($customField instanceof CustomFieldEntity); + $this->assertInstanceOf(CustomFieldEntity::class, $customField); $router = new CustomFields($this->repository, new CustomFieldsResponseBuilder()); $response = $router->get(['id' => $customField->getId()]); diff --git a/mailpoet/tests/integration/API/JSON/v1/DynamicSegmentsTest.php b/mailpoet/tests/integration/API/JSON/v1/DynamicSegmentsTest.php index 1199331746..a9f9f6f507 100644 --- a/mailpoet/tests/integration/API/JSON/v1/DynamicSegmentsTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/DynamicSegmentsTest.php @@ -104,7 +104,7 @@ class DynamicSegmentsTest extends \MailPoetTest { expect($response->meta['count'])->equals(1); $this->entityManager->refresh($dynamicSegment); - assert($dynamicSegment instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $dynamicSegment); expect($dynamicSegment->getDeletedAt())->notNull(); } @@ -134,14 +134,14 @@ class DynamicSegmentsTest extends \MailPoetTest { expect($response->meta['count'])->equals(1); $this->entityManager->refresh($dynamicSegment); - assert($dynamicSegment instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $dynamicSegment); expect($dynamicSegment->getDeletedAt())->null(); } public function testItCanDeleteASegment() { $dynamicSegment = $this->createDynamicSegmentEntity('Delete test', 'description'); $dynamicSegmentFilter = $dynamicSegment->getDynamicFilters()->first(); - assert($dynamicSegmentFilter instanceof DynamicSegmentFilterEntity); + $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $dynamicSegmentFilter); $response = $this->endpoint->delete(['id' => $dynamicSegment->getId()]); diff --git a/mailpoet/tests/integration/API/JSON/v1/FormsTest.php b/mailpoet/tests/integration/API/JSON/v1/FormsTest.php index 983eaa7e79..3ec428276c 100644 --- a/mailpoet/tests/integration/API/JSON/v1/FormsTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/FormsTest.php @@ -213,7 +213,7 @@ class FormsTest extends \MailPoetTest { $this->formsRepository->flush(); $this->entityManager->refresh($this->form1); - assert($this->form1 instanceof FormEntity); + $this->assertInstanceOf(FormEntity::class, $this->form1); expect($this->form1)->notNull(); $response = $this->endpoint->restore(['id' => $this->form1->getId()]); @@ -348,7 +348,7 @@ class FormsTest extends \MailPoetTest { private function reloadForm(int $id): FormEntity { $reloaded = $this->formsRepository->findOneById($id); - assert($reloaded instanceof FormEntity); + $this->assertInstanceOf(FormEntity::class, $reloaded); return $reloaded; } diff --git a/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php b/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php index fe97bd155a..1aaa7ab617 100644 --- a/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php @@ -34,7 +34,7 @@ class ImportExportTest extends \MailPoetTest { $response = $this->endpoint->setupWooCommerceInitialImport(); expect($response->status)->equals(200); $task = $this->scheduledTasksRepository->findOneBy(['type' => WooCommerceSync::TASK_TYPE]); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED); $now = time(); $scheduledAt = new Carbon($task->getScheduledAt()); @@ -48,7 +48,7 @@ class ImportExportTest extends \MailPoetTest { $this->entityManager->clear(); $this->endpoint->setupWooCommerceInitialImport(); $task = $this->scheduledTasksRepository->findOneBy(['type' => WooCommerceSync::TASK_TYPE]); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED); $now = time(); $scheduledAt = new Carbon($task->getScheduledAt()); @@ -62,7 +62,7 @@ class ImportExportTest extends \MailPoetTest { $this->createTask(WooCommerceSync::TASK_TYPE, null); $this->endpoint->setupWooCommerceInitialImport(); $task = $this->scheduledTasksRepository->findOneBy(['type' => WooCommerceSync::TASK_TYPE]); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getStatus())->equals(null); $taskCount = $this->scheduledTasksRepository->countBy(['type' => WooCommerceSync::TASK_TYPE]); expect($taskCount)->equals(1); diff --git a/mailpoet/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php b/mailpoet/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php index f3c44d2d46..d122a07c57 100644 --- a/mailpoet/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php @@ -32,7 +32,7 @@ class NewsletterTemplatesTest extends \MailPoetTest { public function testItCanGetANewsletterTemplate() { $template = $this->newsletterTemplatesRepository->findOneBy(['name' => 'Template #1']); - assert($template instanceof NewsletterTemplateEntity); + $this->assertInstanceOf(NewsletterTemplateEntity::class, $template); $endpoint = $this->diContainer->get(NewsletterTemplates::class); $response = $endpoint->get(/* missing id */); @@ -126,7 +126,7 @@ class NewsletterTemplatesTest extends \MailPoetTest { ->equals('This template does not exist.'); $template = $this->newsletterTemplatesRepository->findOneBy(['name' => 'Template #1']); - assert($template instanceof NewsletterTemplateEntity); + $this->assertInstanceOf(NewsletterTemplateEntity::class, $template); $templateId = $template->getId(); $response = $endpoint->delete(['id' => $template->getId()]); expect($response->status)->equals(APIResponse::STATUS_OK); diff --git a/mailpoet/tests/integration/API/JSON/v1/NewslettersTest.php b/mailpoet/tests/integration/API/JSON/v1/NewslettersTest.php index 4ca3b743e8..dd57a1082d 100644 --- a/mailpoet/tests/integration/API/JSON/v1/NewslettersTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/NewslettersTest.php @@ -173,7 +173,7 @@ class NewslettersTest extends \MailPoetTest { expect($response->status)->equals(APIResponse::STATUS_OK); $newsletter = $this->newsletterRepository->findOneById($this->newsletter->getId()); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletter, [ NewslettersResponseBuilder::RELATION_SEGMENTS, NewslettersResponseBuilder::RELATION_OPTIONS, @@ -201,7 +201,7 @@ class NewslettersTest extends \MailPoetTest { $response = $this->endpoint->save($newsletterData); expect($response->status)->equals(APIResponse::STATUS_OK); $updatedNewsletter = $this->newsletterRepository->findOneById($this->newsletter->getId()); - assert($updatedNewsletter instanceof NewsletterEntity); // PHPStan + $this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter); // PHPStan expect($response->data)->equals($this->newslettersResponseBuilder->build($updatedNewsletter, [NewslettersResponseBuilder::RELATION_SEGMENTS])); expect($updatedNewsletter->getType())->equals('Updated type'); expect($updatedNewsletter->getSubject())->equals('Updated subject'); @@ -326,13 +326,13 @@ class NewslettersTest extends \MailPoetTest { $this->entityManager->clear(); $trashedNewsletter = $this->newsletterRepository->findOneById($this->newsletter->getId()); - assert($trashedNewsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $trashedNewsletter); expect($trashedNewsletter->getDeletedAt())->notNull(); $response = $this->endpoint->restore(['id' => $this->newsletter->getId()]); expect($response->status)->equals(APIResponse::STATUS_OK); $newsletter = $this->newsletterRepository->findOneById($this->newsletter->getId()); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletter)); expect($response->data['deleted_at'])->null(); expect($response->meta['count'])->equals(1); @@ -342,7 +342,7 @@ class NewslettersTest extends \MailPoetTest { $response = $this->endpoint->trash(['id' => $this->newsletter->getId()]); expect($response->status)->equals(APIResponse::STATUS_OK); $newsletter = $this->newsletterRepository->findOneById($this->newsletter->getId()); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletter)); expect($response->data['deleted_at'])->notNull(); expect($response->meta['count'])->equals(1); @@ -367,7 +367,7 @@ class NewslettersTest extends \MailPoetTest { $response = $this->endpoint->duplicate(['id' => $this->newsletter->getId()]); expect($response->status)->equals(APIResponse::STATUS_OK); $newsletterCopy = $this->newsletterRepository->findOneBy(['subject' => 'Copy of My Standard Newsletter']); - assert($newsletterCopy instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletterCopy); expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletterCopy)); expect($response->meta['count'])->equals(1); @@ -378,7 +378,7 @@ class NewslettersTest extends \MailPoetTest { $response = $this->endpoint->duplicate(['id' => $this->postNotification->getId()]); expect($response->status)->equals(APIResponse::STATUS_OK); $newsletterCopy = $this->newsletterRepository->findOneBy(['subject' => 'Copy of My Post Notification']); - assert($newsletterCopy instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletterCopy); expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletterCopy)); expect($response->meta['count'])->equals(1); } @@ -391,7 +391,7 @@ class NewslettersTest extends \MailPoetTest { $response = $this->endpoint->create($data); expect($response->status)->equals(APIResponse::STATUS_OK); $newsletter = $this->newsletterRepository->findOneBy(['subject' => 'My New Newsletter']); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletter)); $response = $this->endpoint->create(); @@ -407,7 +407,7 @@ class NewslettersTest extends \MailPoetTest { $response = $this->endpoint->create($data); expect($response->status)->equals(APIResponse::STATUS_OK); $newsletter = $this->newsletterRepository->findOneBy(['subject' => 'My Automation newsletter']); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletter)); } diff --git a/mailpoet/tests/integration/API/JSON/v1/SegmentsTest.php b/mailpoet/tests/integration/API/JSON/v1/SegmentsTest.php index 62bae20a77..d5b5724869 100644 --- a/mailpoet/tests/integration/API/JSON/v1/SegmentsTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/SegmentsTest.php @@ -98,7 +98,7 @@ class SegmentsTest extends \MailPoetTest { $response = $this->endpoint->save($segmentData); expect($response->status)->equals(APIResponse::STATUS_OK); $segment = $this->segmentRepository->findOneBy(['name' => $name]); - assert($segment instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $segment); expect($response->data)->equals( $this->responseBuilder->build($segment) ); @@ -119,14 +119,14 @@ class SegmentsTest extends \MailPoetTest { $this->segmentRepository->flush(); $trashedSegment = $this->segmentRepository->findOneById($this->segment1->getId()); - assert($trashedSegment instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $trashedSegment); expect($trashedSegment->getDeletedAt())->notNull(); $this->entityManager->clear(); $response = $this->endpoint->restore(['id' => $this->segment1->getId()]); expect($response->status)->equals(APIResponse::STATUS_OK); $segment = $this->segmentRepository->findOneById($trashedSegment->getId()); - assert($segment instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $segment); expect($response->data)->equals( $this->responseBuilder->build($segment) ); @@ -138,7 +138,7 @@ class SegmentsTest extends \MailPoetTest { $response = $this->endpoint->trash(['id' => $this->segment2->getId()]); $this->entityManager->clear(); $segment = $this->segmentRepository->findOneById($this->segment2->getId()); - assert($segment instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $segment); expect($response->status)->equals(APIResponse::STATUS_OK); expect($response->data)->equals( @@ -191,7 +191,7 @@ class SegmentsTest extends \MailPoetTest { $response = $this->endpoint->trash(['id' => $this->segment2->getId()]); $this->entityManager->refresh($this->segment2); $segment = $this->segmentRepository->findOneById($this->segment2->getId()); - assert($segment instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $segment); expect($response->status)->equals(APIResponse::STATUS_OK); expect($response->data)->equals( @@ -211,7 +211,7 @@ class SegmentsTest extends \MailPoetTest { public function testItCanDuplicateASegment() { $response = $this->endpoint->duplicate(['id' => $this->segment1->getId()]); $segment = $this->segmentRepository->findOneBy(['name' => 'Copy of Segment 1']); - assert($segment instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $segment); expect($response->status)->equals(APIResponse::STATUS_OK); expect($response->data)->equals( diff --git a/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php b/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php index d2cd395301..4586a2a825 100644 --- a/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php @@ -244,7 +244,7 @@ class SettingsTest extends \MailPoetTest { 'status' => ScheduledTaskEntity::STATUS_SCHEDULED ] ); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getScheduledAt())->lessThan(Carbon::now()); } diff --git a/mailpoet/tests/integration/Automation/Engine/Storage/AutomationStatisticsStorageTest.php b/mailpoet/tests/integration/Automation/Engine/Storage/AutomationStatisticsStorageTest.php index 0a4991858f..e4f530795b 100644 --- a/mailpoet/tests/integration/Automation/Engine/Storage/AutomationStatisticsStorageTest.php +++ b/mailpoet/tests/integration/Automation/Engine/Storage/AutomationStatisticsStorageTest.php @@ -47,7 +47,7 @@ class AutomationStatisticsStorageTest extends \MailPoetTest */ public function testItCalculatesTotalsCorrectlyForSingleAutomation(int $automationIndex, int $expectedTotal, int $expectedInProgress, int $expectedExited, int $versionId = null) { $automation = $this->automationStorage->getAutomation($this->automations[$automationIndex], $versionId); - assert($automation instanceof Automation); + $this->assertInstanceOf(Automation::class, $automation); $i = 0; while($i < $expectedInProgress) { $this->createRun($automation, AutomationRun::STATUS_RUNNING); @@ -114,11 +114,11 @@ class AutomationStatisticsStorageTest extends \MailPoetTest public function testItSeparatesAutomationRunsCorrectly() { $automation1 = $this->automationStorage->getAutomation($this->automations[0]); - assert($automation1 instanceof Automation); + $this->assertInstanceOf(Automation::class, $automation1); $automation2 = $this->automationStorage->getAutomation($this->automations[1]); - assert($automation2 instanceof Automation); + $this->assertInstanceOf(Automation::class, $automation2); $automation3 = $this->automationStorage->getAutomation($this->automations[2]); - assert($automation3 instanceof Automation); + $this->assertInstanceOf(Automation::class, $automation3); $this->createRun($automation1, AutomationRun::STATUS_COMPLETE); @@ -141,17 +141,17 @@ class AutomationStatisticsStorageTest extends \MailPoetTest public function testItCanDistinguishBetweenVersions() { $oldestAutomation = $this->automationStorage->getAutomation($this->automations[0]); - assert($oldestAutomation instanceof Automation); + $this->assertInstanceOf(Automation::class, $oldestAutomation); $oldestAutomation->setName('new-name'); $this->automationStorage->updateAutomation($oldestAutomation); $middleWorkeflow = $this->automationStorage->getAutomation($this->automations[0]); - assert($middleWorkeflow instanceof Automation); + $this->assertInstanceOf(Automation::class, $middleWorkeflow); $middleWorkeflow->setName('another-name'); $this->automationStorage->updateAutomation($middleWorkeflow); $newestAutomation = $this->automationStorage->getAutomation($this->automations[0]); - assert($newestAutomation instanceof Automation); + $this->assertInstanceOf(Automation::class, $newestAutomation); // 1 Run in the oldest Automation $this->createRun($oldestAutomation, AutomationRun::STATUS_CANCELLED); diff --git a/mailpoet/tests/integration/Automation/Integrations/MailPoet/Triggers/UserRegistrationTriggerTest.php b/mailpoet/tests/integration/Automation/Integrations/MailPoet/Triggers/UserRegistrationTriggerTest.php index fff58fd5fd..db7100d52e 100644 --- a/mailpoet/tests/integration/Automation/Integrations/MailPoet/Triggers/UserRegistrationTriggerTest.php +++ b/mailpoet/tests/integration/Automation/Integrations/MailPoet/Triggers/UserRegistrationTriggerTest.php @@ -84,7 +84,7 @@ class UserRegistrationTriggerTest extends \MailPoetTest { $this->assertSame(SubscriberSubject::KEY, $subjects[1]->getKey()); $wpUserSegment = $this->segmentRepository->getWPUsersSegment(); - assert($wpUserSegment instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $wpUserSegment); $this->assertSame($wpUserSegment->getId(), $subjects[0]->getArgs()['segment_id']); $this->assertSame($subscriber->getId(), $subjects[1]->getArgs()['subscriber_id']); }); diff --git a/mailpoet/tests/integration/Config/CapabilitiesTest.php b/mailpoet/tests/integration/Config/CapabilitiesTest.php index e996d23651..61c01444c6 100644 --- a/mailpoet/tests/integration/Config/CapabilitiesTest.php +++ b/mailpoet/tests/integration/Config/CapabilitiesTest.php @@ -45,7 +45,7 @@ class CapabilitiesTest extends \MailPoetTest { foreach ($roles as $role) { $checked = true; $role = get_role($role); - assert($role instanceof WP_Role); + $this->assertInstanceOf(WP_Role::class, $role); expect($role->has_cap($name))->true(); } } @@ -60,7 +60,7 @@ class CapabilitiesTest extends \MailPoetTest { foreach ($roles as $role) { $checked = true; $role = get_role($role); - assert($role instanceof WP_Role); + $this->assertInstanceOf(WP_Role::class, $role); expect($role->has_cap($name))->false(); } } @@ -84,7 +84,7 @@ class CapabilitiesTest extends \MailPoetTest { // other MailPoet capabilities were successfully configured $editorRole = get_role('editor'); - assert($editorRole instanceof WP_Role); + $this->assertInstanceOf(WP_Role::class, $editorRole); expect($editorRole->has_cap(AccessControl::PERMISSION_ACCESS_PLUGIN_ADMIN))->false(); expect($editorRole->has_cap(AccessControl::PERMISSION_MANAGE_EMAILS))->true(); @@ -93,7 +93,7 @@ class CapabilitiesTest extends \MailPoetTest { $this->caps->setupWPCapabilities(); $editorRole = get_role('editor'); - assert($editorRole instanceof WP_Role); + $this->assertInstanceOf(WP_Role::class, $editorRole); expect($editorRole->has_cap(AccessControl::PERMISSION_ACCESS_PLUGIN_ADMIN))->true(); expect($editorRole->has_cap(AccessControl::PERMISSION_MANAGE_EMAILS))->true(); } diff --git a/mailpoet/tests/integration/Cron/CronWorkerRunnerTest.php b/mailpoet/tests/integration/Cron/CronWorkerRunnerTest.php index 14b2672079..18f4334c1f 100644 --- a/mailpoet/tests/integration/Cron/CronWorkerRunnerTest.php +++ b/mailpoet/tests/integration/Cron/CronWorkerRunnerTest.php @@ -57,7 +57,7 @@ class CronWorkerRunnerTest extends \MailPoetTest { $result = $this->cronWorkerRunner->run($worker); expect($result)->true(); $scheduledTask = $this->scheduledTasksRepository->findOneById($task->getId()); - assert($scheduledTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask); expect($scheduledTask->getStatus())->same(ScheduledTaskEntity::STATUS_COMPLETED); } @@ -71,7 +71,7 @@ class CronWorkerRunnerTest extends \MailPoetTest { $result = $this->cronWorkerRunner->run($worker); expect($result)->true(); $scheduledTask = $this->scheduledTasksRepository->findOneById($task->getId()); - assert($scheduledTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask); expect($scheduledTask->getStatus())->same(ScheduledTaskEntity::STATUS_COMPLETED); } @@ -111,7 +111,7 @@ class CronWorkerRunnerTest extends \MailPoetTest { $result = $this->cronWorkerRunner->run($worker); expect($result)->false(); $scheduledTask = $this->scheduledTasksRepository->findAll()[0]; - assert($scheduledTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask); expect($scheduledTask->getScheduledAt())->same($inOneWeek); } @@ -123,7 +123,7 @@ class CronWorkerRunnerTest extends \MailPoetTest { $task = $this->createRunningTask(); $task = $this->scheduledTasksRepository->findOneById($task->getId()); // make sure `updated_at` is set by the DB - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); $result = $this->cronWorkerRunner->run($worker); expect($result)->true(); @@ -140,7 +140,7 @@ class CronWorkerRunnerTest extends \MailPoetTest { expect($result)->true(); $task = $this->scheduledTasksRepository->findOneById($task->getId()); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getScheduledAt())->greaterThan($scheduledAt); expect($task->getStatus())->same(ScheduledTaskEntity::STATUS_SCHEDULED); expect($task->getInProgress())->isEmpty(); @@ -167,7 +167,7 @@ class CronWorkerRunnerTest extends \MailPoetTest { } catch (\Exception $e) { expect($e->getMessage())->equals('test error'); $task = $this->scheduledTasksRepository->findOneById($task->getId()); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getScheduledAt())->greaterThan($scheduledAt); expect($task->getStatus())->same(ScheduledTaskEntity::STATUS_SCHEDULED); expect($task->getRescheduleCount())->equals(1); @@ -190,7 +190,7 @@ class CronWorkerRunnerTest extends \MailPoetTest { } catch (\Exception $e) { expect($e->getCode())->same(CronHelper::DAEMON_EXECUTION_LIMIT_REACHED); $task = $this->scheduledTasksRepository->findOneById($task->getId()); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($scheduledAt)->equals($task->getScheduledAt()); expect($task->getStatus())->null(); expect($task->getRescheduleCount())->equals(0); diff --git a/mailpoet/tests/integration/Cron/Workers/InactiveSubscribersTest.php b/mailpoet/tests/integration/Cron/Workers/InactiveSubscribersTest.php index 73f95a1dc0..e8342f9c76 100644 --- a/mailpoet/tests/integration/Cron/Workers/InactiveSubscribersTest.php +++ b/mailpoet/tests/integration/Cron/Workers/InactiveSubscribersTest.php @@ -48,7 +48,7 @@ class InactiveSubscribersTest extends \MailPoetTest { ['type' => InactiveSubscribers::TASK_TYPE, 'status' => ScheduledTaskEntity::STATUS_SCHEDULED] ); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task)->isInstanceOf(ScheduledTaskEntity::class); expect($task->getScheduledAt())->greaterThan(new Carbon()); } @@ -85,7 +85,7 @@ class InactiveSubscribersTest extends \MailPoetTest { ['type' => InactiveSubscribers::TASK_TYPE, 'status' => ScheduledTaskEntity::STATUS_SCHEDULED] ); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task)->isInstanceOf(ScheduledTaskEntity::class); expect($task->getScheduledAt())->greaterThan(new Carbon()); } diff --git a/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php b/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php index c5b5a1008e..abb2f6039a 100644 --- a/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php @@ -152,7 +152,7 @@ class SchedulerTest extends \MailPoetTest { $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_WELCOME) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $queue = $this->_createQueue($newsletter->id); $scheduler = $this->getScheduler(); @@ -164,14 +164,14 @@ class SchedulerTest extends \MailPoetTest { public function testItCanRescheduleQueueDeliveryTime() { $newsletter = $this->_createNewsletter(); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $newsletterEntity = $this->entityManager->getReference(NewsletterEntity::class, $newsletter->id); $this->assertInstanceOf(NewsletterEntity::class, $newsletterEntity); $newsletterOption = $this->newsletterOptionFactory->create($newsletterEntity, 'intervalType', 'daily'); $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_WELCOME) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $queue = $this->_createQueue($newsletter->id); $scheduler = $this->getScheduler(); @@ -182,7 +182,7 @@ class SchedulerTest extends \MailPoetTest { $this->entityManager->persist($newsletterOption); $this->entityManager->flush(); $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_WELCOME)->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); expect($queue->scheduledAt)->null(); $newsletter->schedule = '0 5 * * *'; // set it to daily at 5 $scheduler->deleteQueueOrUpdateNextRunDate($queue, $newsletter); @@ -203,7 +203,7 @@ class SchedulerTest extends \MailPoetTest { $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_WELCOME) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $queue = $this->_createQueue($newsletter->id); $scheduler = $this->getScheduler(); @@ -224,7 +224,7 @@ class SchedulerTest extends \MailPoetTest { $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_WELCOME) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $queue = $this->_createQueue($newsletter->id); $scheduler = $this->getScheduler(); @@ -246,7 +246,7 @@ class SchedulerTest extends \MailPoetTest { $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_WELCOME) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $queue = $this->_createQueue($newsletter->id); $scheduler = $this->getScheduler(); @@ -267,7 +267,7 @@ class SchedulerTest extends \MailPoetTest { $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_WELCOME) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $queue = $this->_createQueue($newsletter->id); $scheduler = $this->getScheduler(); @@ -381,7 +381,7 @@ class SchedulerTest extends \MailPoetTest { $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_NOTIFICATION) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $queue = $this->_createQueue($newsletter->id); $scheduler = $this->getScheduler(); @@ -412,7 +412,7 @@ class SchedulerTest extends \MailPoetTest { $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_NOTIFICATION) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $queue = $this->_createQueue($newsletter->id); $scheduler = $this->getScheduler(); @@ -439,7 +439,7 @@ class SchedulerTest extends \MailPoetTest { $this->newsletterOptionFactory->create($newsletterEntity, 'segment', $segment->id); $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_NOTIFICATION) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $queue = $this->_createQueue($newsletter->id); $scheduler = $this->getScheduler(); @@ -460,7 +460,7 @@ class SchedulerTest extends \MailPoetTest { $this->newsletterOptionFactory->create($newsletterEntity, 'segment', $segment->id); $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_NOTIFICATION) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $queue = $this->_createQueue($newsletter->id); $scheduler = $this->getScheduler(); @@ -480,7 +480,7 @@ class SchedulerTest extends \MailPoetTest { $this->newsletterOptionFactory->create($newsletterEntity, 'segment', $segment->id); $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_NOTIFICATION) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $queue = $this->_createQueue($newsletter->id); $scheduler = $this->getScheduler($this->subscribersFinder); @@ -496,7 +496,7 @@ class SchedulerTest extends \MailPoetTest { expect($updatedQueue->status)->null(); // set newsletter's status to sending $updatedNewsletter = Newsletter::findOne($newsletter->id); - assert($updatedNewsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $updatedNewsletter); expect($updatedNewsletter->status)->equals(Newsletter::STATUS_SENDING); } @@ -557,7 +557,7 @@ class SchedulerTest extends \MailPoetTest { $this->newsletterOptionFactory->create($newsletterEntity, 'segment', $segment->id); $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_NOTIFICATION) ->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $scheduler = $this->getScheduler($this->subscribersFinder); // return true @@ -565,7 +565,7 @@ class SchedulerTest extends \MailPoetTest { // create notification history $notificationHistory = Newsletter::where('parent_id', $newsletter->id) ->findOne(); - assert($notificationHistory instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $notificationHistory); expect($notificationHistory)->notEmpty(); // update queue with a list of subscribers to process and change newsletter id // to that of the notification history @@ -580,7 +580,7 @@ class SchedulerTest extends \MailPoetTest { // set notification history's status to sending $updatedNotificationHistory = Newsletter::where('parent_id', $newsletter->id) ->findOne(); - assert($updatedNotificationHistory instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $updatedNotificationHistory); expect($updatedNotificationHistory->status)->equals(Newsletter::STATUS_SENDING); } @@ -706,7 +706,7 @@ class SchedulerTest extends \MailPoetTest { $scheduler->processScheduledStandardNewsletter($newsletter, $queue); $refetchedTask = ScheduledTask::where('id', $task->id)->findOne(); - assert($refetchedTask instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $refetchedTask); expect($refetchedTask->scheduledAt)->lessThan(Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addHours(1)); } @@ -867,7 +867,7 @@ class SchedulerTest extends \MailPoetTest { $scheduler = $this->getScheduler(); $scheduler->process(); $newQueue = ScheduledTask::findOne($queue->taskId); - assert($newQueue instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $newQueue); expect($newQueue->updatedAt)->notEquals($originalUpdated); } @@ -942,7 +942,7 @@ class SchedulerTest extends \MailPoetTest { ); } $user = get_user_by('login', $username); - assert($user instanceof WP_User); + $this->assertInstanceOf(WP_User::class, $user); wp_update_user( [ 'ID' => $user->ID, diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php index 8792961286..5f2c7f7f3c 100644 --- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/MigrationTest.php @@ -110,7 +110,7 @@ class MigrationTest extends \MailPoetTest { $task = $this->createScheduledTask(); $this->worker->prepareTaskStrategy($task, microtime(true)); $task = $this->scheduledTasksRepository->findOneById($task->getId()); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED); } diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php index b7ba7aba28..a467ec2194 100644 --- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php @@ -416,7 +416,7 @@ class SendingQueueTest extends \MailPoetTest { // newsletter status is set to sent $updatedNewsletter = Newsletter::findOne($this->newsletter->id); - assert($updatedNewsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $updatedNewsletter); expect($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT); // queue status is set to completed @@ -540,7 +540,7 @@ class SendingQueueTest extends \MailPoetTest { // newsletter status is set to sent $updatedNewsletter = Newsletter::findOne($this->newsletter->id); - assert($updatedNewsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $updatedNewsletter); expect($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT); // queue status is set to completed @@ -591,7 +591,7 @@ class SendingQueueTest extends \MailPoetTest { // newsletter status is set to sent and sent_at date is populated $updatedNewsletter = Newsletter::findOne($this->newsletter->id); - assert($updatedNewsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $updatedNewsletter); expect($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT); expect($updatedNewsletter->sentAt)->equals($updatedQueue->processedAt); @@ -713,7 +713,7 @@ class SendingQueueTest extends \MailPoetTest { $sendingQueueWorker->process(); $newQueue = ScheduledTask::findOne($this->queue->task_id); - assert($newQueue instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $newQueue); expect($newQueue->updatedAt)->notEquals($originalUpdated); } @@ -740,7 +740,7 @@ class SendingQueueTest extends \MailPoetTest { // newsletter status is set to sent $updatedNewsletter = Newsletter::findOne($this->newsletter->id); - assert($updatedNewsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $updatedNewsletter); expect($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT); // queue status is set to completed @@ -1089,7 +1089,7 @@ class SendingQueueTest extends \MailPoetTest { // newsletter is sent and hash remains intact $updatedNewsletter = Newsletter::findOne($this->newsletter->id); - assert($updatedNewsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $updatedNewsletter); expect($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT); expect($updatedNewsletter->hash)->equals($this->newsletter->hash); } @@ -1121,7 +1121,7 @@ class SendingQueueTest extends \MailPoetTest { $sendingQueueWorker->process(); $refetchedTask = ScheduledTask::where('id', $task->id)->findOne(); - assert($refetchedTask instanceof ScheduledTask); // PHPStan + $this->assertInstanceOf(ScheduledTask::class, $refetchedTask); // PHPStan expect($refetchedTask->scheduledAt)->lessThan(Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addHours(42)); } @@ -1141,7 +1141,7 @@ class SendingQueueTest extends \MailPoetTest { $sendingQueueWorker->process(); $refetchedTask = ScheduledTask::where('id', $task->id)->findOne(); - assert($refetchedTask instanceof ScheduledTask); // PHPStan + $this->assertInstanceOf(ScheduledTask::class, $refetchedTask); // PHPStan expect($refetchedTask->scheduledAt)->equals($inOneHour); } @@ -1157,7 +1157,7 @@ class SendingQueueTest extends \MailPoetTest { $sendingQueueWorker->process(); $task = $queue->getTask(); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); $this->entityManager->refresh($task); $this->entityManager->refresh($newsletter); expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED); @@ -1179,7 +1179,7 @@ class SendingQueueTest extends \MailPoetTest { $sendingQueueWorker->process(); $task = $queue->getTask(); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); $this->entityManager->refresh($task); $this->entityManager->refresh($newsletter); expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED); diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php index 707a37ba57..33306440c3 100644 --- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php @@ -34,7 +34,7 @@ class ShortcodesTest extends \MailPoetTest { public function testItCanReplaceShortcodesInOneStringUsingContentsFromAnother() { $wpPost = get_post($this->wPPost); - assert($wpPost instanceof WP_Post); + $this->assertInstanceOf(WP_Post::class, $wpPost); $content = 'Subject line with one shortcode: [newsletter:post_title]'; $contentSource = 'latest post'; diff --git a/mailpoet/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php b/mailpoet/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php index f26331cb82..c80ce5684a 100644 --- a/mailpoet/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php +++ b/mailpoet/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php @@ -287,9 +287,9 @@ class WorkerTest extends \MailPoetTest { } private function createStatisticsUnsubscribe($data): StatisticsUnsubscribeEntity { - assert($data['newsletter'] instanceof NewsletterEntity); - assert($data['queue'] instanceof SendingQueueEntity); - assert($data['subscriber'] instanceof SubscriberEntity); + $this->assertInstanceOf(NewsletterEntity::class, $data['newsletter']); + $this->assertInstanceOf(SendingQueueEntity::class, $data['queue']); + $this->assertInstanceOf(SubscriberEntity::class, $data['subscriber']); $entity = new StatisticsUnsubscribeEntity($data['newsletter'], $data['queue'], $data['subscriber']); $this->entityManager->persist($entity); if (isset($data['created_at'])) $entity->setCreatedAt(new Carbon($data['created_at'])); diff --git a/mailpoet/tests/integration/Cron/Workers/SubscribersLifetimeEmailCountTest.php b/mailpoet/tests/integration/Cron/Workers/SubscribersLifetimeEmailCountTest.php index 5e2c1d06fc..d12a4f0447 100644 --- a/mailpoet/tests/integration/Cron/Workers/SubscribersLifetimeEmailCountTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SubscribersLifetimeEmailCountTest.php @@ -70,10 +70,10 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); expect($subscriber1->getEmailCount())->equals(80); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); expect($subscriber2->getEmailCount())->equals(8); } @@ -90,10 +90,10 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); expect($subscriber1->getEmailCount())->equals(0); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); expect($subscriber2->getEmailCount())->equals(8); } @@ -111,10 +111,10 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); expect($subscriber1->getEmailCount())->equals(0); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); expect($subscriber2->getEmailCount())->equals(8); } @@ -137,7 +137,7 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); expect($subscriber1->getEmailCount())->equals(81); } @@ -149,7 +149,7 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest { ['type' => SubscribersEmailCount::TASK_TYPE, 'status' => ScheduledTaskEntity::STATUS_SCHEDULED] ); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task)->isInstanceOf(ScheduledTaskEntity::class); expect($task->getScheduledAt())->greaterThan(new Carbon()); } diff --git a/mailpoet/tests/integration/Cron/Workers/UnsubscribeTokensTest.php b/mailpoet/tests/integration/Cron/Workers/UnsubscribeTokensTest.php index ce28ff2290..fb7c5fef50 100644 --- a/mailpoet/tests/integration/Cron/Workers/UnsubscribeTokensTest.php +++ b/mailpoet/tests/integration/Cron/Workers/UnsubscribeTokensTest.php @@ -60,8 +60,8 @@ class UnsubscribeTokensTest extends \MailPoetTest { $worker->processTaskStrategy(new ScheduledTaskEntity(), microtime(true)); $this->newsletterWithToken = Newsletter::findOne($this->newsletterWithToken->id); $this->newsletterWithoutToken = Newsletter::findOne($this->newsletterWithoutToken->id); - assert($this->newsletterWithToken instanceof Newsletter); - assert($this->newsletterWithoutToken instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $this->newsletterWithToken); + $this->assertInstanceOf(Newsletter::class, $this->newsletterWithoutToken); expect($this->newsletterWithToken->unsubscribeToken)->equals('aaabbbcccdddeee'); expect(strlen($this->newsletterWithoutToken->unsubscribeToken))->equals(15); } diff --git a/mailpoet/tests/integration/Cron/Workers/WooCommerceOrdersTest.php b/mailpoet/tests/integration/Cron/Workers/WooCommerceOrdersTest.php index c6038a9864..b33dcf904b 100644 --- a/mailpoet/tests/integration/Cron/Workers/WooCommerceOrdersTest.php +++ b/mailpoet/tests/integration/Cron/Workers/WooCommerceOrdersTest.php @@ -80,7 +80,7 @@ class WooCommerceOrdersTest extends \MailPoetTest { expect($this->worker->checkProcessingRequirements())->true(); $this->cronWorkerRunner->run($this->worker); $task = $this->scheduledTaskRepository->findOneBy(['type' => WooCommercePastOrders::TASK_TYPE]); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED); // 2. prepare and run @@ -88,7 +88,7 @@ class WooCommerceOrdersTest extends \MailPoetTest { $this->cronWorkerRunner->run($this->worker); $this->entityManager->clear(); $task = $this->scheduledTaskRepository->findOneBy(['type' => WooCommercePastOrders::TASK_TYPE]); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED); // 3. complete (do not schedule again) @@ -96,7 +96,7 @@ class WooCommerceOrdersTest extends \MailPoetTest { $this->cronWorkerRunner->run($this->worker); $this->entityManager->clear(); $task = $this->scheduledTaskRepository->findOneBy(['type' => WooCommercePastOrders::TASK_TYPE]); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED); $this->entityManager->clear(); @@ -131,13 +131,13 @@ class WooCommerceOrdersTest extends \MailPoetTest { $this->cronWorkerRunner->run($this->worker); // prepare and run for 1, 2, 3 $task = $this->scheduledTaskRepository->findOneBy(['type' => WooCommercePastOrders::TASK_TYPE]); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getMeta())->equals(['last_processed_id' => 3]); $this->cronWorkerRunner->run($this->worker); // run for 4, 5 $task = $this->scheduledTaskRepository->findOneBy(['type' => WooCommercePastOrders::TASK_TYPE]); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getMeta())->equals(['last_processed_id' => 5]); $this->cronWorkerRunner->run($this->worker); // complete diff --git a/mailpoet/tests/integration/Doctrine/EventListeners/TimestampListenerTest.php b/mailpoet/tests/integration/Doctrine/EventListeners/TimestampListenerTest.php index 6ddc243dac..4aa77ab6ca 100644 --- a/mailpoet/tests/integration/Doctrine/EventListeners/TimestampListenerTest.php +++ b/mailpoet/tests/integration/Doctrine/EventListeners/TimestampListenerTest.php @@ -67,7 +67,7 @@ class TimestampListenerTest extends EventListenersBaseTest { "); $entity = $this->entityManager->find(TimestampEntity::class, 123); - assert($entity instanceof TimestampEntity); // PHPStan + $this->assertInstanceOf(TimestampEntity::class, $entity); // PHPStan $entity->setName('Updated'); $this->entityManager->flush(); diff --git a/mailpoet/tests/integration/Doctrine/Types/JsonTypesTest.php b/mailpoet/tests/integration/Doctrine/Types/JsonTypesTest.php index 8da2b6121f..2ffed8aff4 100644 --- a/mailpoet/tests/integration/Doctrine/Types/JsonTypesTest.php +++ b/mailpoet/tests/integration/Doctrine/Types/JsonTypesTest.php @@ -75,7 +75,7 @@ class JsonTypesTest extends \MailPoetTest { ); $entity = $this->entityManager->find(JsonEntity::class, 1); - assert($entity instanceof JsonEntity); // PHPStan + $this->assertInstanceOf(JsonEntity::class, $entity); // PHPStan expect($entity->getJsonData())->same($this->testData); expect($entity->getJsonOrSerializedData())->same($this->testData); } @@ -90,7 +90,7 @@ class JsonTypesTest extends \MailPoetTest { ); $entity = $this->entityManager->find(JsonEntity::class, 1); - assert($entity instanceof JsonEntity); // PHPStan + $this->assertInstanceOf(JsonEntity::class, $entity); // PHPStan expect($entity->getJsonData())->null(); expect($entity->getJsonOrSerializedData())->same($this->testData); } @@ -119,7 +119,7 @@ class JsonTypesTest extends \MailPoetTest { ); $entity = $this->entityManager->find(JsonEntity::class, 1); - assert($entity instanceof JsonEntity); // PHPStan + $this->assertInstanceOf(JsonEntity::class, $entity); // PHPStan expect($entity->getJsonData())->null(); expect($entity->getJsonOrSerializedData())->null(); } @@ -135,7 +135,7 @@ class JsonTypesTest extends \MailPoetTest { ); $entity = $this->entityManager->find(JsonEntity::class, 1); - assert($entity instanceof JsonEntity); // PHPStan + $this->assertInstanceOf(JsonEntity::class, $entity); // PHPStan expect($entity->getJsonData())->null(); expect($entity->getJsonOrSerializedData())->null(); } diff --git a/mailpoet/tests/integration/Entities/NewsletterEntityTest.php b/mailpoet/tests/integration/Entities/NewsletterEntityTest.php index 7eff84fa44..6b52771076 100644 --- a/mailpoet/tests/integration/Entities/NewsletterEntityTest.php +++ b/mailpoet/tests/integration/Entities/NewsletterEntityTest.php @@ -70,9 +70,9 @@ class NewsletterEntityTest extends \MailPoetTest { $newsletterId = $newsletter->getId(); $newsletter = $this->newsletterRepository->findOneById($newsletterId); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); $newsletterOptionField = $newsletter->getOption($optionField->getName()); - assert($newsletterOption instanceof NewsletterOptionEntity); + $this->assertInstanceOf(NewsletterOptionEntity::class, $newsletterOption); expect($newsletterOptionField)->notNull(); expect($newsletterOption->getValue())->equals($optionValue); diff --git a/mailpoet/tests/integration/Form/RendererTest.php b/mailpoet/tests/integration/Form/RendererTest.php index daecd7f1dd..7e91de780e 100755 --- a/mailpoet/tests/integration/Form/RendererTest.php +++ b/mailpoet/tests/integration/Form/RendererTest.php @@ -9,7 +9,7 @@ class RendererTest extends \MailPoetTest { public function testItRendersFormBody() { $formBody = Fixtures::get('form_body_template'); $renderer = ContainerWrapper::getInstance()->get(Renderer::class); - assert($renderer instanceof Renderer); + $this->assertInstanceOf(Renderer::class, $renderer); $formHtml = $renderer->renderBlocks($formBody); expect($formHtml)->stringContainsString(''); // honey pot expect($formHtml)->stringContainsString('input type="submit" class="mailpoet_submit" value="Subscribe!"'); // Subscribe button diff --git a/mailpoet/tests/integration/Logging/LogHandlerTest.php b/mailpoet/tests/integration/Logging/LogHandlerTest.php index b69c488bb1..705cfa8e93 100644 --- a/mailpoet/tests/integration/Logging/LogHandlerTest.php +++ b/mailpoet/tests/integration/Logging/LogHandlerTest.php @@ -37,7 +37,7 @@ class LogHandlerTest extends \MailPoetTest { ]); $log = $this->repository->findOneBy(['name' => 'name'], ['id' => 'desc']); - assert($log instanceof LogEntity); + $this->assertInstanceOf(LogEntity::class, $log); $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')); @@ -134,7 +134,7 @@ class LogHandlerTest extends \MailPoetTest { } $log = $logRepository->findOneBy(['name' => 'name'], ['id' => 'desc']); - assert($log instanceof LogEntity); + $this->assertInstanceOf(LogEntity::class, $log); $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')); diff --git a/mailpoet/tests/integration/Models/CustomFieldTest.php b/mailpoet/tests/integration/Models/CustomFieldTest.php index 601066764b..759cfa5a7a 100644 --- a/mailpoet/tests/integration/Models/CustomFieldTest.php +++ b/mailpoet/tests/integration/Models/CustomFieldTest.php @@ -85,19 +85,19 @@ class CustomFieldTest extends \MailPoetTest { public function testItHasACreatedAtOnCreation() { $customField = CustomField::findOne($this->customField->id); - assert($customField instanceof CustomField); + $this->assertInstanceOf(CustomField::class, $customField); expect($customField->createdAt)->notNull(); } public function testItHasAnUpdatedAtOnCreation() { $customField = CustomField::findOne($this->customField->id); - assert($customField instanceof CustomField); + $this->assertInstanceOf(CustomField::class, $customField); expect($customField->updatedAt)->equals($customField->createdAt); } public function testItUpdatesTheUpdatedAtOnUpdate() { $customField = CustomField::findOne($this->customField->id); - assert($customField instanceof CustomField); + $this->assertInstanceOf(CustomField::class, $customField); $createdAt = $customField->createdAt; sleep(1); @@ -106,7 +106,7 @@ class CustomFieldTest extends \MailPoetTest { $customField->save(); $updatedCustomField = CustomField::findOne($customField->id); - assert($updatedCustomField instanceof CustomField); + $this->assertInstanceOf(CustomField::class, $updatedCustomField); expect($updatedCustomField->createdAt)->equals($createdAt); $isTimeUpdated = ( $updatedCustomField->updatedAt > $updatedCustomField->createdAt @@ -125,7 +125,7 @@ class CustomFieldTest extends \MailPoetTest { $association->save(); } $customField = CustomField::findOne($this->customField->id); - assert($customField instanceof CustomField); + $this->assertInstanceOf(CustomField::class, $customField); $subscribers = $customField->subscribers()->findArray(); expect(count($subscribers))->equals(2); } @@ -139,7 +139,7 @@ class CustomFieldTest extends \MailPoetTest { $association->value = '12/12/2012'; $association->save(); $customField = CustomField::findOne($this->customField->id); - assert($customField instanceof CustomField); + $this->assertInstanceOf(CustomField::class, $customField); $subscriber = $customField->subscribers()->findOne(); expect($subscriber->value)->equals($association->value); } diff --git a/mailpoet/tests/integration/Models/NewsletterTest.php b/mailpoet/tests/integration/Models/NewsletterTest.php index 791016803b..be90fb3951 100644 --- a/mailpoet/tests/integration/Models/NewsletterTest.php +++ b/mailpoet/tests/integration/Models/NewsletterTest.php @@ -72,43 +72,43 @@ class NewsletterTest extends \MailPoetTest { public function testItHasASubject() { $newsletter = Newsletter::findOne($this->newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); expect($newsletter->subject)->equals($this->newsletter->subject); } public function testItHasAType() { $newsletter = Newsletter::findOne($this->newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); expect($newsletter->type)->equals($this->newsletter->type); } public function testItHasABody() { $newsletter = Newsletter::findOne($this->newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); expect($newsletter->body)->equals($this->newsletter->body); } public function testItHasPreheader() { $newsletter = Newsletter::findOne($this->newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); expect($newsletter->preheader)->equals($this->newsletter->preheader); } public function testItHasACreatedAtOnCreation() { $newsletter = Newsletter::findOne($this->newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); expect($newsletter->createdAt)->notNull(); } public function testItHasAnUpdatedAtOnCreation() { $newsletter = Newsletter::findOne($this->newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); expect($newsletter->updatedAt)->equals($newsletter->createdAt); } public function testItUpdatesTheUpdatedAtOnUpdate() { $newsletter = Newsletter::findOne($this->newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); $createdAt = $newsletter->createdAt; sleep(1); @@ -117,7 +117,7 @@ class NewsletterTest extends \MailPoetTest { $newsletter->save(); $updatedNewsletter = Newsletter::findOne($newsletter->id); - assert($updatedNewsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $updatedNewsletter); expect($updatedNewsletter->createdAt)->equals($createdAt); $isTimeUpdated = ( $updatedNewsletter->updatedAt > $updatedNewsletter->createdAt @@ -176,7 +176,7 @@ class NewsletterTest extends \MailPoetTest { $newsletter = Newsletter::where('subject', 'new newsletter') ->findOne(); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); expect($newsletter->subject)->equals('new newsletter'); $isUpdated = Newsletter::createOrUpdate( @@ -185,7 +185,7 @@ class NewsletterTest extends \MailPoetTest { 'subject' => 'updated newsletter', ]); $newsletter = Newsletter::findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); expect($newsletter->subject)->equals('updated newsletter'); } @@ -202,7 +202,7 @@ class NewsletterTest extends \MailPoetTest { $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_STANDARD) ->findOne($this->newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); expect($newsletter->event)->equals($newsletterOption->getValue()); } @@ -416,7 +416,7 @@ class NewsletterTest extends \MailPoetTest { $data = ['subject' => 'duplicate newsletter']; $duplicateNewsletter = $this->newsletter->duplicate($data); $duplicateNewsletter = Newsletter::findOne($duplicateNewsletter->id); - assert($duplicateNewsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $duplicateNewsletter); // hash is different expect($duplicateNewsletter->hash)->notEquals($this->newsletter->hash); expect(strlen($duplicateNewsletter->hash))->equals(Security::HASH_LENGTH); @@ -453,7 +453,7 @@ class NewsletterTest extends \MailPoetTest { // if meta option exists, it should be returned as an array $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_AUTOMATIC)->findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); expect($newsletter->getMeta())->equals($meta); } @@ -470,7 +470,7 @@ class NewsletterTest extends \MailPoetTest { ]); $newsletter->setStatus(Newsletter::STATUS_DRAFT); $taskFound = ScheduledTask::findOne($task->id()); - assert($taskFound instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $taskFound); expect($taskFound->status)->equals(ScheduledTask::STATUS_PAUSED); } } @@ -492,7 +492,7 @@ class NewsletterTest extends \MailPoetTest { ]); $newsletter->setStatus(Newsletter::STATUS_ACTIVE); $taskFound = ScheduledTask::findOne($task->id()); - assert($taskFound instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $taskFound); expect($taskFound->status)->equals(ScheduledTask::STATUS_SCHEDULED); } } @@ -510,7 +510,7 @@ class NewsletterTest extends \MailPoetTest { private function reloadNewsletter(Newsletter $newsletter): Newsletter { $newsletter = Newsletter::findOne($newsletter->id); - assert($newsletter instanceof Newsletter); + $this->assertInstanceOf(Newsletter::class, $newsletter); return $newsletter; } diff --git a/mailpoet/tests/integration/Models/ScheduledTaskTest.php b/mailpoet/tests/integration/Models/ScheduledTaskTest.php index 38fe0bb916..c9c20a6413 100644 --- a/mailpoet/tests/integration/Models/ScheduledTaskTest.php +++ b/mailpoet/tests/integration/Models/ScheduledTaskTest.php @@ -70,16 +70,16 @@ class ScheduledTaskTest extends \MailPoetTest { ]); ScheduledTask::setScheduledAllByNewsletter($newsletter); $task1Found = ScheduledTask::findOne($task1->id()); - assert($task1Found instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $task1Found); expect($task1Found->status)->equals(ScheduledTask::STATUS_SCHEDULED); $task2Found = ScheduledTask::findOne($task2->id()); - assert($task2Found instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $task2Found); expect($task2Found->status)->equals(ScheduledTask::STATUS_COMPLETED); $task3Found = ScheduledTask::findOne($task3->id()); - assert($task3Found instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $task3Found); expect($task3Found->status)->equals(ScheduledTask::STATUS_SCHEDULED); $outdatedTaskFound = ScheduledTask::findOne($outdatedTask->id()); - assert($outdatedTaskFound instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $outdatedTaskFound); expect($outdatedTaskFound->status)->equals(ScheduledTask::STATUS_PAUSED); } @@ -103,10 +103,10 @@ class ScheduledTaskTest extends \MailPoetTest { ]); ScheduledTask::pauseAllByNewsletter($newsletter); $task1Found = ScheduledTask::findOne($task1->id()); - assert($task1Found instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $task1Found); expect($task1Found->status)->equals(ScheduledTask::STATUS_COMPLETED); $task2Found = ScheduledTask::findOne($task2->id()); - assert($task2Found instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $task2Found); expect($task2Found->status)->equals(ScheduledTask::STATUS_PAUSED); } @@ -134,7 +134,7 @@ class ScheduledTaskTest extends \MailPoetTest { public function testItJsonEncodesMetaWhenSaving() { $task = ScheduledTask::create(); - assert($task instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $task); $meta = [ 'some' => 'value', ]; @@ -142,7 +142,7 @@ class ScheduledTaskTest extends \MailPoetTest { $task->save(); $task = ScheduledTask::findOne($task->id); - assert($task instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $task); /** @var string $taskMeta */ $taskMeta = $task->meta; @@ -157,7 +157,7 @@ class ScheduledTaskTest extends \MailPoetTest { $task->save(); $task = ScheduledTask::findOne($task->id); - assert($task instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $task); expect(Helpers::isJson($task->meta))->false(); expect($task->meta)->equals($meta); diff --git a/mailpoet/tests/integration/Models/SegmentTest.php b/mailpoet/tests/integration/Models/SegmentTest.php index 216539e369..7bcca57866 100644 --- a/mailpoet/tests/integration/Models/SegmentTest.php +++ b/mailpoet/tests/integration/Models/SegmentTest.php @@ -98,20 +98,20 @@ class SegmentTest extends \MailPoetTest { public function testItHasACreatedAtOnCreation() { $segment = Segment::findOne($this->segment->id); - assert($segment instanceof Segment); + $this->assertInstanceOf(Segment::class, $segment); expect($segment->createdAt)->notNull(); } public function testItHasAnUpdatedAtOnCreation() { $segment = Segment::findOne($this->segment->id); - assert($segment instanceof Segment); + $this->assertInstanceOf(Segment::class, $segment); expect($segment->updatedAt) ->equals($segment->createdAt); } public function testItUpdatesTheUpdatedAtOnUpdate() { $segment = Segment::findOne($this->segment->id); - assert($segment instanceof Segment); + $this->assertInstanceOf(Segment::class, $segment); $createdAt = $segment->createdAt; sleep(1); @@ -120,7 +120,7 @@ class SegmentTest extends \MailPoetTest { $segment->save(); $updatedSegment = Segment::findOne($segment->id); - assert($updatedSegment instanceof Segment); + $this->assertInstanceOf(Segment::class, $updatedSegment); expect($updatedSegment->createdAt)->equals($createdAt); $isTimeUpdated = ( $updatedSegment->updatedAt > $updatedSegment->createdAt @@ -137,7 +137,7 @@ class SegmentTest extends \MailPoetTest { $segment = Segment::where('name', 'new list') ->findOne(); - assert($segment instanceof Segment); + $this->assertInstanceOf(Segment::class, $segment); expect($segment->name)->equals('new list'); $isUpdated = Segment::createOrUpdate( @@ -147,7 +147,7 @@ class SegmentTest extends \MailPoetTest { ]); $segment = Segment::where('name', 'updated list') ->findOne(); - assert($segment instanceof Segment); + $this->assertInstanceOf(Segment::class, $segment); expect($segment->name)->equals('updated list'); } @@ -162,7 +162,7 @@ class SegmentTest extends \MailPoetTest { $association->save(); } $segment = Segment::findOne($this->segment->id); - assert($segment instanceof Segment); + $this->assertInstanceOf(Segment::class, $segment); $subscribers = $segment->subscribers() ->findArray(); @@ -180,7 +180,7 @@ class SegmentTest extends \MailPoetTest { $association->save(); } $segment = Segment::findOne($this->segment->id); - assert($segment instanceof Segment); + $this->assertInstanceOf(Segment::class, $segment); $newsletters = $segment->newsletters() ->findArray(); diff --git a/mailpoet/tests/integration/Models/SendingQueueTest.php b/mailpoet/tests/integration/Models/SendingQueueTest.php index c1820d4f16..22d4470ba2 100644 --- a/mailpoet/tests/integration/Models/SendingQueueTest.php +++ b/mailpoet/tests/integration/Models/SendingQueueTest.php @@ -57,7 +57,7 @@ class SendingQueueTest extends \MailPoetTest { $queue->save(); $queue = SendingQueue::findOne($queue->id); - assert($queue instanceof SendingQueue); + $this->assertInstanceOf(SendingQueue::class, $queue); /** @var string queue_newsletter_rendered_body */ $queueNewsletterRenderedBody = $queue->newsletterRenderedBody; @@ -67,7 +67,7 @@ class SendingQueueTest extends \MailPoetTest { public function testItJsonEncodesMetaWhenSaving() { $queue = SendingQueue::create(); - assert($queue instanceof SendingQueue); + $this->assertInstanceOf(SendingQueue::class, $queue); $meta = [ 'some' => 'value', ]; @@ -77,7 +77,7 @@ class SendingQueueTest extends \MailPoetTest { $queue->save(); $queue = SendingQueue::findOne($queue->id); - assert($queue instanceof SendingQueue); + $this->assertInstanceOf(SendingQueue::class, $queue); expect(Helpers::isJson($queue->meta))->true(); assert(is_string($queue->meta)); @@ -93,7 +93,7 @@ class SendingQueueTest extends \MailPoetTest { $queue->save(); $queue = SendingQueue::findOne($queue->id); - assert($queue instanceof SendingQueue); + $this->assertInstanceOf(SendingQueue::class, $queue); expect(Helpers::isJson($queue->meta))->false(); expect($queue->meta)->equals($meta); @@ -112,13 +112,13 @@ class SendingQueueTest extends \MailPoetTest { ] ); $sendingQueue = SendingQueue::findOne($queue->id); - assert($sendingQueue instanceof SendingQueue); + $this->assertInstanceOf(SendingQueue::class, $sendingQueue); expect($sendingQueue->newsletterRenderedBody)->equals(serialize($newsletterRenderedBody)); // re-saving the queue will re-rencode the body using json_encode() $sendingQueue->save(); $sendingQueue = SendingQueue::findOne($queue->id); - assert($sendingQueue instanceof SendingQueue); + $this->assertInstanceOf(SendingQueue::class, $sendingQueue); expect($sendingQueue->newsletterRenderedBody)->equals(json_encode($newsletterRenderedBody)); } diff --git a/mailpoet/tests/integration/Models/SubscriberSegmentTest.php b/mailpoet/tests/integration/Models/SubscriberSegmentTest.php index 0bf7cab599..0842a16523 100644 --- a/mailpoet/tests/integration/Models/SubscriberSegmentTest.php +++ b/mailpoet/tests/integration/Models/SubscriberSegmentTest.php @@ -251,7 +251,7 @@ class SubscriberSegmentTest extends \MailPoetTest { // check that we have the proper status $created = SubscriberSegment::findOne($result->id); - assert($created instanceof SubscriberSegment); + $this->assertInstanceOf(SubscriberSegment::class, $created); expect($created->status)->equals(Subscriber::STATUS_SUBSCRIBED); // update same combination of subscriber/segment with a different status @@ -265,7 +265,7 @@ class SubscriberSegmentTest extends \MailPoetTest { // check updated status $updated = SubscriberSegment::findOne($created->id); - assert($updated instanceof SubscriberSegment); + $this->assertInstanceOf(SubscriberSegment::class, $updated); expect($updated->status)->equals(Subscriber::STATUS_UNSUBSCRIBED); // we should have only one relationship for that user diff --git a/mailpoet/tests/integration/Newsletter/Links/LinksTest.php b/mailpoet/tests/integration/Newsletter/Links/LinksTest.php index 811c4c9293..22b8901f11 100644 --- a/mailpoet/tests/integration/Newsletter/Links/LinksTest.php +++ b/mailpoet/tests/integration/Newsletter/Links/LinksTest.php @@ -204,7 +204,7 @@ class LinksTest extends \MailPoetTest { // 1 database record was created $newsletterLink = $this->newsletterLinkRepository->findOneBy(['newsletter' => 1, 'queue' => 1]); - assert($newsletterLink instanceof NewsletterLinkEntity); + $this->assertInstanceOf(NewsletterLinkEntity::class, $newsletterLink); expect($newsletterLink->getHash())->equals('123'); expect($newsletterLink->getUrl())->equals('http://example.com'); } diff --git a/mailpoet/tests/integration/Newsletter/NewsletterRepositoryTest.php b/mailpoet/tests/integration/Newsletter/NewsletterRepositoryTest.php index ec45219433..fee2a0ab79 100644 --- a/mailpoet/tests/integration/Newsletter/NewsletterRepositoryTest.php +++ b/mailpoet/tests/integration/Newsletter/NewsletterRepositoryTest.php @@ -53,11 +53,11 @@ class NewsletterRepositoryTest extends \MailPoetTest { // Should trash sending queue and task $standardQueue = $standardNewsletter->getLatestQueue(); - assert($standardQueue instanceof SendingQueueEntity); + $this->assertInstanceOf(SendingQueueEntity::class, $standardQueue); $this->entityManager->refresh($standardQueue); expect($standardQueue->getDeletedAt())->notNull(); $scheduledTask = $standardQueue->getTask(); - assert($scheduledTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask); $this->entityManager->refresh($scheduledTask); expect($scheduledTask->getDeletedAt())->notNull(); @@ -65,11 +65,11 @@ class NewsletterRepositoryTest extends \MailPoetTest { $this->entityManager->refresh($notificationHistory); expect($notificationHistory->getDeletedAt())->notNull(); $notificationHistory = $notificationHistory->getLatestQueue(); - assert($notificationHistory instanceof SendingQueueEntity); + $this->assertInstanceOf(SendingQueueEntity::class, $notificationHistory); $this->entityManager->refresh($notificationHistory); expect($notificationHistory->getDeletedAt())->notNull(); $scheduledTask = $notificationHistory->getTask(); - assert($scheduledTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask); $this->entityManager->refresh($scheduledTask); expect($scheduledTask->getDeletedAt())->notNull(); } @@ -95,11 +95,11 @@ class NewsletterRepositoryTest extends \MailPoetTest { // Should restore sending queue and task $standardQueue = $standardNewsletter->getLatestQueue(); - assert($standardQueue instanceof SendingQueueEntity); + $this->assertInstanceOf(SendingQueueEntity::class, $standardQueue); $this->entityManager->refresh($standardQueue); expect($standardQueue->getDeletedAt())->null(); $scheduledTask = $standardQueue->getTask(); - assert($scheduledTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask); $this->entityManager->refresh($scheduledTask); expect($scheduledTask->getDeletedAt())->null(); // Pause sending tasks which were in progress @@ -109,11 +109,11 @@ class NewsletterRepositoryTest extends \MailPoetTest { $this->entityManager->refresh($notificationHistory); expect($notificationHistory->getDeletedAt())->null(); $notificationHistoryQueue = $notificationHistory->getLatestQueue(); - assert($notificationHistoryQueue instanceof SendingQueueEntity); + $this->assertInstanceOf(SendingQueueEntity::class, $notificationHistoryQueue); $this->entityManager->refresh($notificationHistoryQueue); expect($notificationHistoryQueue->getDeletedAt())->null(); $scheduledTask = $notificationHistoryQueue->getTask(); - assert($scheduledTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask); $this->entityManager->refresh($scheduledTask); expect($scheduledTask->getDeletedAt())->null(); expect($scheduledTask->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED); @@ -127,23 +127,23 @@ class NewsletterRepositoryTest extends \MailPoetTest { $notificationHistoryQueue = $this->createQueueWithTaskAndSegmentAndSubscribers($notificationHistory); $standardSegment = $standardNewsletter->getNewsletterSegments()->first(); - assert($standardSegment instanceof NewsletterSegmentEntity); + $this->assertInstanceOf(NewsletterSegmentEntity::class, $standardSegment); $standardScheduledTaks = $standardQueue->getTask(); - assert($standardScheduledTaks instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $standardScheduledTaks); $standardScheduledTaskSubscriber = $this->taskSubscribersRepository->findOneBy(['task' => $standardScheduledTaks]); - assert($standardScheduledTaskSubscriber instanceof ScheduledTaskSubscriberEntity); + $this->assertInstanceOf(ScheduledTaskSubscriberEntity::class, $standardScheduledTaskSubscriber); $notificationHistoryScheduledTask = $notificationHistoryQueue->getTask(); - assert($notificationHistoryScheduledTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $notificationHistoryScheduledTask); $notificationHistorySegment = $notificationHistory->getNewsletterSegments()->first(); - assert($notificationHistorySegment instanceof NewsletterSegmentEntity); + $this->assertInstanceOf(NewsletterSegmentEntity::class, $notificationHistorySegment); $notificationHistoryScheduledTaskSubscriber = $this->taskSubscribersRepository->findOneBy(['task' => $notificationHistoryScheduledTask]); - assert($notificationHistoryScheduledTaskSubscriber instanceof ScheduledTaskSubscriberEntity); + $this->assertInstanceOf(ScheduledTaskSubscriberEntity::class, $notificationHistoryScheduledTaskSubscriber); $standardStatsNotification = $this->createStatNotification($standardNewsletter); $standardStatsNotificationScheduledTask = $standardStatsNotification->getTask(); - assert($standardStatsNotificationScheduledTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $standardStatsNotificationScheduledTask); $notificationHistoryStatsNotification = $this->createStatNotification($notificationHistory); $notificationHistoryStatsNotificationScheduledTask = $notificationHistoryStatsNotification->getTask(); - assert($notificationHistoryStatsNotificationScheduledTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $notificationHistoryStatsNotificationScheduledTask); $standardLink = $this->createNewsletterLink($standardNewsletter, $standardQueue); $notificationHistoryLink = $this->createNewsletterLink($notificationHistory, $notificationHistoryQueue); $optionField = $this->createNewsletterOptionField(NewsletterEntity::TYPE_NOTIFICATION, 'option'); @@ -151,7 +151,7 @@ class NewsletterRepositoryTest extends \MailPoetTest { $newsletterPost = $this->createNewsletterPost($notification, 1); $subscriber = $standardScheduledTaskSubscriber->getSubscriber(); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); $statisticsNewsletter = $this->createNewsletterStatistics($standardNewsletter, $standardQueue, $subscriber); $statisticsOpen = $this->createOpenStatistics($standardNewsletter, $standardQueue, $subscriber); $statisticsClick = $this->createClickStatistics($standardNewsletter, $standardQueue, $subscriber, $standardLink); diff --git a/mailpoet/tests/integration/Newsletter/NewsletterSaveControllerTest.php b/mailpoet/tests/integration/Newsletter/NewsletterSaveControllerTest.php index 9d6a721aa4..e545d41f46 100644 --- a/mailpoet/tests/integration/Newsletter/NewsletterSaveControllerTest.php +++ b/mailpoet/tests/integration/Newsletter/NewsletterSaveControllerTest.php @@ -70,7 +70,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest { $newsletter = $this->saveController->save($newsletterData); $updatedQueue = $newsletter->getLatestQueue(); - assert($updatedQueue instanceof SendingQueueEntity); // PHPStan + $this->assertInstanceOf(SendingQueueEntity::class, $updatedQueue); // PHPStan expect($updatedQueue->getNewsletterRenderedSubject())->null(); expect($updatedQueue->getNewsletterRenderedBody())->null(); } @@ -87,7 +87,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest { $this->saveController->save($newsletterData); $updatedQueue = $newsletter->getLatestQueue(); - assert($updatedQueue instanceof SendingQueueEntity); // PHPStan + $this->assertInstanceOf(SendingQueueEntity::class, $updatedQueue); // PHPStan expect($updatedQueue->getNewsletterRenderedSubject())->same('My Updated Newsletter'); expect($updatedQueue->getNewsletterRenderedBody())->hasKey('html'); expect($updatedQueue->getNewsletterRenderedBody())->hasKey('text'); @@ -115,7 +115,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest { return $optionField && $optionField->getName() === 'schedule'; })->first(); - assert($scheduleOption instanceof NewsletterOptionEntity); // PHPStan + $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption); // PHPStan expect($scheduleOption->getValue())->equals('0 14 * * 1'); // schedule should be recalculated when options change @@ -127,7 +127,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest { return $optionField && $optionField->getName() === 'schedule'; })->first(); - assert($scheduleOption instanceof NewsletterOptionEntity); // PHPStan + $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption); // PHPStan expect($scheduleOption->getValue())->equals('* * * * *'); } @@ -139,12 +139,12 @@ class NewsletterSaveControllerTest extends \MailPoetTest { $currentTime = Carbon::now(); $queue1 = $this->createQueueWithTask($newsletter); $task1 = $queue1->getTask(); - assert($task1 instanceof ScheduledTaskEntity); // PHPStan + $this->assertInstanceOf(ScheduledTaskEntity::class, $task1); // PHPStan $task1->setScheduledAt($currentTime); $queue2 = $this->createQueueWithTask($newsletter); $task2 = $queue2->getTask(); - assert($task2 instanceof ScheduledTaskEntity); // PHPStan + $this->assertInstanceOf(ScheduledTaskEntity::class, $task2); // PHPStan $task2->setStatus(null); $this->entityManager->flush(); @@ -170,7 +170,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest { return $optionField && $optionField->getName() === 'schedule'; })->first(); expect($task1->getScheduledAt())->notEquals($currentTime); - assert($scheduleOption instanceof NewsletterOptionEntity); // PHPStan + $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption); // PHPStan expect($task1->getScheduledAt())->equals($this->scheduler->getNextRunDate($scheduleOption->getValue())); expect($task2->getScheduledAt())->null(); @@ -195,9 +195,9 @@ class NewsletterSaveControllerTest extends \MailPoetTest { $newsletter = $this->saveController->save($newsletterData); expect(count($newsletter->getNewsletterSegments()))->equals(1); $newsletterSegment = $newsletter->getNewsletterSegments()->first(); - assert($newsletterSegment instanceof NewsletterSegmentEntity); // PHPStan + $this->assertInstanceOf(NewsletterSegmentEntity::class, $newsletterSegment); // PHPStan $segment = $newsletterSegment->getSegment(); - assert($segment instanceof SegmentEntity); // PHPStan + $this->assertInstanceOf(SegmentEntity::class, $segment); // PHPStan expect($segment->getName())->equals('Segment 1'); } @@ -230,7 +230,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest { 'text' => 'text', ]); $task = $queue->getTask(); - assert($task instanceof ScheduledTaskEntity); // PHPStan + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); // PHPStan $task->setScheduledAt(Carbon::now()); $this->entityManager->flush(); $queueId = $queue->getId(); diff --git a/mailpoet/tests/integration/Newsletter/Scheduler/PostNotificationTest.php b/mailpoet/tests/integration/Newsletter/Scheduler/PostNotificationTest.php index ff40cbb40a..02ad01118f 100644 --- a/mailpoet/tests/integration/Newsletter/Scheduler/PostNotificationTest.php +++ b/mailpoet/tests/integration/Newsletter/Scheduler/PostNotificationTest.php @@ -87,7 +87,7 @@ class PostNotificationTest extends \MailPoetTest { $newsletterId = $newsletter->getId(); $this->entityManager->clear(); $newsletter = $this->newslettersRepository->findOneById($newsletterId); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); $this->postNotificationScheduler->createPostNotificationSendingTask($newsletter); expect($this->sendingQueuesRepository->findBy(['newsletter' => $newsletter]))->count(1); } @@ -106,7 +106,7 @@ class PostNotificationTest extends \MailPoetTest { // another queue record should be created because the first one was paused $scheduleOption = $newsletter->getOption(NewsletterOptionFieldEntity::NAME_SCHEDULE); - assert($scheduleOption instanceof NewsletterOptionEntity); + $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption); $scheduleOption->setValue('* 10 * * *'); // different time to not clash with the first queue $this->newsletterOptionsRepository->flush(); $sendingTask = $this->postNotificationScheduler->createPostNotificationSendingTask($newsletter); @@ -124,7 +124,7 @@ class PostNotificationTest extends \MailPoetTest { $newsletterId = $newsletter->getId(); $this->entityManager->clear(); $newsletter = $this->newslettersRepository->findOneById($newsletterId); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); $this->postNotificationScheduler->createPostNotificationSendingTask($newsletter); expect($this->sendingQueuesRepository->findBy(['newsletter' => $newsletter]))->count(2); } diff --git a/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php b/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php index 7d0aed09b9..51d2443a96 100644 --- a/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php +++ b/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php @@ -95,10 +95,10 @@ class WelcomeTest extends \MailPoetTest { $this->assertInstanceOf(SendingQueueEntity::class, $queue); expect($queue->getId())->greaterOrEquals(1); $task = $queue->getTask(); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH); $scheduledAt = $task->getScheduledAt(); - assert($scheduledAt instanceof \DateTimeInterface); + $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt); expect($scheduledAt->format('Y-m-d H:i')) ->equals($currentTime->addHours(2)->format('Y-m-d H:i')); } @@ -120,10 +120,10 @@ class WelcomeTest extends \MailPoetTest { $this->assertInstanceOf(SendingQueueEntity::class, $queue); expect($queue->getId())->greaterOrEquals(1); $task = $queue->getTask(); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH); $scheduledAt = $task->getScheduledAt(); - assert($scheduledAt instanceof \DateTimeInterface); + $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt); expect($scheduledAt->format('Y-m-d H:i')) ->equals($currentTime->addDays(2)->format('Y-m-d H:i')); } @@ -145,10 +145,10 @@ class WelcomeTest extends \MailPoetTest { $this->assertInstanceOf(SendingQueueEntity::class, $queue); expect($queue->getId())->greaterOrEquals(1); $task = $queue->getTask(); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH); $scheduledAt = $task->getScheduledAt(); - assert($scheduledAt instanceof \DateTimeInterface); + $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt); expect($scheduledAt->format('Y-m-d H:i')) ->equals($currentTime->addWeeks(2)->format('Y-m-d H:i')); } @@ -171,10 +171,10 @@ class WelcomeTest extends \MailPoetTest { $this->assertInstanceOf(SendingQueueEntity::class, $queue); expect($queue->getId())->greaterOrEquals(1); $task = $queue->getTask(); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); expect($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH); $scheduledAt = $task->getScheduledAt(); - assert($scheduledAt instanceof \DateTimeInterface); + $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt); expect($scheduledAt->format('Y-m-d H:i')) ->equals($currentTime->format('Y-m-d H:i')); } @@ -220,9 +220,9 @@ class WelcomeTest extends \MailPoetTest { $queue = $newsletter->getLatestQueue(); $this->assertInstanceOf(SendingQueueEntity::class, $queue); $task = $queue->getTask(); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); $scheduledAt = $task->getScheduledAt(); - assert($scheduledAt instanceof \DateTimeInterface); + $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt); expect($scheduledAt->format('Y-m-d H:i')) ->equals($currentTime->addDay()->format('Y-m-d H:i')); expect($result[0]->id())->equals($queue->getId()); @@ -390,9 +390,9 @@ class WelcomeTest extends \MailPoetTest { $queue = $newsletter->getLatestQueue(); $this->assertInstanceOf(SendingQueueEntity::class, $queue); $task = $queue->getTask(); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); $scheduledAt = $task->getScheduledAt(); - assert($scheduledAt instanceof \DateTimeInterface); + $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt); expect($scheduledAt->format('Y-m-d H:i')) ->equals($currentTime->addDay()->format('Y-m-d H:i')); } @@ -418,9 +418,9 @@ class WelcomeTest extends \MailPoetTest { $queue = $newsletter->getLatestQueue(); $this->assertInstanceOf(SendingQueueEntity::class, $queue); $task = $queue->getTask(); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); $scheduledAt = $task->getScheduledAt(); - assert($scheduledAt instanceof \DateTimeInterface); + $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt); expect($scheduledAt->format('Y-m-d H:i')) ->equals($currentTime->addDay()->format('Y-m-d H:i')); } diff --git a/mailpoet/tests/integration/Newsletter/ShortcodesTest.php b/mailpoet/tests/integration/Newsletter/ShortcodesTest.php index 698585b27c..2c53499496 100644 --- a/mailpoet/tests/integration/Newsletter/ShortcodesTest.php +++ b/mailpoet/tests/integration/Newsletter/ShortcodesTest.php @@ -159,7 +159,7 @@ class ShortcodesTest extends \MailPoetTest { $result = $shortcodesObject->process(['[newsletter:post_title]'], $content); $wpPost = get_post($this->wPPost); - assert($wpPost instanceof WP_Post); + $this->assertInstanceOf(WP_Post::class, $wpPost); expect($result['0'])->equals($wpPost->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps } diff --git a/mailpoet/tests/integration/Router/Endpoints/TrackTest.php b/mailpoet/tests/integration/Router/Endpoints/TrackTest.php index 0d76e9377c..c3c9910c7d 100644 --- a/mailpoet/tests/integration/Router/Endpoints/TrackTest.php +++ b/mailpoet/tests/integration/Router/Endpoints/TrackTest.php @@ -76,7 +76,7 @@ class TrackTest extends \MailPoetTest { 'preview' => false, ]; $queue = SendingQueue::findOne($queue->getId()); - assert($queue instanceof SendingQueue); + $this->assertInstanceOf(SendingQueue::class, $queue); $queue = SendingTask::createFromQueue($queue); $queue->updateProcessedSubscribers([$subscriber->getId()]); // instantiate class diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/DynamicSegmentFilterRepositoryTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/DynamicSegmentFilterRepositoryTest.php index 12cc2f8983..437b52baa6 100644 --- a/mailpoet/tests/integration/Segments/DynamicSegments/DynamicSegmentFilterRepositoryTest.php +++ b/mailpoet/tests/integration/Segments/DynamicSegments/DynamicSegmentFilterRepositoryTest.php @@ -31,7 +31,7 @@ class DynamicSegmentFilterRepositoryTest extends \MailPoetTest { DynamicSegmentFilterData::TYPE_WOOCOMMERCE, WooCommerceTotalSpent::ACTION_TOTAL_SPENT ); - assert($dynamicFilter instanceof DynamicSegmentFilterEntity); + $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $dynamicFilter); expect($dynamicFilter->getFilterData()->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE); expect($dynamicFilter->getFilterData()->getAction())->equals(WooCommerceTotalSpent::ACTION_TOTAL_SPENT); diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/FilterHandlerTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/FilterHandlerTest.php index 249fdccc2f..fca5d64bf5 100644 --- a/mailpoet/tests/integration/Segments/DynamicSegments/FilterHandlerTest.php +++ b/mailpoet/tests/integration/Segments/DynamicSegments/FilterHandlerTest.php @@ -38,17 +38,17 @@ class FilterHandlerTest extends \MailPoetTest { /** @var SubscribersRepository $subscribersRepository */ $subscribersRepository = $this->diContainer->get(SubscribersRepository::class); $subscriber1 = $subscribersRepository->findOneBy(['email' => 'user-role-test1@example.com']); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); $subscriber1->setStatus(SubscriberEntity::STATUS_SUBSCRIBED); $subscriber1->setLastSubscribedAt(new Carbon()); $this->subscriber1 = $subscriber1; $subscriber2 = $subscribersRepository->findOneBy(['email' => 'user-role-test2@example.com']); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); $subscriber2->setStatus(SubscriberEntity::STATUS_SUBSCRIBED); $subscriber2->setLastSubscribedAt(new Carbon()); $this->subscriber2 = $subscriber2; $subscriber3 = $subscribersRepository->findOneBy(['email' => 'user-role-test3@example.com']); - assert($subscriber3 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber3); $subscriber3->setStatus(SubscriberEntity::STATUS_SUBSCRIBED); $subscriber3->setLastSubscribedAt(new Carbon()); $this->entityManager->flush(); @@ -57,13 +57,13 @@ class FilterHandlerTest extends \MailPoetTest { public function testItAppliesFilter(): void { $segment = $this->getSegment('editor'); $statement = $this->filterHandler->apply($this->getQueryBuilder(), $segment)->execute(); - assert($statement instanceof Statement); + $this->assertInstanceOf(Statement::class, $statement); $result = $statement->fetchAll(); expect($result)->count(2); $subscriber1 = $this->entityManager->find(SubscriberEntity::class, $result[0]['id']); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); $subscriber2 = $this->entityManager->find(SubscriberEntity::class, $result[1]['id']); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); expect($subscriber1->getEmail())->equals('user-role-test1@example.com'); expect($subscriber2->getEmail())->equals('user-role-test3@example.com'); } diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/EmailActionClickAnyTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/EmailActionClickAnyTest.php index 9256043385..5f78551804 100644 --- a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/EmailActionClickAnyTest.php +++ b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/EmailActionClickAnyTest.php @@ -118,7 +118,7 @@ class EmailActionClickAnyTest extends \MailPoetTest { private function createStatsNewsletter(SubscriberEntity $subscriber): StatisticsNewsletterEntity { $queue = $this->newsletter->getLatestQueue(); - assert($queue instanceof SendingQueueEntity); + $this->assertInstanceOf(SendingQueueEntity::class, $queue); $stats = new StatisticsNewsletterEntity($this->newsletter, $queue, $subscriber); $this->entityManager->persist($stats); $this->entityManager->flush(); @@ -127,7 +127,7 @@ class EmailActionClickAnyTest extends \MailPoetTest { private function createStatisticsOpens(SubscriberEntity $subscriber): StatisticsOpenEntity { $queue = $this->newsletter->getLatestQueue(); - assert($queue instanceof SendingQueueEntity); + $this->assertInstanceOf(SendingQueueEntity::class, $queue); $open = new StatisticsOpenEntity($this->newsletter, $queue, $subscriber); $this->entityManager->persist($open); $this->entityManager->flush(); diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceCountryTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceCountryTest.php index 35927511df..f8a7bae5a8 100644 --- a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceCountryTest.php +++ b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceCountryTest.php @@ -44,7 +44,7 @@ class WooCommerceCountryTest extends \MailPoetTest { $segmentFilter = $this->getSegmentFilter('CZ'); $queryBuilder = $this->wooCommerceCountry->apply($this->getQueryBuilder(), $segmentFilter); $statement = $queryBuilder->execute(); - assert($statement instanceof DriverStatement); + $this->assertInstanceOf(DriverStatement::class, $statement); $result = $statement->fetchAll(); expect(count($result))->equals(1); $subscriber1 = $this->subscribersRepository->findOneById($result[0]['inner_subscriber_id']); @@ -57,11 +57,11 @@ class WooCommerceCountryTest extends \MailPoetTest { $segmentFilter = $this->getSegmentFilter(['CZ','US']); $queryBuilder = $this->wooCommerceCountry->apply($this->getQueryBuilder(), $segmentFilter); $statement = $queryBuilder->execute(); - assert($statement instanceof DriverStatement); + $this->assertInstanceOf(DriverStatement::class, $statement); $result = $statement->fetchAll(); expect(count($result))->equals(3); $subscriber1 = $this->subscribersRepository->findOneById($result[0]['inner_subscriber_id']); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); expect($subscriber1->getEmail())->equals('customer1@example.com'); $subscriber2 = $this->subscribersRepository->findOneById($result[1]['inner_subscriber_id']); @@ -69,7 +69,7 @@ class WooCommerceCountryTest extends \MailPoetTest { expect($subscriber2)->isInstanceOf(SubscriberEntity::class); expect($subscriber2->getEmail())->equals('customer2@example.com'); $subscriber3 = $this->subscribersRepository->findOneById($result[2]['inner_subscriber_id']); - assert($subscriber3 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber3); $this->assertInstanceOf(SubscriberEntity::class, $subscriber3); expect($subscriber3->getEmail())->equals('customer3@example.com'); } @@ -78,7 +78,7 @@ class WooCommerceCountryTest extends \MailPoetTest { $segmentFilter = $this->getSegmentFilter(['CZ','US'], DynamicSegmentFilterData::OPERATOR_NONE); $queryBuilder = $this->wooCommerceCountry->apply($this->getQueryBuilder(), $segmentFilter); $statement = $queryBuilder->execute(); - assert($statement instanceof DriverStatement); + $this->assertInstanceOf(DriverStatement::class, $statement); $result = $statement->fetchAll(); expect(count($result))->equals(1); $subscriber1 = $this->subscribersRepository->findOneById($result[0]['inner_subscriber_id']); diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceTotalSpentTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceTotalSpentTest.php index ac0e258943..2599618f76 100644 --- a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceTotalSpentTest.php +++ b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceTotalSpentTest.php @@ -51,7 +51,7 @@ class WooCommerceTotalSpentTest extends \MailPoetTest { $result = $statement instanceof Statement ? $statement->fetchAll() : []; expect($result)->count(1); $subscriber1 = $this->subscribersRepository->findOneById($result[0]['inner_subscriber_id']); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); expect($subscriber1)->isInstanceOf(SubscriberEntity::class); expect($subscriber1->getEmail())->equals('customer2@example.com'); } @@ -63,11 +63,11 @@ class WooCommerceTotalSpentTest extends \MailPoetTest { $result = $statement instanceof Statement ? $statement->fetchAll() : []; expect($result)->count(2); $subscriber1 = $this->subscribersRepository->findOneById($result[0]['inner_subscriber_id']); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); expect($subscriber1)->isInstanceOf(SubscriberEntity::class); expect($subscriber1->getEmail())->equals('customer1@example.com'); $subscriber2 = $this->subscribersRepository->findOneById($result[1]['inner_subscriber_id']); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); expect($subscriber2)->isInstanceOf(SubscriberEntity::class); expect($subscriber2->getEmail())->equals('customer2@example.com'); } @@ -79,11 +79,11 @@ class WooCommerceTotalSpentTest extends \MailPoetTest { $result = $statement instanceof Statement ? $statement->fetchAll() : []; expect($result)->count(2); $subscriber1 = $this->subscribersRepository->findOneById($result[0]['inner_subscriber_id']); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); expect($subscriber1)->isInstanceOf(SubscriberEntity::class); expect($subscriber1->getEmail())->equals('customer1@example.com'); $subscriber2 = $this->subscribersRepository->findOneById($result[1]['inner_subscriber_id']); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); expect($subscriber2)->isInstanceOf(SubscriberEntity::class); expect($subscriber2->getEmail())->equals('customer3@example.com'); } @@ -95,7 +95,7 @@ class WooCommerceTotalSpentTest extends \MailPoetTest { $result = $statement instanceof Statement ? $statement->fetchAll() : []; expect($result)->count(1); $subscriber1 = $this->subscribersRepository->findOneById($result[0]['inner_subscriber_id']); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); expect($subscriber1)->isInstanceOf(SubscriberEntity::class); expect($subscriber1->getEmail())->equals('customer3@example.com'); } @@ -107,7 +107,7 @@ class WooCommerceTotalSpentTest extends \MailPoetTest { $result = $statement instanceof Statement ? $statement->fetchAll() : []; expect($result)->count(1); $subscriber1 = $this->subscribersRepository->findOneById($result[0]['inner_subscriber_id']); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); expect($subscriber1)->isInstanceOf(SubscriberEntity::class); expect($subscriber1->getEmail())->equals('customer1@example.com'); } diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/SegmentSaveControllerTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/SegmentSaveControllerTest.php index ff59493ed9..cf0d30fb6f 100644 --- a/mailpoet/tests/integration/Segments/DynamicSegments/SegmentSaveControllerTest.php +++ b/mailpoet/tests/integration/Segments/DynamicSegments/SegmentSaveControllerTest.php @@ -36,7 +36,7 @@ class SegmentSaveControllerTest extends \MailPoetTest { expect($segment->getDynamicFilters()->count())->equals(1); expect($segment->getType())->equals(SegmentEntity::TYPE_DYNAMIC); $filter = $segment->getDynamicFilters()->first(); - assert($filter instanceof DynamicSegmentFilterEntity); + $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $filter); expect($filter->getFilterData()->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE); expect($filter->getFilterData()->getAction())->equals(UserRole::TYPE); expect($filter->getFilterData()->getData())->equals([ @@ -70,7 +70,7 @@ class SegmentSaveControllerTest extends \MailPoetTest { expect($segment->getDynamicFilters()->count())->equals(1); expect($segment->getType())->equals(SegmentEntity::TYPE_DYNAMIC); $filter = $segment->getDynamicFilters()->first(); - assert($filter instanceof DynamicSegmentFilterEntity); + $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $filter); expect($filter->getFilterData()->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE); expect($filter->getFilterData()->getAction())->equals(UserRole::TYPE); expect($filter->getFilterData()->getData())->equals([ diff --git a/mailpoet/tests/integration/Segments/SegmentSaveControllerTest.php b/mailpoet/tests/integration/Segments/SegmentSaveControllerTest.php index 92dae4e338..c23e3d6c79 100644 --- a/mailpoet/tests/integration/Segments/SegmentSaveControllerTest.php +++ b/mailpoet/tests/integration/Segments/SegmentSaveControllerTest.php @@ -45,8 +45,8 @@ class SegmentSaveControllerTest extends \MailPoetTest { $subscriberSegments = $this->subscriberSegmentRepository->findBy(['segment' => $duplicate]); $subscriberDuplicate1 = $this->subscriberSegmentRepository->findOneBy(['segment' => $duplicate, 'subscriber' => $subscriber1]); $subscriberDuplicate2 = $this->subscriberSegmentRepository->findOneBy(['segment' => $duplicate, 'subscriber' => $subscriber2]); - assert($subscriberDuplicate1 instanceof SubscriberSegmentEntity); - assert($subscriberDuplicate2 instanceof SubscriberSegmentEntity); + $this->assertInstanceOf(SubscriberSegmentEntity::class, $subscriberDuplicate1); + $this->assertInstanceOf(SubscriberSegmentEntity::class, $subscriberDuplicate2); expect($duplicate->getName())->equals('Copy of ' . $segment->getName()); expect($duplicate->getDescription())->equals($segment->getDescription()); expect($duplicate->getType())->equals($segment->getType()); diff --git a/mailpoet/tests/integration/Segments/SegmentSubscribersRepositoryTest.php b/mailpoet/tests/integration/Segments/SegmentSubscribersRepositoryTest.php index 8ec4f76f3d..0673ac7c68 100644 --- a/mailpoet/tests/integration/Segments/SegmentSubscribersRepositoryTest.php +++ b/mailpoet/tests/integration/Segments/SegmentSubscribersRepositoryTest.php @@ -70,9 +70,9 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest { $wpUserSubscriber = $this->entityManager ->getRepository(SubscriberEntity::class) ->findOneBy(['email' => $wpUserEmail]); - assert($wpUserSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $wpUserSubscriber); $wpUserSubscriber->setStatus(SubscriberEntity::STATUS_SUBSCRIBED); - assert($wpUserSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $wpUserSubscriber); $subscriberNoList = $this->createSubscriberEntity(); // Subscriber without segment $this->entityManager->flush(); diff --git a/mailpoet/tests/integration/Segments/SegmentsSimpleListRepositoryTest.php b/mailpoet/tests/integration/Segments/SegmentsSimpleListRepositoryTest.php index bd6b237758..2531f81b14 100644 --- a/mailpoet/tests/integration/Segments/SegmentsSimpleListRepositoryTest.php +++ b/mailpoet/tests/integration/Segments/SegmentsSimpleListRepositoryTest.php @@ -37,7 +37,7 @@ class SegmentsSimpleListRepositoryTest extends \MailPoetTest { $wpUserSubscriber = $this->entityManager ->getRepository(SubscriberEntity::class) ->findOneBy(['email' => $wpUserEmail]); - assert($wpUserSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $wpUserSubscriber); $wpUserSubscriber->setStatus(SubscriberEntity::STATUS_SUBSCRIBED); $subscriber1 = $this->createSubscriberEntity(); diff --git a/mailpoet/tests/integration/Segments/WPTest.php b/mailpoet/tests/integration/Segments/WPTest.php index 4ea2164566..fba5f55dda 100644 --- a/mailpoet/tests/integration/Segments/WPTest.php +++ b/mailpoet/tests/integration/Segments/WPTest.php @@ -307,12 +307,12 @@ class WPTest extends \MailPoetTest { expect($subscribersCount)->equals(2); $subscriber1 = Subscriber::where("wp_user_id", $id)->findOne(); $deletedAt1 = Carbon::createFromFormat('Y-m-d H:i:s', $subscriber1->deletedAt); - assert($deletedAt1 instanceof Carbon); + $this->assertInstanceOf(Carbon::class, $deletedAt1); expect($subscriber1->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED); expect($deletedAt1->timestamp)->equals(Carbon::now()->timestamp, 1); $subscriber2 = Subscriber::where("wp_user_id", $id2)->findOne(); $deletedAt2 = Carbon::createFromFormat('Y-m-d H:i:s', $subscriber2->deletedAt); - assert($deletedAt2 instanceof Carbon); + $this->assertInstanceOf(Carbon::class, $deletedAt2); expect($subscriber2->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED); expect($deletedAt2->timestamp)->equals(Carbon::now()->timestamp, 1); } @@ -427,7 +427,7 @@ class WPTest extends \MailPoetTest { $wpSegment->synchronizeUser($id); $subscriber = Subscriber::where("wp_user_id", $id)->findOne(); $deletedAt = Carbon::createFromFormat('Y-m-d H:i:s', $subscriber->deletedAt); - assert($deletedAt instanceof Carbon); + $this->assertInstanceOf(Carbon::class, $deletedAt); expect($subscriber->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED); expect($deletedAt->timestamp)->equals(Carbon::now()->timestamp, 1); } diff --git a/mailpoet/tests/integration/Segments/WooCommerceTest.php b/mailpoet/tests/integration/Segments/WooCommerceTest.php index 58017c933e..085e602af8 100644 --- a/mailpoet/tests/integration/Segments/WooCommerceTest.php +++ b/mailpoet/tests/integration/Segments/WooCommerceTest.php @@ -72,7 +72,7 @@ class WooCommerceTest extends \MailPoetTest { $hook = 'woocommerce_new_customer'; $this->wooCommerceSegment->synchronizeRegisteredCustomer($user->ID, $hook); $subscriber = $this->findWCSubscriberByWpUserId($user->ID); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber)->notEmpty(); expect($subscriber->getEmail())->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect($subscriber->getFirstName())->equals($firstName); @@ -97,7 +97,7 @@ class WooCommerceTest extends \MailPoetTest { $hook = 'woocommerce_update_customer'; $this->wooCommerceSegment->synchronizeRegisteredCustomer($user->ID, $hook); $subscriber = $this->findWCSubscriberByWpUserId($user->ID); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber)->notEmpty(); expect($subscriber->getEmail())->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps expect($subscriber->getFirstName())->equals($firstName); @@ -133,7 +133,7 @@ class WooCommerceTest extends \MailPoetTest { $subscribers = $this->getWCSubscribersByEmails([$guest['email']]); expect($subscribers)->isEmpty(); $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getFirstName())->equals($guest['first_name']); expect($subscriber->getLastName())->equals($guest['last_name']); expect($subscriber->getIsWoocommerceUser())->equals(true); @@ -149,7 +149,7 @@ class WooCommerceTest extends \MailPoetTest { $subscribers = $this->getWCSubscribersByEmails([$guest['email']]); expect($subscribers)->isEmpty(); $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getFirstName())->equals($guest['first_name']); expect($subscriber->getLastName())->equals($guest['last_name']); expect($subscriber->getIsWoocommerceUser())->equals(true); @@ -165,7 +165,7 @@ class WooCommerceTest extends \MailPoetTest { $subscribers = $this->getWCSubscribersByEmails([$guest['email']]); expect($subscribers)->isEmpty(); $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getFirstName())->equals($guest['first_name']); expect($subscriber->getLastName())->equals($guest['last_name']); expect($subscriber->getIsWoocommerceUser())->equals(true); @@ -182,11 +182,11 @@ class WooCommerceTest extends \MailPoetTest { expect($subscribersCount)->equals(2); $subscriber = $this->subscribersRepository->findOneBy(['email' => $user->user_email]); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED); expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER); $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER); } @@ -244,7 +244,7 @@ class WooCommerceTest extends \MailPoetTest { 'wpUserId' => $user->ID, 'isWoocommerceUser' => true, ]); - assert($wpSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $wpSubscriber); expect($wpSubscriber)->notEmpty(); expect($wpSubscriber->getId())->equals($subscriber->getId()); expect($wpSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); @@ -265,7 +265,7 @@ class WooCommerceTest extends \MailPoetTest { 'email' => $guest['email'], 'isWoocommerceUser' => true, ]); - assert($wpSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $wpSubscriber); expect($wpSubscriber)->notEmpty(); expect($wpSubscriber->getEmail())->equals($subscriber->getEmail()); expect($wpSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); @@ -297,7 +297,7 @@ class WooCommerceTest extends \MailPoetTest { $this->createOrder(['email' => $user->user_email, 'first_name' => 'First name (newer)']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $this->wooCommerceSegment->synchronizeCustomers(); $subscriber = $this->subscribersRepository->findOneBy(['wpUserId' => $user->ID]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getFirstName())->equals('First name (newer)'); } @@ -308,7 +308,7 @@ class WooCommerceTest extends \MailPoetTest { $this->createOrder(['email' => $user->user_email, 'last_name' => 'Last name (newer)']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps $this->wooCommerceSegment->synchronizeCustomers(); $subscriber = $this->subscribersRepository->findOneBy(['wpUserId' => $user->ID]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getLastName())->equals('Last name (newer)'); } @@ -319,7 +319,7 @@ class WooCommerceTest extends \MailPoetTest { $this->createOrder(['email' => $guest['email'], 'first_name' => 'First name (newer)']); $this->wooCommerceSegment->synchronizeCustomers(); $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getFirstName())->equals('First name (newer)'); } @@ -330,7 +330,7 @@ class WooCommerceTest extends \MailPoetTest { $this->createOrder(['email' => $guest['email'], 'last_name' => 'Last name (newer)']); $this->wooCommerceSegment->synchronizeCustomers(); $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getLastName())->equals('Last name (newer)'); } @@ -351,7 +351,7 @@ class WooCommerceTest extends \MailPoetTest { 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'isWoocommerceUser' => true, ]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); $subscriber->setDeletedAt(Carbon::now()); $this->subscribersRepository->flush(); $this->wooCommerceSegment->synchronizeCustomers(); @@ -359,7 +359,7 @@ class WooCommerceTest extends \MailPoetTest { 'email' => $user->user_email, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps 'isWoocommerceUser' => true, ]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getDeletedAt())->notNull(); } @@ -370,7 +370,7 @@ class WooCommerceTest extends \MailPoetTest { 'email' => $guest['email'], 'isWoocommerceUser' => true, ]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); $subscriber->setDeletedAt(Carbon::now()); $this->entityManager->flush(); $this->wooCommerceSegment->synchronizeCustomers(); @@ -378,7 +378,7 @@ class WooCommerceTest extends \MailPoetTest { 'email' => $guest['email'], 'isWoocommerceUser' => true, ]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getDeletedAt())->notNull(); } @@ -429,7 +429,7 @@ class WooCommerceTest extends \MailPoetTest { expect($subscribersCount)->equals(4); $this->entityManager->clear(); $dbSubscriber = $this->subscribersRepository->findOneById($subscriber3->getId()); - assert($dbSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $dbSubscriber); expect($dbSubscriber)->notEmpty(); $this->entityManager->remove($dbSubscriber); $this->entityManager->flush(); @@ -484,7 +484,7 @@ class WooCommerceTest extends \MailPoetTest { $this->wooCommerceSegment->synchronizeCustomers(); $this->entityManager->clear(); $subscriberAfterUpdate = $this->subscribersRepository->findOneBy(['email' => $subscriber->getEmail()]); - assert($subscriberAfterUpdate instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriberAfterUpdate); expect($subscriberAfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); } @@ -513,7 +513,7 @@ class WooCommerceTest extends \MailPoetTest { $this->wooCommerceSegment->synchronizeCustomers(); $this->entityManager->clear(); $subscriberAfterUpdate = $this->subscribersRepository->findOneBy(['email' => $subscriber->getEmail()]); - assert($subscriberAfterUpdate instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriberAfterUpdate); expect($subscriberAfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -550,15 +550,15 @@ class WooCommerceTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber1AfterUpdate = $this->subscribersRepository->findOneBy(['email' => $subscriber1->getEmail()]); $subscriber2AfterUpdate = $this->subscribersRepository->findOneBy(['email' => $subscriber2->getEmail()]); - assert($subscriber1AfterUpdate instanceof SubscriberEntity); - assert($subscriber2AfterUpdate instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1AfterUpdate); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2AfterUpdate); expect($subscriber1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); expect($subscriber2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); $association1AfterUpdate = $this->subscriberSegmentsRepository->findOneById($association1->getId()); $association2AfterUpdate = $this->subscriberSegmentsRepository->findOneById($association2->getId()); - assert($association1AfterUpdate instanceof SubscriberSegmentEntity); - assert($association2AfterUpdate instanceof SubscriberSegmentEntity); + $this->assertInstanceOf(SubscriberSegmentEntity::class, $association1AfterUpdate); + $this->assertInstanceOf(SubscriberSegmentEntity::class, $association2AfterUpdate); expect($association1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); expect($association2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); } @@ -595,15 +595,15 @@ class WooCommerceTest extends \MailPoetTest { $subscriber1AfterUpdate = $this->subscribersRepository->findOneBy(['email' => $subscriber1->getEmail()]); $subscriber2AfterUpdate = $this->subscribersRepository->findOneBy(['email' => $subscriber2->getEmail()]); - assert($subscriber1AfterUpdate instanceof SubscriberEntity); - assert($subscriber2AfterUpdate instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1AfterUpdate); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2AfterUpdate); expect($subscriber1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); expect($subscriber2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); $association1AfterUpdate = $this->subscriberSegmentsRepository->findOneById($association1->getId()); $association2AfterUpdate = $this->subscriberSegmentsRepository->findOneById($association2->getId()); - assert($association1AfterUpdate instanceof SubscriberSegmentEntity); - assert($association2AfterUpdate instanceof SubscriberSegmentEntity); + $this->assertInstanceOf(SubscriberSegmentEntity::class, $association1AfterUpdate); + $this->assertInstanceOf(SubscriberSegmentEntity::class, $association2AfterUpdate); expect($association1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); expect($association2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -814,7 +814,7 @@ class WooCommerceTest extends \MailPoetTest { private function findWCSubscriberByWpUserId(int $wpUserId): ?SubscriberEntity { $subscriber = $this->subscribersRepository->findOneBy(['wpUserId' => $wpUserId]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); $wooCommerceSegment = $this->segmentsRepository->getWooCommerceSegment(); foreach ($subscriber->getSegments() as $segment) { if ($segment->getId() === $wooCommerceSegment->getId()) { diff --git a/mailpoet/tests/integration/Settings/SettingsChangeHandlerTest.php b/mailpoet/tests/integration/Settings/SettingsChangeHandlerTest.php index e12945cc5b..63f2d7e9df 100644 --- a/mailpoet/tests/integration/Settings/SettingsChangeHandlerTest.php +++ b/mailpoet/tests/integration/Settings/SettingsChangeHandlerTest.php @@ -24,13 +24,15 @@ class SettingsChangeHandlerTest extends \MailPoetTest { public function testItReschedulesScheduledTaskForWoocommerceSync(): void { $newTask = $this->createScheduledTask(WooCommerceSync::TASK_TYPE); - assert($newTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $newTask); $this->settingsChangeHandler->onSubscribeOldWoocommerceCustomersChange(); $this->entityManager->clear(); $task = $this->getScheduledTaskByType(WooCommerceSync::TASK_TYPE); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); + $scheduledAt = $task->getScheduledAt(); + $this->assertInstanceOf(\DateTime::class, $scheduledAt); $expectedScheduledAt = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp')); $expectedScheduledAt->subMinute(); $this->tester->assertEqualDateTimes($task->getScheduledAt(), $expectedScheduledAt, 1); @@ -47,11 +49,13 @@ class SettingsChangeHandlerTest extends \MailPoetTest { public function testItReschedulesScheduledTaskForInactiveSubscribers(): void { $newTask = $this->createScheduledTask(InactiveSubscribers::TASK_TYPE); - assert($newTask instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $newTask); $this->settingsChangeHandler->onInactiveSubscribersIntervalChange(); $task = $this->getScheduledTaskByType(InactiveSubscribers::TASK_TYPE); - assert($task instanceof ScheduledTaskEntity); + $this->assertInstanceOf(ScheduledTaskEntity::class, $task); + $scheduledAt = $task->getScheduledAt(); + $this->assertInstanceOf(\DateTime::class, $scheduledAt); $expectedScheduledAt = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp')); $expectedScheduledAt->subMinute(); $this->tester->assertEqualDateTimes($task->getScheduledAt(), $expectedScheduledAt, 1); diff --git a/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php b/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php index 68871d7a07..e2e801d27c 100644 --- a/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php +++ b/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php @@ -71,7 +71,7 @@ class UserFlagsControllerTest extends \MailPoetTest { 'userId' => $this->currentUserId, 'name' => 'flag_1', ]); - assert($flag instanceof UserFlagEntity); + $this->assertInstanceOf(UserFlagEntity::class, $flag); expect($flag->getValue())->equals('updated_value'); } diff --git a/mailpoet/tests/integration/Statistics/StatisticsFormsRepositoryTest.php b/mailpoet/tests/integration/Statistics/StatisticsFormsRepositoryTest.php index 86a60126e1..24d831c22f 100644 --- a/mailpoet/tests/integration/Statistics/StatisticsFormsRepositoryTest.php +++ b/mailpoet/tests/integration/Statistics/StatisticsFormsRepositoryTest.php @@ -20,7 +20,7 @@ class StatisticsFormsRepositoryTest extends \MailPoetTest { $form = $this->createForm(); $subscriber = $this->createSubscriber(); $record = $this->repository->record($form, $subscriber); - assert($record instanceof StatisticsFormEntity); + $this->assertInstanceOf(StatisticsFormEntity::class, $record); expect($record->getForm())->equals($form); expect($record->getSubscriber())->equals($subscriber); expect($this->repository->findOneBy(['form' => $form, 'subscriber' => $subscriber]))->isInstanceOf(StatisticsFormEntity::class); @@ -30,7 +30,7 @@ class StatisticsFormsRepositoryTest extends \MailPoetTest { $form = $this->createForm(); $subscriber = $this->createSubscriber(); $record = $this->repository->record($form, $subscriber); - assert($record instanceof StatisticsFormEntity); + $this->assertInstanceOf(StatisticsFormEntity::class, $record); expect($record->getForm())->equals($form); expect($record->getSubscriber())->equals($subscriber); diff --git a/mailpoet/tests/integration/Statistics/StatisticsOpensRepositoryTest.php b/mailpoet/tests/integration/Statistics/StatisticsOpensRepositoryTest.php index 315a7abbc5..441c3d2638 100644 --- a/mailpoet/tests/integration/Statistics/StatisticsOpensRepositoryTest.php +++ b/mailpoet/tests/integration/Statistics/StatisticsOpensRepositoryTest.php @@ -93,9 +93,9 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest { $this->createStatisticsNewsletter($this->createNewsletter(), $subscriber); $statisticsNewsletter = $this->createStatisticsNewsletter($this->createNewsletter(), $subscriber); $newsletter = $statisticsNewsletter->getNewsletter(); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); $queue = $newsletter->getQueues()->first(); - assert($queue instanceof SendingQueueEntity); + $this->assertInstanceOf(SendingQueueEntity::class, $queue); $open = new StatisticsOpenEntity($newsletter, $queue, $subscriber); $this->entityManager->persist($open); $this->entityManager->flush(); @@ -135,9 +135,9 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest { $this->createStatisticsNewsletter($this->createNewsletter(), $subscriber); $statisticsNewsletter = $this->createStatisticsNewsletter($this->createNewsletter($sentAt), $subscriber); $newsletter = $statisticsNewsletter->getNewsletter(); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); $queue = $newsletter->getQueues()->first(); - assert($queue instanceof SendingQueueEntity); + $this->assertInstanceOf(SendingQueueEntity::class, $queue); $open = new StatisticsOpenEntity($newsletter, $queue, $subscriber); $this->entityManager->persist($open); $this->entityManager->flush(); @@ -146,9 +146,9 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest { $this->createStatisticsNewsletter($this->createNewsletter(), $subscriber2); $statisticsNewsletter = $this->createStatisticsNewsletter($this->createNewsletter(), $subscriber2); $newsletter = $statisticsNewsletter->getNewsletter(); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); $queue = $newsletter->getQueues()->first(); - assert($queue instanceof SendingQueueEntity); + $this->assertInstanceOf(SendingQueueEntity::class, $queue); $open = new StatisticsOpenEntity($newsletter, $queue, $subscriber2); $this->entityManager->persist($open); $this->entityManager->flush(); @@ -192,9 +192,9 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest { $this->createStatisticsNewsletter($this->createWooNewsletter(), $subscriber); $statisticsNewsletter = $this->createStatisticsNewsletter($this->createWooNewsletter(), $subscriber); $newsletter = $statisticsNewsletter->getNewsletter(); - assert($newsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); $queue = $newsletter->getQueues()->first(); - assert($queue instanceof SendingQueueEntity); + $this->assertInstanceOf(SendingQueueEntity::class, $queue); $open = new StatisticsOpenEntity($newsletter, $queue, $subscriber); $this->entityManager->persist($open); $this->entityManager->flush(); diff --git a/mailpoet/tests/integration/Statistics/Track/OpensTest.php b/mailpoet/tests/integration/Statistics/Track/OpensTest.php index a338b39db7..54f79e1c66 100644 --- a/mailpoet/tests/integration/Statistics/Track/OpensTest.php +++ b/mailpoet/tests/integration/Statistics/Track/OpensTest.php @@ -233,7 +233,7 @@ class OpensTest extends \MailPoetTest { $openEntities = $this->statisticsOpensRepository->findAll(); expect($openEntities)->count(1); $openEntity = reset($openEntities); - assert($openEntity instanceof StatisticsOpenEntity); + $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity); $userAgent = $openEntity->getUserAgent(); $this->assertInstanceOf(UserAgentEntity::class, $userAgent); expect($userAgent->getUserAgent())->equals($humanUserAgentName); @@ -247,7 +247,7 @@ class OpensTest extends \MailPoetTest { $openEntities = $this->statisticsOpensRepository->findAll(); expect($openEntities)->count(1); $openEntity = reset($openEntities); - assert($openEntity instanceof StatisticsOpenEntity); + $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity); $userAgent = $openEntity->getUserAgent(); $this->assertInstanceOf(UserAgentEntity::class, $userAgent); expect($userAgent->getUserAgent())->equals($humanUserAgentName); @@ -271,7 +271,7 @@ class OpensTest extends \MailPoetTest { $openEntities = $this->statisticsOpensRepository->findAll(); expect($openEntities)->count(1); $openEntity = reset($openEntities); - assert($openEntity instanceof StatisticsOpenEntity); + $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity); $userAgent = $openEntity->getUserAgent(); $this->assertInstanceOf(UserAgentEntity::class, $userAgent); expect($userAgent->getUserAgent())->equals($machineUserAgentName); @@ -285,7 +285,7 @@ class OpensTest extends \MailPoetTest { $openEntities = $this->statisticsOpensRepository->findAll(); expect($openEntities)->count(1); $openEntity = reset($openEntities); - assert($openEntity instanceof StatisticsOpenEntity); + $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity); $userAgent = $openEntity->getUserAgent(); $this->assertInstanceOf(UserAgentEntity::class, $userAgent); expect($userAgent->getUserAgent())->equals($humanUserAgentName); @@ -308,7 +308,7 @@ class OpensTest extends \MailPoetTest { $openEntities = $this->statisticsOpensRepository->findAll(); expect($openEntities)->count(1); $openEntity = reset($openEntities); - assert($openEntity instanceof StatisticsOpenEntity); + $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity); expect($openEntity->getUserAgent())->null(); expect($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN); // Track Machine User Agent @@ -319,7 +319,7 @@ class OpensTest extends \MailPoetTest { $openEntities = $this->statisticsOpensRepository->findAll(); expect($openEntities)->count(1); $openEntity = reset($openEntities); - assert($openEntity instanceof StatisticsOpenEntity); + $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity); expect($openEntity->getUserAgent())->null(); expect($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN); } @@ -339,7 +339,7 @@ class OpensTest extends \MailPoetTest { $openEntities = $this->statisticsOpensRepository->findAll(); expect($openEntities)->count(1); $openEntity = reset($openEntities); - assert($openEntity instanceof StatisticsOpenEntity); + $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity); expect($openEntity->getUserAgent())->null(); expect($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN); // Track Human User Agent diff --git a/mailpoet/tests/integration/Statistics/Track/WooCommercePurchasesTest.php b/mailpoet/tests/integration/Statistics/Track/WooCommercePurchasesTest.php index d3849b2016..2de838d816 100644 --- a/mailpoet/tests/integration/Statistics/Track/WooCommercePurchasesTest.php +++ b/mailpoet/tests/integration/Statistics/Track/WooCommercePurchasesTest.php @@ -76,7 +76,7 @@ class WooCommercePurchasesTest extends \MailPoetTest { $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([]); expect(count($purchaseStats))->equals(1); $click = $purchaseStats[0]->getClick(); - assert($click instanceof StatisticsClickEntity); + $this->assertInstanceOf(StatisticsClickEntity::class, $click); expect($click->getId())->equals($click->getId()); } @@ -98,14 +98,14 @@ class WooCommercePurchasesTest extends \MailPoetTest { $newsletter = $purchaseStats[0]->getNewsletter(); $subscriber = $purchaseStats[0]->getSubscriber(); $queue = $purchaseStats[0]->getQueue(); - assert($newsletter instanceof NewsletterEntity); - assert($subscriber instanceof SubscriberEntity); - assert($queue instanceof SendingQueueEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); + $this->assertInstanceOf(SendingQueueEntity::class, $queue); expect($newsletter->getId())->equals($this->newsletter->getId()); expect($subscriber->getId())->equals($this->subscriber->getId()); expect($queue->getId())->equals($this->queue->getId()); $click = $purchaseStats[0]->getClick(); - assert($click instanceof StatisticsClickEntity); + $this->assertInstanceOf(StatisticsClickEntity::class, $click); expect($click->getId())->equals($click->getId()); expect($purchaseStats[0]->getOrderId())->equals($orderMock->get_id()); expect($purchaseStats[0]->getOrderCurrency())->equals($orderMock->get_currency()); @@ -136,25 +136,25 @@ class WooCommercePurchasesTest extends \MailPoetTest { expect(count($purchaseStats))->equals(2); $stats1 = $this->statisticsWooCommercePurchasesRepository->findOneBy(['newsletter' => $this->newsletter]); - assert($stats1 instanceof StatisticsWooCommercePurchaseEntity); + $this->assertInstanceOf(StatisticsWooCommercePurchaseEntity::class, $stats1); $subscriber = $stats1->getSubscriber(); $queue = $stats1->getQueue(); $click = $stats1->getClick(); - assert($subscriber instanceof SubscriberEntity); - assert($queue instanceof SendingQueueEntity); - assert($click instanceof StatisticsClickEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); + $this->assertInstanceOf(SendingQueueEntity::class, $queue); + $this->assertInstanceOf(StatisticsClickEntity::class, $click); expect($click->getId())->equals($click1->getId()); expect($subscriber->getId())->equals($this->subscriber->getId()); expect($queue->getId())->equals($this->queue->getId()); $stats2 = $this->statisticsWooCommercePurchasesRepository->findOneBy(['newsletter' => $newsletter]); - assert($stats2 instanceof StatisticsWooCommercePurchaseEntity); + $this->assertInstanceOf(StatisticsWooCommercePurchaseEntity::class, $stats2); $subscriber = $stats2->getSubscriber(); $queue = $stats2->getQueue(); $click = $stats2->getClick(); - assert($subscriber instanceof SubscriberEntity); - assert($queue instanceof SendingQueueEntity); - assert($click instanceof StatisticsClickEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); + $this->assertInstanceOf(SendingQueueEntity::class, $queue); + $this->assertInstanceOf(StatisticsClickEntity::class, $click); expect($click->getId())->equals($click2->getId()); expect($subscriber->getId())->equals($this->subscriber->getId()); expect($queue->getId())->equals($queue->getId()); @@ -210,7 +210,7 @@ class WooCommercePurchasesTest extends \MailPoetTest { $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([], ['createdAt' => 'desc']); expect(count($purchaseStats))->equals(1); $click = $purchaseStats[0]->getClick(); - assert($click instanceof StatisticsClickEntity); + $this->assertInstanceOf(StatisticsClickEntity::class, $click); expect($click->getId())->equals($latestClick->getId()); } @@ -317,7 +317,7 @@ class WooCommercePurchasesTest extends \MailPoetTest { $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([]); expect($purchaseStats)->count(1); $click = $purchaseStats[0]->getClick(); - assert($click instanceof StatisticsClickEntity); + $this->assertInstanceOf(StatisticsClickEntity::class, $click); expect($click->getId())->equals($click->getId()); } @@ -347,7 +347,7 @@ class WooCommercePurchasesTest extends \MailPoetTest { $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([]); expect(count($purchaseStats))->equals(1); $click = $purchaseStats[0]->getClick(); - assert($click instanceof StatisticsClickEntity); + $this->assertInstanceOf(StatisticsClickEntity::class, $click); expect($click->getId())->equals($click->getId()); } @@ -380,7 +380,7 @@ class WooCommercePurchasesTest extends \MailPoetTest { $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([]); expect(count($purchaseStats))->equals(1); $click = $purchaseStats[0]->getClick(); - assert($click instanceof StatisticsClickEntity); + $this->assertInstanceOf(StatisticsClickEntity::class, $click); expect($click->getId())->equals($orderEmailClick->getId()); } @@ -419,9 +419,9 @@ class WooCommercePurchasesTest extends \MailPoetTest { expect(count($purchaseStats))->equals(2); foreach ($purchaseStats as $stats) { $click = $stats->getClick(); - assert($click instanceof StatisticsClickEntity); + $this->assertInstanceOf(StatisticsClickEntity::class, $click); $statsNewsletter = $stats->getNewsletter(); - assert($statsNewsletter instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $statsNewsletter); if ($click->getId() === $orderEmailClick->getId()) { expect($statsNewsletter->getId())->equals($this->newsletter->getId()); } else { @@ -470,8 +470,8 @@ class WooCommercePurchasesTest extends \MailPoetTest { private function createClick(NewsletterLinkEntity $link, SubscriberEntity $subscriber, $createdDaysAgo = 5): StatisticsClickEntity { $newsletter = $link->getNewsletter(); $queue = $link->getQueue(); - assert($newsletter instanceof NewsletterEntity); - assert($queue instanceof SendingQueueEntity); + $this->assertInstanceOf(NewsletterEntity::class, $newsletter); + $this->assertInstanceOf(SendingQueueEntity::class, $queue); $click = new StatisticsClickEntity($newsletter, $queue, $subscriber, $link, 1); $this->entityManager->persist($click); diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/Export/ExportTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/Export/ExportTest.php index e1ac83ae3c..6a6dc57cef 100644 --- a/mailpoet/tests/integration/Subscribers/ImportExport/Export/ExportTest.php +++ b/mailpoet/tests/integration/Subscribers/ImportExport/Export/ExportTest.php @@ -112,17 +112,17 @@ class ExportTest extends \MailPoetTest { $this->createCustomField($customField['name'], $customField['type']); } $subscriber1 = $this->subscribersRepository->findOneById(1); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); $subscriber2 = $this->subscribersRepository->findOneById(2); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); $subscriber3 = $this->subscribersRepository->findOneById(3); - assert($subscriber3 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber3); $customField = $this->customFieldsRepository->findOneById(1); - assert($customField instanceof CustomFieldEntity); + $this->assertInstanceOf(CustomFieldEntity::class, $customField); $segment1 = $this->segmentsRepository->findOneById(1); - assert($segment1 instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $segment1); $segment2 = $this->segmentsRepository->findOneById(2); - assert($segment2 instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $segment2); $this->createSubscriberCustomField($subscriber2, $customField, $this->subscribersData[1][1]); $this->createSubscriberSegment($subscriber1, $segment1, SubscriberEntity::STATUS_UNSUBSCRIBED); @@ -178,7 +178,7 @@ class ExportTest extends \MailPoetTest { public function testItCanGetSubscriberCustomFields() { $source = $this->customFieldsRepository->findOneBy(['name' => $this->customFieldsData[0]['name']]); - assert($source instanceof CustomFieldEntity); + $this->assertInstanceOf(CustomFieldEntity::class, $source); $target = $this->export->getSubscriberCustomFields(); expect($target)->equals([$source->getId() => $source->getName()]); } diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php index 019cd35b9c..ccdfad3a67 100644 --- a/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php +++ b/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php @@ -87,7 +87,7 @@ class ImportTest extends \MailPoetTest { 'name' => 'country', 'type' => CustomFieldEntity::TYPE_TEXT, ]); - assert($customField instanceof CustomFieldEntity); + $this->assertInstanceOf(CustomFieldEntity::class, $customField); $this->subscribersCustomFields = [$customField->getId()]; $this->segment1 = $this->segmentsRepository->createOrUpdate('Segment 1'); $this->segment2 = $this->segmentsRepository->createOrUpdate('Segment 2'); @@ -648,7 +648,7 @@ class ImportTest extends \MailPoetTest { $this->import->process(); $updatedSubscriber = $this->subscriberRepository->findOneBy(['email' => $subscriber->getEmail()]); - assert($updatedSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $updatedSubscriber); expect($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); } @@ -673,8 +673,8 @@ class ImportTest extends \MailPoetTest { expect(strlen((string)$newSubscribers[1]->getLinkToken()))->equals(SubscriberEntity::LINK_TOKEN_LENGTH); $lastSubscribed1 = $newSubscribers[0]->getLastSubscribedAt(); $lastSubscribed2 = $newSubscribers[1]->getLastSubscribedAt(); - assert($lastSubscribed1 instanceof \DateTimeInterface); - assert($lastSubscribed2 instanceof \DateTimeInterface); + $this->assertInstanceOf(\DateTimeInterface::class, $lastSubscribed1); + $this->assertInstanceOf(\DateTimeInterface::class, $lastSubscribed2); expect($lastSubscribed1->getTimestamp())->equals($this->testData['timestamp'], 1); expect($lastSubscribed2->getTimestamp())->equals($this->testData['timestamp'], 1); } @@ -685,7 +685,7 @@ class ImportTest extends \MailPoetTest { $data['subscribers'][0][] = '2018-12-12 12:12:00'; $data['subscribers'][1][] = '2018-12-12 12:12:00'; $lastSubscribedAt = Carbon::createFromFormat('Y-m-d H:i:s', '2017-12-12 12:12:00'); - assert($lastSubscribedAt instanceof Carbon); + $this->assertInstanceOf(Carbon::class, $lastSubscribedAt); $import = $this->createImportInstance($data); $existingSubscriber = $this->createSubscriber( 'Adam', @@ -697,21 +697,21 @@ class ImportTest extends \MailPoetTest { $import->process(); $updatedSubscriber = $this->subscriberRepository->findOneBy(['email' => $existingSubscriber->getEmail()]); - assert($updatedSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $updatedSubscriber); expect($updatedSubscriber->getLastSubscribedAt())->equals(Carbon::createFromFormat('Y-m-d H:i:s', '2017-12-12 12:12:00')); } public function testItSynchronizesWpUsers(): void { $this->tester->createWordPressUser('mary@jane.com', 'editor'); $beforeImport = $this->subscriberRepository->findOneBy(['email' => 'mary@jane.com']); - assert($beforeImport instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $beforeImport); $data = $this->testData; $import = $this->createImportInstance($data); $import->process(); $this->entityManager->clear(); $imported = $this->subscriberRepository->findOneBy(['email' => 'mary@jane.com']); - assert($imported instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $imported); expect($imported->getFirstName())->equals($beforeImport->getFirstName()); // Subscriber name was synchronized from WP expect($imported->getFirstName())->notEquals('Mary'); $this->tester->deleteWordPressUser('mary@jane.com'); @@ -721,7 +721,7 @@ class ImportTest extends \MailPoetTest { $data = $this->testData; $data['existingSubscribersStatus'] = SubscriberEntity::STATUS_SUBSCRIBED; $lastSubscribedAt = Carbon::createFromFormat('Y-m-d H:i:s', '2020-08-08 08:08:00'); - assert($lastSubscribedAt instanceof Carbon); + $this->assertInstanceOf(Carbon::class, $lastSubscribedAt); $existingSubscriber = $this->createSubscriber( 'Adam', 'Smith', @@ -734,7 +734,7 @@ class ImportTest extends \MailPoetTest { $this->entityManager->clear(); $updatedSubscriber = $this->subscriberRepository->findOneBy(['email' => $existingSubscriber->getEmail()]); - assert($updatedSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $updatedSubscriber); expect($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -744,10 +744,10 @@ class ImportTest extends \MailPoetTest { $import = $this->createImportInstance($data); $import->process(); $newSubscriber = $this->subscriberRepository->findOneBy(['email' => 'Adam@Smith.com']); - assert($newSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $newSubscriber); expect($newSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); $newSubscriber = $this->subscriberRepository->findOneBy(['email' => 'mary@jane.com']); - assert($newSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $newSubscriber); expect($newSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); } @@ -755,7 +755,7 @@ class ImportTest extends \MailPoetTest { $result = $this->import->process(); expect($result['created'])->equals(2); $subscriber = $this->subscriberRepository->findOneBy(['email' => 'mary@jane.com']); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); $this->subscriberRepository->remove($subscriber); $this->subscriberRepository->flush(); $this->import->createdAt = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp')); diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportRepositoryTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportRepositoryTest.php index 94acb3b8e2..f579823bb7 100644 --- a/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportRepositoryTest.php +++ b/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportRepositoryTest.php @@ -63,12 +63,12 @@ class ImportExportRepositoryTest extends \MailPoetTest { $subscribers = $this->subscribersRepository->findAll(); expect($subscribers)->count(2); $user1 = $subscribers[0]; - assert($user1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $user1); expect($user1->getEmail())->equals('user1@export-test.com'); expect($user1->getFirstName())->equals('One'); expect($user1->getLastName())->equals('User'); $user2 = $subscribers[1]; - assert($user2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $user2); expect($user2->getEmail())->equals('user2@export-test.com'); expect($user2->getFirstName())->equals('Two'); expect($user2->getLastName())->equals('User'); @@ -99,13 +99,13 @@ class ImportExportRepositoryTest extends \MailPoetTest { $subscribers = $this->subscribersRepository->findAll(); expect($subscribers)->count(2); $user1 = $subscribers[0]; - assert($user1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $user1); expect($user1->getEmail())->equals('user1@export-test.com'); expect($user1->getFirstName())->equals('OneOne'); expect($user1->getLastName())->equals('UserOne'); expect($user1->getUpdatedAt())->equals($updatedAt); $user2 = $subscribers[1]; - assert($user2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $user2); expect($user2->getEmail())->equals('user2@export-test.com'); expect($user2->getFirstName())->equals('TwoTwo'); expect($user2->getLastName())->equals('UserTwo'); @@ -135,12 +135,12 @@ class ImportExportRepositoryTest extends \MailPoetTest { $customFields = $this->subscriberCustomFieldRepository->findAll(); expect($customFields)->count(2); $subscriberCustomField1 = $customFields[0]; - assert($subscriberCustomField1 instanceof SubscriberCustomFieldEntity); + $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField1); expect($subscriberCustomField1->getSubscriber())->equals($subscriber1); expect($subscriberCustomField1->getCustomField())->equals($customField); expect($subscriberCustomField1->getValue())->equals('20'); $subscriberCustomField2 = $customFields[1]; - assert($subscriberCustomField2 instanceof SubscriberCustomFieldEntity); + $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField2); expect($subscriberCustomField2->getSubscriber())->equals($subscriber2); expect($subscriberCustomField2->getCustomField())->equals($customField); expect($subscriberCustomField2->getValue())->equals('25'); @@ -176,16 +176,16 @@ class ImportExportRepositoryTest extends \MailPoetTest { $this->customFieldsRepository->findAll(); $subscriberCustomFields = $this->subscriberCustomFieldRepository->findAll(); $subscriberCustomField1 = $subscriberCustomFields[0]; - assert($subscriberCustomField1 instanceof SubscriberCustomFieldEntity); + $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField1); $resultSubscriber1 = $subscriberCustomField1->getSubscriber(); - assert($resultSubscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $resultSubscriber1); expect($resultSubscriber1->getId())->equals($subscriber1->getId()); expect($subscriberCustomField1->getCustomField())->equals($customField); expect($subscriberCustomField1->getValue())->equals('20'); $subscriberCustomField2 = $subscriberCustomFields[1]; - assert($subscriberCustomField2 instanceof SubscriberCustomFieldEntity); + $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField2); $resultSubscriber2 = $subscriberCustomField2->getSubscriber(); - assert($resultSubscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $resultSubscriber2); expect($resultSubscriber2->getId())->equals($subscriber2->getId()); expect($subscriberCustomField2->getCustomField())->equals($customField); expect($subscriberCustomField2->getValue())->equals('25'); @@ -193,7 +193,7 @@ class ImportExportRepositoryTest extends \MailPoetTest { public function testItGetSubscribersByDefaultSegment(): void { $confirmedAt = Carbon::createFromFormat(DateTime::DEFAULT_DATE_TIME_FORMAT, '2021-02-12 12:11:00'); - assert($confirmedAt instanceof Carbon); + $this->assertInstanceOf(Carbon::class, $confirmedAt); $confirmedIp = '122.122.122.122'; $subscribedIp = '123.123.123.123'; $user1 = $this->createSubscriber('user1@export-test.com', 'One', 'User'); @@ -301,7 +301,7 @@ class ImportExportRepositoryTest extends \MailPoetTest { $this->entityManager->clear(); $segment2 = $this->segmentsRepository->findOneById($segment2->getId()); - assert($segment2 instanceof SegmentEntity); + $this->assertInstanceOf(SegmentEntity::class, $segment2); $exported = $this->repository->getSubscribersBatchBySegment($segment2, 100); expect($exported)->count(2); expect($exported[0]['email'])->equals('user2@export-test.com'); diff --git a/mailpoet/tests/integration/Subscribers/InactiveSubscribersControllerTest.php b/mailpoet/tests/integration/Subscribers/InactiveSubscribersControllerTest.php index 04e227541f..85fbf13354 100644 --- a/mailpoet/tests/integration/Subscribers/InactiveSubscribersControllerTest.php +++ b/mailpoet/tests/integration/Subscribers/InactiveSubscribersControllerTest.php @@ -61,8 +61,8 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); - assert($subscriber1 instanceof SubscriberEntity); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); expect($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE); expect($subscriber2->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -79,8 +79,8 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { expect($result)->equals(1); $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); - assert($subscriber1 instanceof SubscriberEntity); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); expect($subscriber1->getStatus() === SubscriberEntity::STATUS_INACTIVE || $subscriber2->getStatus() === SubscriberEntity::STATUS_INACTIVE)->true(); expect($subscriber1->getStatus() === SubscriberEntity::STATUS_SUBSCRIBED || $subscriber2->getStatus() === SubscriberEntity::STATUS_SUBSCRIBED)->true(); @@ -89,8 +89,8 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { expect($result)->equals(1); $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); - assert($subscriber1 instanceof SubscriberEntity); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); expect($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE); expect($subscriber2->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE); } @@ -102,7 +102,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE); expect($result)->equals(0); $subscriber = $this->subscribersRepository->findOneById($subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -116,7 +116,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE); expect($result)->equals(0); $subscriber = $this->subscribersRepository->findOneById($subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -126,7 +126,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE); expect($result)->equals(0); $subscriber = $this->subscribersRepository->findOneById($subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -139,7 +139,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE); expect($result)->equals(0); $subscriber = $this->subscribersRepository->findOneById($subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -149,7 +149,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE); expect($result)->equals(0); $subscriber = $this->subscribersRepository->findOneById($subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -162,7 +162,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); - assert($subscriber1 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); expect($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -175,7 +175,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { $this->entityManager->clear(); expect($result)->equals(1); $subscriber = $this->subscribersRepository->findOneById($subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -194,8 +194,8 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { expect($result)->equals(1); $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); - assert($subscriber1 instanceof SubscriberEntity); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); expect($subscriber1->getStatus() === SubscriberEntity::STATUS_INACTIVE || $subscriber2->getStatus() === SubscriberEntity::STATUS_INACTIVE)->true(); expect($subscriber1->getStatus() === SubscriberEntity::STATUS_SUBSCRIBED || $subscriber2->getStatus() === SubscriberEntity::STATUS_SUBSCRIBED)->true(); @@ -204,8 +204,8 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { expect($result)->equals(1); $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); - assert($subscriber1 instanceof SubscriberEntity); - assert($subscriber2 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); expect($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); expect($subscriber2->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -218,7 +218,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { $this->entityManager->clear(); expect($result)->equals(0); $subscriber = $this->subscribersRepository->findOneById($subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE); } @@ -229,7 +229,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest { $this->controller->reactivateInactiveSubscribers(); $this->entityManager->clear(); $subscriber = $this->subscribersRepository->findOneById($subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } diff --git a/mailpoet/tests/integration/Subscribers/SubscriberSubscribeControllerTest.php b/mailpoet/tests/integration/Subscribers/SubscriberSubscribeControllerTest.php index 478c532b02..6bc90c28bd 100644 --- a/mailpoet/tests/integration/Subscribers/SubscriberSubscribeControllerTest.php +++ b/mailpoet/tests/integration/Subscribers/SubscriberSubscribeControllerTest.php @@ -68,7 +68,7 @@ class SubscriberSubscribeControllerTest extends \MailPoetTest { $this->subscribeController->subscribe($data); $subscriber = $this->subscribersRepository->findOneBy(['email' => $data[$this->obfuscatedEmail]]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber)->isInstanceOf(SubscriberEntity::class); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } @@ -86,7 +86,7 @@ class SubscriberSubscribeControllerTest extends \MailPoetTest { $this->subscribeController->subscribe($data); $subscriber = $this->subscribersRepository->findOneBy(['email' => $data[$this->obfuscatedEmail]]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber)->isInstanceOf(SubscriberEntity::class); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED); } @@ -106,13 +106,13 @@ class SubscriberSubscribeControllerTest extends \MailPoetTest { $this->subscribeController->subscribe($data); $subscriber = $this->subscribersRepository->findOneBy(['email' => $data[$this->obfuscatedEmail]]); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber)->isInstanceOf(SubscriberEntity::class); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); $subscriberCustomFields = $this->subscriberCustomFieldRepository->findBy(['subscriber' => $subscriber]); expect($subscriberCustomFields)->count(1); $subscriberCustomField = reset($subscriberCustomFields); - assert($subscriberCustomField instanceof SubscriberCustomFieldEntity); + $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField); expect($subscriberCustomField)->isInstanceOf(SubscriberCustomFieldEntity::class); expect($subscriberCustomField->getSubscriber())->equals($subscriber); expect($subscriberCustomField->getCustomField())->equals($customField); diff --git a/mailpoet/tests/integration/Subscribers/SubscribersEmailCountsControllerTest.php b/mailpoet/tests/integration/Subscribers/SubscribersEmailCountsControllerTest.php index bad543d0d0..4c5cd624f4 100644 --- a/mailpoet/tests/integration/Subscribers/SubscribersEmailCountsControllerTest.php +++ b/mailpoet/tests/integration/Subscribers/SubscribersEmailCountsControllerTest.php @@ -56,9 +56,9 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest { $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); $subscriber3 = $this->subscribersRepository->findOneById($subscriber3->getId()); - assert($subscriber1 instanceof SubscriberEntity); - assert($subscriber2 instanceof SubscriberEntity); - assert($subscriber3 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber3); expect($subscriber1->getEmailCount())->equals(80); expect($subscriber2->getEmailCount())->equals(8); @@ -85,9 +85,9 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest { $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); $subscriber3 = $this->subscribersRepository->findOneById($subscriber3->getId()); - assert($subscriber1 instanceof SubscriberEntity); - assert($subscriber2 instanceof SubscriberEntity); - assert($subscriber3 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber3); expect($subscriber1->getEmailCount())->equals(81); expect($subscriber2->getEmailCount())->equals(9); @@ -113,9 +113,9 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest { $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); $subscriber3 = $this->subscribersRepository->findOneById($subscriber3->getId()); - assert($subscriber1 instanceof SubscriberEntity); - assert($subscriber2 instanceof SubscriberEntity); - assert($subscriber3 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber3); expect($subscriber1->getEmailCount())->equals(80); expect($subscriber2->getEmailCount())->equals(8); @@ -141,9 +141,9 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest { $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); $subscriber3 = $this->subscribersRepository->findOneById($subscriber3->getId()); - assert($subscriber1 instanceof SubscriberEntity); - assert($subscriber2 instanceof SubscriberEntity); - assert($subscriber3 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber3); expect($subscriber1->getEmailCount())->equals(80); expect($subscriber2->getEmailCount())->equals(8); @@ -178,9 +178,9 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest { $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId()); $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId()); $subscriber3 = $this->subscribersRepository->findOneById($subscriber3->getId()); - assert($subscriber1 instanceof SubscriberEntity); - assert($subscriber2 instanceof SubscriberEntity); - assert($subscriber3 instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber1); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber2); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber3); expect($subscriber1->getEmailCount())->equals(0); expect($subscriber2->getEmailCount())->equals(0); diff --git a/mailpoet/tests/integration/Subscribers/SubscribersRepositoryTest.php b/mailpoet/tests/integration/Subscribers/SubscribersRepositoryTest.php index 8896fa7268..3b0ac4d048 100644 --- a/mailpoet/tests/integration/Subscribers/SubscribersRepositoryTest.php +++ b/mailpoet/tests/integration/Subscribers/SubscribersRepositoryTest.php @@ -47,14 +47,14 @@ class SubscribersRepositoryTest extends \MailPoetTest { // trashed subscriber $subscriberOne = $this->repository->findOneById($subscriberOneId); - assert($subscriberOne instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriberOne); expect($subscriberOne->getDeletedAt())->notNull(); $subscriberTwo = $this->repository->findOneById($subscriberOneId); - assert($subscriberTwo instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriberTwo); expect($subscriberTwo->getDeletedAt())->notNull(); // don't trashed subscriber $subscriberThree = $this->repository->findOneById($subscriberThreeId); - assert($subscriberThree instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriberThree); expect($subscriberThree->getDeletedAt())->null(); } @@ -73,11 +73,11 @@ class SubscribersRepositoryTest extends \MailPoetTest { // restored subscriber $subscriberOne = $this->repository->findOneById($subscriberOneId); - assert($subscriberOne instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriberOne); expect($subscriberOne->getDeletedAt())->null(); // don't restored subscriber $subscriberTwo = $this->repository->findOneById($subscriberTwoId); - assert($subscriberTwo instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriberTwo); expect($subscriberTwo->getDeletedAt())->notNull(); } @@ -106,7 +106,7 @@ class SubscribersRepositoryTest extends \MailPoetTest { expect($this->subscriberCustomFieldRepository->findOneBy(['subscriber' => $subscriberOneId]))->null(); // don't restored subscriber $subscriberTwo = $this->repository->findOneById($subscriberTwoId); - assert($subscriberTwo instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriberTwo); expect($subscriberTwo->getDeletedAt())->notNull(); expect($this->subscriberSegmentRepository->findOneBy(['subscriber' => $subscriberTwoId]))->notNull(); expect($this->subscriberCustomFieldRepository->findOneBy(['subscriber' => $subscriberTwoId]))->notNull(); @@ -169,13 +169,13 @@ class SubscribersRepositoryTest extends \MailPoetTest { // subscriber with removed segments $unsubscribedSubscriber = $this->repository->findOneById($subscriberOneId); expect($unsubscribedSubscriber)->notNull(); - assert($unsubscribedSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $unsubscribedSubscriber); expect($unsubscribedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); // subscriber still subscribed $subscribedSubscriber = $this->repository->findOneById($subscriberTwoId); expect($subscribedSubscriber)->notNull(); - assert($subscribedSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscribedSubscriber); expect($subscribedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); } diff --git a/mailpoet/tests/integration/Subscription/PagesTest.php b/mailpoet/tests/integration/Subscription/PagesTest.php index 99fc7ddc6c..37cfb24c00 100644 --- a/mailpoet/tests/integration/Subscription/PagesTest.php +++ b/mailpoet/tests/integration/Subscription/PagesTest.php @@ -112,7 +112,7 @@ class PagesTest extends \MailPoetTest { $subscription->confirm(); $this->entityManager->clear(); $confirmedSubscriber = $this->subscribersRepository->findOneById($subscriber->getId()); - assert($confirmedSubscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $confirmedSubscriber); expect($confirmedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); expect($confirmedSubscriber->getConfirmedAt())->greaterOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subSecond()); expect($confirmedSubscriber->getConfirmedAt())->lessOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond()); diff --git a/mailpoet/tests/integration/Tasks/SendingTest.php b/mailpoet/tests/integration/Tasks/SendingTest.php index 354a9ea0ee..52c7734594 100644 --- a/mailpoet/tests/integration/Tasks/SendingTest.php +++ b/mailpoet/tests/integration/Tasks/SendingTest.php @@ -69,7 +69,7 @@ class SendingTest extends \MailPoetTest { $sendings = SendingTask::createManyFromTasks([$this->task]); expect($sendings)->isEmpty(); $task = ScheduledTask::findOne($this->task->id); - assert($task instanceof ScheduledTask); + $this->assertInstanceOf(ScheduledTask::class, $task); expect($task->status)->equals(ScheduledTask::STATUS_INVALID); } @@ -107,8 +107,8 @@ class SendingTest extends \MailPoetTest { $this->sending->save(); $task = ScheduledTask::findOne($this->task->id); $queue = SendingQueue::findOne($this->queue->id); - assert($task instanceof ScheduledTask); - assert($queue instanceof SendingQueue); + $this->assertInstanceOf(ScheduledTask::class, $task); + $this->assertInstanceOf(SendingQueue::class, $queue); expect($task->status)->equals($status); expect($queue->newsletterRenderedSubject)->equals($newsletterRenderedSubject); } diff --git a/mailpoet/tests/integration/WooCommerce/SubscriptionTest.php b/mailpoet/tests/integration/WooCommerce/SubscriptionTest.php index 542a160c29..e95fe676e4 100644 --- a/mailpoet/tests/integration/WooCommerce/SubscriptionTest.php +++ b/mailpoet/tests/integration/WooCommerce/SubscriptionTest.php @@ -85,7 +85,7 @@ class SubscriptionTest extends \MailPoetTest { $wpUsers = get_users(); wp_set_current_user($wpUsers[0]->ID); $subscriber = $this->subscribersRepository->getCurrentWPUser(); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); $this->subscribeToSegment($subscriber, $this->wcSegment); expect($this->getRenderedOptinField())->stringContainsString('checked'); } @@ -95,7 +95,7 @@ class SubscriptionTest extends \MailPoetTest { $wpUsers = get_users(); wp_set_current_user($wpUsers[0]->ID); $subscriber = $this->subscribersRepository->getCurrentWPUser(); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); $this->unsubscribeToSegment($subscriber, $this->wcSegment); expect($this->getRenderedOptinField())->stringNotContainsString('checked'); } @@ -169,7 +169,7 @@ class SubscriptionTest extends \MailPoetTest { $this->subscribeToSegment($this->subscriber, $this->wcSegment); $this->entityManager->clear(); $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); $subscribedSegments = $subscriber->getSegments(); expect($subscribedSegments)->count(1); @@ -184,7 +184,7 @@ class SubscriptionTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); $unsubscribeLog = $this->entityManager->getRepository(StatisticsUnsubscribeEntity::class)->findOneBy(['subscriber' => $subscriber]); $this->assertInstanceOf(StatisticsUnsubscribeEntity::class, $unsubscribeLog); @@ -221,7 +221,7 @@ class SubscriptionTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); $subscribedSegments = $subscriber->getSegments()->toArray(); expect($subscribedSegments)->count(2); @@ -233,7 +233,7 @@ class SubscriptionTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_CHECKOUT); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED); expect($subscriber->getConfirmedIp())->notEmpty(); @@ -252,7 +252,7 @@ class SubscriptionTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); $subscribedSegments = $subscriber->getSegments(); expect($subscribedSegments)->count(0); @@ -268,12 +268,12 @@ class SubscriptionTest extends \MailPoetTest { $this->entityManager->clear(); $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); $subscribedSegments = $subscriber->getSegments(); expect($subscribedSegments)->count(1); $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId()); - assert($subscriber instanceof SubscriberEntity); + $this->assertInstanceOf(SubscriberEntity::class, $subscriber); expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_CHECKOUT); expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED); } diff --git a/mailpoet/tests/integration/WooCommerce/TransactionalEmailsTest.php b/mailpoet/tests/integration/WooCommerce/TransactionalEmailsTest.php index 62fc302256..cb5377f295 100644 --- a/mailpoet/tests/integration/WooCommerce/TransactionalEmailsTest.php +++ b/mailpoet/tests/integration/WooCommerce/TransactionalEmailsTest.php @@ -61,7 +61,7 @@ class TransactionalEmailsTest extends \MailPoetTest { public function testInitCreatesTransactionalEmailAndSavesItsId() { $this->transactionalEmails->init(); $email = $this->newslettersRepository->findOneBy(['type' => NewsletterEntity::TYPE_WC_TRANSACTIONAL_EMAIL]); - assert($email instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $email); $id = $this->settings->get(TransactionalEmails::SETTING_EMAIL_ID, null); expect($email)->notEmpty(); expect($id)->notNull(); @@ -92,7 +92,7 @@ class TransactionalEmailsTest extends \MailPoetTest { $email = $this->newslettersRepository->findOneBy([ 'type' => NewsletterEntity::TYPE_WC_TRANSACTIONAL_EMAIL, ]); - assert($email instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $email); expect($email)->notEmpty(); expect(json_encode($email->getBody()))->stringContainsString('my-awesome-image-url'); } @@ -102,7 +102,7 @@ class TransactionalEmailsTest extends \MailPoetTest { $this->wp->updateOption('woocommerce_email_footer_text', '

Text Link

'); $this->transactionalEmails->init(); $email = $this->newslettersRepository->findOneBy(['type' => NewsletterEntity::TYPE_WC_TRANSACTIONAL_EMAIL]); - assert($email instanceof NewsletterEntity); + $this->assertInstanceOf(NewsletterEntity::class, $email); $body = $email->getBody(); assert(is_array($body)); $footerTextBlock = $body['content']['blocks'][5]['blocks'][0]['blocks'][1];