From 835d8bc0af31f5f76589fa70684ba2b27a430a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Mon, 27 Jan 2020 16:14:30 +0100 Subject: [PATCH] Fix PHPUnit 6 & Codeception\Verify incompatibilities [MAILPOET-2582] --- .../phpstan-baseline-integration-tests.neon | 14 +++++++------- tests/_support/CheckSkippedTestsExtension.php | 2 +- tests/acceptance/ManageSubscriptionLinkCest.php | 3 ++- tests/acceptance/ReinstallFromScratchCest.php | 4 ++-- .../SettingsInactiveSubscribersChangeCest.php | 3 ++- tests/acceptance/WooCommerceListImportPageCest.php | 3 ++- tests/integration/API/MP/APITest.php | 7 ++++--- .../WooCommerce/Events/PurchasedInCategoryTest.php | 2 +- .../Cron/Workers/InactiveSubscribersTest.php | 3 ++- .../Cron/Workers/KeyCheck/PremiumKeyCheckTest.php | 2 +- .../KeyCheck/SendingServiceKeyCheckTest.php | 2 +- .../Cron/Workers/WooCommerceOrdersTest.php | 2 +- .../AddToNewslettersSegmentsTest.php | 2 +- .../AddToSubscribersFiltersTest.php | 2 +- .../SendingNewslettersSubscribersFinderTest.php | 2 +- .../DynamicSegments/Mappers/FormDataMapperTest.php | 12 ++++++------ .../Loading/SingleSegmentLoaderTest.php | 2 +- .../Persistence/Loading/SubscribersCountTest.php | 3 ++- .../Persistence/Loading/SubscribersIdsTest.php | 3 ++- tests/integration/Mailer/MailerLogTest.php | 4 ++-- .../Editor/PostContentTransformerTest.php | 2 +- tests/integration/Segments/BulkActionTest.php | 6 +++--- .../integration/Segments/SubscribersFinderTest.php | 2 +- .../Segments/SubscribersListingsTest.php | 6 +++--- tests/integration/Services/BridgeTest.php | 2 +- .../Statistics/Track/WooCommercePurchasesTest.php | 4 ++-- .../RequiredCustomFieldValidatorTest.php | 6 +++--- tests/integration/Subscribers/SourceTest.php | 2 +- .../WooCommerce/TransactionalEmailsTest.php | 8 ++++---- .../Workers/StatsNotifications/SchedulerTest.php | 7 ++++--- .../DynamicSegments/RequirementsCheckerTest.php | 3 ++- tests/unit/Logging/LoggerFactoryTest.php | 2 +- tests/unit/Referrals/ReferralDetectorTest.php | 2 +- tests/unit/_bootstrap.php | 2 +- 34 files changed, 70 insertions(+), 61 deletions(-) diff --git a/tasks/phpstan/phpstan-baseline-integration-tests.neon b/tasks/phpstan/phpstan-baseline-integration-tests.neon index 399bea9af3..5e3637de45 100644 --- a/tasks/phpstan/phpstan-baseline-integration-tests.neon +++ b/tasks/phpstan/phpstan-baseline-integration-tests.neon @@ -186,22 +186,22 @@ parameters: path: ../../tests/integration/API/JSON/v1/SettingsTest.php - - message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTrackerTest\\:\\:\\$wp \\(MailPoet\\\\WP\\\\Functions&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\WP\\\\Functions\\.$#" + message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTrackerTest\\:\\:\\$wp \\(MailPoet\\\\WP\\\\Functions&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\WP\\\\Functions\\.$#" count: 1 path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartPageVisitTrackerTest.php - - message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$wp \\(MailPoet\\\\WP\\\\Functions&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\WP\\\\Functions\\.$#" + message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$wp \\(MailPoet\\\\WP\\\\Functions&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\WP\\\\Functions\\.$#" count: 1 path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php - - message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$wooCommerceHelperMock \\(MailPoet\\\\WooCommerce\\\\Helper&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\WooCommerce\\\\Helper\\.$#" + message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$wooCommerceHelperMock \\(MailPoet\\\\WooCommerce\\\\Helper&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\WooCommerce\\\\Helper\\.$#" count: 1 path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php - - message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$pageVisitTrackerMock \\(MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTracker&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTracker\\.$#" + message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartTest\\:\\:\\$pageVisitTrackerMock \\(MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTracker&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\AbandonedCartPageVisitTracker\\.$#" count: 1 path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php @@ -221,7 +221,7 @@ parameters: path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php - - message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\PurchasedInCategoryTest\\:\\:\\$woocommerceHelper \\(PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\WooCommerce\\\\Helper\\.$#" + message: "#^Property MailPoet\\\\AutomaticEmails\\\\WooCommerce\\\\Events\\\\PurchasedInCategoryTest\\:\\:\\$woocommerceHelper \\(PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\WooCommerce\\\\Helper\\.$#" count: 1 path: ../../tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php @@ -476,12 +476,12 @@ parameters: path: ../../tests/integration/DynamicSegments/Filters/UserRoleTest.php - - message: "#^Property MailPoet\\\\DynamicSegments\\\\FreePluginConnectors\\\\SendingNewslettersSubscribersFinderTest\\:\\:\\$singleSegmentLoader \\(MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SingleSegmentLoader&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SingleSegmentLoader\\.$#" + message: "#^Property MailPoet\\\\DynamicSegments\\\\FreePluginConnectors\\\\SendingNewslettersSubscribersFinderTest\\:\\:\\$singleSegmentLoader \\(MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SingleSegmentLoader&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SingleSegmentLoader\\.$#" count: 1 path: ../../tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php - - message: "#^Property MailPoet\\\\DynamicSegments\\\\FreePluginConnectors\\\\SendingNewslettersSubscribersFinderTest\\:\\:\\$subscribersIdsLoader \\(MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SubscribersIds&PHPUnit_Framework_MockObject_MockObject\\) does not accept MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SubscribersIds\\.$#" + message: "#^Property MailPoet\\\\DynamicSegments\\\\FreePluginConnectors\\\\SendingNewslettersSubscribersFinderTest\\:\\:\\$subscribersIdsLoader \\(MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SubscribersIds&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject\\) does not accept MailPoet\\\\DynamicSegments\\\\Persistence\\\\Loading\\\\SubscribersIds\\.$#" count: 1 path: ../../tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php diff --git a/tests/_support/CheckSkippedTestsExtension.php b/tests/_support/CheckSkippedTestsExtension.php index efa3920f20..6199998684 100644 --- a/tests/_support/CheckSkippedTestsExtension.php +++ b/tests/_support/CheckSkippedTestsExtension.php @@ -13,7 +13,7 @@ class CheckSkippedTestsExtension extends Extension { // phpcs:ignore PSR1.Classe $branch = getenv('CIRCLE_BRANCH'); $skipped = $e->getResult()->skipped(); if (in_array($branch, ['master', 'release']) && (count($skipped) !== 0)) { - throw new PHPUnit_Framework_ExpectationFailedException("Failed, Cannot skip tests on branch $branch."); + throw new \PHPUnit\Framework\ExpectationFailedException("Failed, Cannot skip tests on branch $branch."); } } } diff --git a/tests/acceptance/ManageSubscriptionLinkCest.php b/tests/acceptance/ManageSubscriptionLinkCest.php index bfb48ebe79..f422831ddd 100644 --- a/tests/acceptance/ManageSubscriptionLinkCest.php +++ b/tests/acceptance/ManageSubscriptionLinkCest.php @@ -4,6 +4,7 @@ namespace MailPoet\Test\Acceptance; use Codeception\Util\Locator; use MailPoet\Test\DataFactories\Settings; +use PHPUnit\Framework\Exception; class ManageSubscriptionLinkCest { @@ -117,7 +118,7 @@ class ManageSubscriptionLinkCest { $i->waitForListingItemsToLoad(); $i->see('Sent to 1 of 1'); return; - } catch (\PHPUnit_Framework_Exception $e) { + } catch (Exception $e) { continue; } } diff --git a/tests/acceptance/ReinstallFromScratchCest.php b/tests/acceptance/ReinstallFromScratchCest.php index fbe1aa1750..0fcc3c19e5 100644 --- a/tests/acceptance/ReinstallFromScratchCest.php +++ b/tests/acceptance/ReinstallFromScratchCest.php @@ -7,7 +7,7 @@ use MailPoet\Test\DataFactories\Newsletter; use MailPoet\Test\DataFactories\Segment; use MailPoet\Test\DataFactories\Settings; use MailPoet\Test\DataFactories\Subscriber; -use PHPUnit_Framework_Assert as Asserts; +use PHPUnit\Framework\Assert; class ReinstallFromScratchCest { @@ -58,6 +58,6 @@ class ReinstallFromScratchCest { $i->waitForText('admin', 30, '.mailpoet_listing_table'); $wpUsersCount = count_users(); $subscribersCount = (int)$i->grabTextFrom('.displaying-num'); - Asserts::assertEquals($wpUsersCount['total_users'], $subscribersCount); + Assert::assertEquals($wpUsersCount['total_users'], $subscribersCount); } } diff --git a/tests/acceptance/SettingsInactiveSubscribersChangeCest.php b/tests/acceptance/SettingsInactiveSubscribersChangeCest.php index 529cc8f13d..827001fa4b 100644 --- a/tests/acceptance/SettingsInactiveSubscribersChangeCest.php +++ b/tests/acceptance/SettingsInactiveSubscribersChangeCest.php @@ -6,6 +6,7 @@ use MailPoet\Test\DataFactories\ScheduledTask; use MailPoet\Test\DataFactories\Segment; use MailPoet\Test\DataFactories\Settings; use MailPoet\Test\DataFactories\Subscriber; +use PHPUnit\Framework\Exception; class SettingsInactiveSubscribersChangeCest { @@ -49,7 +50,7 @@ class SettingsInactiveSubscribersChangeCest { $i->waitForListingItemsToLoad(); $i->see('Inactive (0)'); return; - } catch (\PHPUnit_Framework_Exception $e) { + } catch (Exception $e) { continue; } } diff --git a/tests/acceptance/WooCommerceListImportPageCest.php b/tests/acceptance/WooCommerceListImportPageCest.php index 83d728c691..9617c7030e 100644 --- a/tests/acceptance/WooCommerceListImportPageCest.php +++ b/tests/acceptance/WooCommerceListImportPageCest.php @@ -6,6 +6,7 @@ use MailPoet\Test\DataFactories\ScheduledTask; use MailPoet\Test\DataFactories\Settings; use MailPoet\Test\DataFactories\WooCommerceCustomer; use MailPoet\Test\DataFactories\WooCommerceOrder; +use PHPUnit\Framework\Exception; class WooCommerceListImportPageCest { @@ -58,7 +59,7 @@ class WooCommerceListImportPageCest { $i->reloadPage(); $i->see($guestUserData['email']); return; - } catch (\PHPUnit_Framework_Exception $e) { + } catch (Exception $e) { continue; } } diff --git a/tests/integration/API/MP/APITest.php b/tests/integration/API/MP/APITest.php index 6e0a5383f2..70965c34b6 100644 --- a/tests/integration/API/MP/APITest.php +++ b/tests/integration/API/MP/APITest.php @@ -502,7 +502,7 @@ class APITest extends \MailPoetTest { 'email' => 'test@example.com', ]; - $this->setExpectedException('Exception'); + $this->expectException('Exception'); $this->getApi()->addSubscriber($subscriber); } @@ -568,7 +568,7 @@ class APITest extends \MailPoetTest { 'email' => 'test@example.com', ]; $segments = [$segment->id()]; - $this->setExpectedException('\Exception'); + $this->expectException('\Exception'); $API->addSubscriber($subscriber, $segments, ['schedule_welcome_email' => true, 'send_confirmation_email' => false]); } @@ -649,7 +649,8 @@ class APITest extends \MailPoetTest { $subscriber = [ 'email' => 'test@example.com', ]; - $this->setExpectedException('\Exception', 'Subscriber added to lists, but confirmation email failed to send: big error'); + $this->expectException('\Exception'); + $this->expectExceptionMessage('Subscriber added to lists, but confirmation email failed to send: big error'); $API->addSubscriber($subscriber, [$segment->id], ['send_confirmation_email' => true]); } diff --git a/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php b/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php index 902b842c58..f89429519c 100644 --- a/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php +++ b/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php @@ -17,7 +17,7 @@ use MailPoet\Tasks\Sending; use MailPoet\WooCommerce\Helper as WCHelper; use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Idiorm\ORM; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class PurchasedInCategoryTest extends \MailPoetTest { diff --git a/tests/integration/Cron/Workers/InactiveSubscribersTest.php b/tests/integration/Cron/Workers/InactiveSubscribersTest.php index 2a012bdd4e..ac2fe5d694 100644 --- a/tests/integration/Cron/Workers/InactiveSubscribersTest.php +++ b/tests/integration/Cron/Workers/InactiveSubscribersTest.php @@ -120,7 +120,8 @@ class InactiveSubscribersTest extends \MailPoetTest { ], $this); $worker = new InactiveSubscribers($controllerMock, $this->settings); - $this->setExpectedException(\Exception::class, 'Maximum execution time has been reached.'); + $this->expectException(\Exception::class); + $this->expectExceptionMessage('Maximum execution time has been reached.'); $worker->processTaskStrategy(ScheduledTask::createOrUpdate([]), microtime(true) - $this->cronHelper->getDaemonExecutionLimit()); } } diff --git a/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php b/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php index 73b36523e8..920ad20ad9 100644 --- a/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php @@ -7,7 +7,7 @@ use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck; use MailPoet\Services\Bridge; use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsRepository; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class PremiumKeyCheckTest extends \MailPoetTest { public $worker; diff --git a/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php b/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php index c5db8b1ee7..37a5422a92 100644 --- a/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php @@ -9,7 +9,7 @@ use MailPoet\Mailer\Mailer; use MailPoet\Services\Bridge; use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsRepository; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class SendingServiceKeyCheckTest extends \MailPoetTest { public $worker; diff --git a/tests/integration/Cron/Workers/WooCommerceOrdersTest.php b/tests/integration/Cron/Workers/WooCommerceOrdersTest.php index 5fb57f1e1b..3dcb34927c 100644 --- a/tests/integration/Cron/Workers/WooCommerceOrdersTest.php +++ b/tests/integration/Cron/Workers/WooCommerceOrdersTest.php @@ -12,7 +12,7 @@ use MailPoet\Models\StatisticsWooCommercePurchases; use MailPoet\Statistics\Track\WooCommercePurchases; use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoetVendor\Idiorm\ORM; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class WooCommerceOrdersTest extends \MailPoetTest { /** @var MockObject */ diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php index fad80b53e4..d972b424ab 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php @@ -5,7 +5,7 @@ namespace MailPoet\DynamicSegments\FreePluginConnectors; use Codeception\Stub; use Codeception\Stub\Expected; use MailPoet\Models\DynamicSegment; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class AddToNewslettersSegmentsTest extends \MailPoetTest { diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php index de458d3171..a4650d2fd8 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php @@ -5,7 +5,7 @@ namespace MailPoet\DynamicSegments\FreePluginConnectors; use Codeception\Stub; use Codeception\Stub\Expected; use MailPoet\Models\DynamicSegment; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class AddToSubscribersFiltersTest extends \MailPoetTest { diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php index 3a76222533..3d129b6a3a 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php @@ -8,7 +8,7 @@ use MailPoet\DynamicSegments\Persistence\Loading\SubscribersIds; use MailPoet\Models\DynamicSegment; use MailPoet\Models\Segment; use MailPoet\Models\Subscriber; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class SendingNewslettersSubscribersFinderTest extends \MailPoetTest { diff --git a/tests/integration/DynamicSegments/Mappers/FormDataMapperTest.php b/tests/integration/DynamicSegments/Mappers/FormDataMapperTest.php index ffbd9e3024..cf7fd9eb05 100644 --- a/tests/integration/DynamicSegments/Mappers/FormDataMapperTest.php +++ b/tests/integration/DynamicSegments/Mappers/FormDataMapperTest.php @@ -19,7 +19,7 @@ class FormDataMapperTest extends \MailPoetTest { 'description' => '', 'segmentType' => '', ]; - $this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); + $this->expectException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); $this->mapper->mapDataToDB($data); } @@ -29,7 +29,7 @@ class FormDataMapperTest extends \MailPoetTest { 'description' => '', 'segmentType' => 'invalid', ]; - $this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); + $this->expectException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); $this->mapper->mapDataToDB($data); } @@ -44,7 +44,7 @@ class FormDataMapperTest extends \MailPoetTest { $this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment); $this->assertEquals('Name', $segment->name); $this->assertEquals('Description', $segment->description); - $this->assertNull($segment->id); + $this->assertTrue($segment->id === null); $this->assertCount(1, $segment->getFilters()); } @@ -54,7 +54,7 @@ class FormDataMapperTest extends \MailPoetTest { 'description' => 'Description', 'segmentType' => 'woocommerce', ]; - $this->setExpectedException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); + $this->expectException('\MailPoet\DynamicSegments\Exceptions\InvalidSegmentTypeException'); $this->mapper->mapDataToDB($data); } @@ -70,7 +70,7 @@ class FormDataMapperTest extends \MailPoetTest { $this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment); $this->assertEquals('Name', $segment->name); $this->assertEquals('Description', $segment->description); - $this->assertNull($segment->id); + $this->assertTrue($segment->id === null); $filters = $segment->getFilters(); $this->assertCount(1, $filters); $this->assertInstanceOf('\MailPoet\DynamicSegments\Filters\WooCommerceCategory', $filters[0]); @@ -88,7 +88,7 @@ class FormDataMapperTest extends \MailPoetTest { $this->assertInstanceOf('\MailPoet\Models\DynamicSegment', $segment); $this->assertEquals('Name', $segment->name); $this->assertEquals('Description', $segment->description); - $this->assertNull($segment->id); + $this->assertTrue($segment->id === null); $filters = $segment->getFilters(); $this->assertCount(1, $filters); $this->assertInstanceOf('\MailPoet\DynamicSegments\Filters\WooCommerceProduct', $filters[0]); diff --git a/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php b/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php index 5ee1e81772..9ca8d88a74 100644 --- a/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php +++ b/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php @@ -38,7 +38,7 @@ class SingleSegmentLoaderTest extends \MailPoetTest { } public function testItThrowsForUnknownSegment() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException('InvalidArgumentException'); $this->loader->load($this->segment->id + 11564564); } diff --git a/tests/integration/DynamicSegments/Persistence/Loading/SubscribersCountTest.php b/tests/integration/DynamicSegments/Persistence/Loading/SubscribersCountTest.php index 6e7f032c34..b8e0556bb2 100644 --- a/tests/integration/DynamicSegments/Persistence/Loading/SubscribersCountTest.php +++ b/tests/integration/DynamicSegments/Persistence/Loading/SubscribersCountTest.php @@ -7,10 +7,11 @@ require_once(ABSPATH . 'wp-admin/includes/user.php'); use MailPoet\DynamicSegments\Filters\UserRole; use MailPoet\DynamicSegments\RequirementsChecker; use MailPoet\Models\DynamicSegment; +use PHPUnit\Framework\MockObject\MockObject; class SubscribersCountTest extends \MailPoetTest { - /** @var RequirementsChecker|\PHPUnit_Framework_MockObject_MockObject */ + /** @var RequirementsChecker|MockObject */ private $requirementChecker; public function _before() { diff --git a/tests/integration/DynamicSegments/Persistence/Loading/SubscribersIdsTest.php b/tests/integration/DynamicSegments/Persistence/Loading/SubscribersIdsTest.php index b4280811c5..580f6e59c5 100644 --- a/tests/integration/DynamicSegments/Persistence/Loading/SubscribersIdsTest.php +++ b/tests/integration/DynamicSegments/Persistence/Loading/SubscribersIdsTest.php @@ -8,12 +8,13 @@ use MailPoet\DynamicSegments\Filters\UserRole; use MailPoet\DynamicSegments\RequirementsChecker; use MailPoet\Models\DynamicSegment; use MailPoet\Models\Subscriber; +use PHPUnit\Framework\MockObject\MockObject; class SubscribersIdsTest extends \MailPoetTest { private $editorsWpIds = []; - /** @var RequirementsChecker|\PHPUnit_Framework_MockObject_MockObject */ + /** @var RequirementsChecker|MockObject */ private $requirementChecker; public function _before() { diff --git a/tests/integration/Mailer/MailerLogTest.php b/tests/integration/Mailer/MailerLogTest.php index 5055014d0b..2dc820f49d 100644 --- a/tests/integration/Mailer/MailerLogTest.php +++ b/tests/integration/Mailer/MailerLogTest.php @@ -160,7 +160,7 @@ class MailerLogTest extends \MailPoetTest { expect($mailerLog['retry_at'])->null(); expect($mailerLog['error'])->null(); // retry attempt should be incremented, error logged, retry attempt scheduled - $this->setExpectedException('\Exception'); + $this->expectException('\Exception'); MailerLog::processError($operation = 'send', $error = 'email rejected'); $mailerLog = MailerLog::getMailerLog(); expect($mailerLog['retry_attempt'])->equals(1); @@ -178,7 +178,7 @@ class MailerLogTest extends \MailPoetTest { expect($mailerLog['retry_attempt'])->null(); expect($mailerLog['retry_at'])->null(); expect($mailerLog['error'])->null(); - $this->setExpectedException('\Exception'); + $this->expectException('\Exception'); MailerLog::processNonBlockingError($operation = 'send', $error = 'email rejected'); $mailerLog = MailerLog::getMailerLog(); expect($mailerLog['retry_attempt'])->equals(1); diff --git a/tests/integration/Newsletter/Editor/PostContentTransformerTest.php b/tests/integration/Newsletter/Editor/PostContentTransformerTest.php index 3057deffbc..67f991a87f 100644 --- a/tests/integration/Newsletter/Editor/PostContentTransformerTest.php +++ b/tests/integration/Newsletter/Editor/PostContentTransformerTest.php @@ -5,7 +5,7 @@ namespace MailPoet\Test\Newsletter\Editor; use Codeception\Stub\Expected; use MailPoet\Newsletter\Editor\PostTransformer; use MailPoet\Newsletter\Editor\PostTransformerContentsExtractor; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class PostContentTransformerTest extends \MailPoetTest { /** @var array */ diff --git a/tests/integration/Segments/BulkActionTest.php b/tests/integration/Segments/BulkActionTest.php index 0fa3a2051a..43d07a5d59 100644 --- a/tests/integration/Segments/BulkActionTest.php +++ b/tests/integration/Segments/BulkActionTest.php @@ -8,7 +8,7 @@ use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberSegment; use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Idiorm\ORM; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; require_once('SubscribersBulkActionHandlerMock.php'); @@ -57,7 +57,7 @@ class BulkActionTest extends \MailPoetTest { public function testBulkActionWithoutSegment() { $handler = new BulkAction([]); - $this->setExpectedException('InvalidArgumentException'); + $this->expectException('InvalidArgumentException'); $handler->apply(); } @@ -84,7 +84,7 @@ class BulkActionTest extends \MailPoetTest { 'listing' => ['filter' => ['segment' => $this->segment2->id]], 'action' => 'trash', ]); - $this->setExpectedException('InvalidArgumentException'); + $this->expectException('InvalidArgumentException'); remove_all_filters('mailpoet_subscribers_in_segment_apply_bulk_action_handlers'); $handler->apply(); } diff --git a/tests/integration/Segments/SubscribersFinderTest.php b/tests/integration/Segments/SubscribersFinderTest.php index 0a8899e36b..615c119ebf 100644 --- a/tests/integration/Segments/SubscribersFinderTest.php +++ b/tests/integration/Segments/SubscribersFinderTest.php @@ -13,7 +13,7 @@ use MailPoet\Models\SubscriberSegment; use MailPoet\Tasks\Sending as SendingTask; use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Idiorm\ORM; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class SubscribersFinderTest extends \MailPoetTest { public $sending; diff --git a/tests/integration/Segments/SubscribersListingsTest.php b/tests/integration/Segments/SubscribersListingsTest.php index c79c258f89..9e5070e5ac 100644 --- a/tests/integration/Segments/SubscribersListingsTest.php +++ b/tests/integration/Segments/SubscribersListingsTest.php @@ -11,7 +11,7 @@ use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberSegment; use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Idiorm\ORM; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class SubscribersListingsTest extends \MailPoetTest { public $subscriber2; @@ -61,7 +61,7 @@ class SubscribersListingsTest extends \MailPoetTest { } public function testTryToGetListingsWithoutPassingSegment() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException('InvalidArgumentException'); $this->finder->getListingsInSegment([]); } @@ -93,7 +93,7 @@ class SubscribersListingsTest extends \MailPoetTest { } public function testTryToGetListingsForSegmentWithoutHandler() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException('InvalidArgumentException'); remove_all_filters('mailpoet_get_subscribers_listings_in_segment_handlers'); $this->finder->getListingsInSegment(['filter' => ['segment' => $this->segment2->id]]); } diff --git a/tests/integration/Services/BridgeTest.php b/tests/integration/Services/BridgeTest.php index f048ea4535..8683859fe4 100644 --- a/tests/integration/Services/BridgeTest.php +++ b/tests/integration/Services/BridgeTest.php @@ -10,7 +10,7 @@ use MailPoet\Services\Bridge\BridgeTestMockAPI as MockAPI; use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsRepository; use MailPoet\WP\Functions as WPFunctions; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; require_once('BridgeTestMockAPI.php'); diff --git a/tests/integration/Statistics/Track/WooCommercePurchasesTest.php b/tests/integration/Statistics/Track/WooCommercePurchasesTest.php index 0a0c0e0488..42b22cad03 100644 --- a/tests/integration/Statistics/Track/WooCommercePurchasesTest.php +++ b/tests/integration/Statistics/Track/WooCommercePurchasesTest.php @@ -14,7 +14,7 @@ use MailPoet\Tasks\Sending; use MailPoet\Util\Cookies; use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoetVendor\Idiorm\ORM; -use PHPUnit_Framework_MockObject_MockObject; +use PHPUnit\Framework\MockObject\MockObject; use WC_Order; class WooCommercePurchasesTest extends \MailPoetTest { @@ -321,7 +321,7 @@ class WooCommercePurchasesTest extends \MailPoetTest { return $click->save(); } - private function createWooCommerceHelperMock(PHPUnit_Framework_MockObject_MockObject $orderMock) { + private function createWooCommerceHelperMock(MockObject $orderMock) { $mock = $this->createMock(WooCommerceHelper::class); $mock->method('wcGetOrder')->willReturn($orderMock); return $mock; diff --git a/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php b/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php index 45d496956d..dac47a3de1 100644 --- a/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php +++ b/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php @@ -22,7 +22,7 @@ class RequiredCustomFieldValidatorTest extends \MailPoetTest { public function testItValidatesDataWithoutCustomField() { $validator = new RequiredCustomFieldValidator(); - $this->setExpectedException('Exception'); + $this->expectException('Exception'); $validator->validate([]); } @@ -38,13 +38,13 @@ class RequiredCustomFieldValidatorTest extends \MailPoetTest { public function testItValidatesDataWithEmptyCustomField() { $validator = new RequiredCustomFieldValidator(); - $this->setExpectedException('Exception'); + $this->expectException('Exception'); $validator->validate([$this->customField->id() => '']); } public function testItValidatesDataWithEmptyCustomFieldAsCFId() { $validator = new RequiredCustomFieldValidator(); - $this->setExpectedException('Exception'); + $this->expectException('Exception'); $validator->validate(['cf_' . $this->customField->id() => '']); } diff --git a/tests/integration/Subscribers/SourceTest.php b/tests/integration/Subscribers/SourceTest.php index 3540750724..f3c11c1b05 100644 --- a/tests/integration/Subscribers/SourceTest.php +++ b/tests/integration/Subscribers/SourceTest.php @@ -18,7 +18,7 @@ class SourceTest extends \MailPoetTest { $subscriber = Subscriber::createOrUpdate([ 'source' => Source::UNKNOWN, ]); - $this->setExpectedException('\InvalidArgumentException'); + $this->expectException('\InvalidArgumentException'); Source::setSource($subscriber, 'invalid source'); } diff --git a/tests/integration/WooCommerce/TransactionalEmailsTest.php b/tests/integration/WooCommerce/TransactionalEmailsTest.php index 6f50a4d977..428f74873b 100644 --- a/tests/integration/WooCommerce/TransactionalEmailsTest.php +++ b/tests/integration/WooCommerce/TransactionalEmailsTest.php @@ -224,19 +224,19 @@ class TransactionalEmailsTest extends \MailPoetTest { ); $transactionalEmails->useTemplateForWoocommerceEmails(); expect($addedActions)->count(1); - expect($addedActions['woocommerce_init'])->isCallable(); + expect($addedActions['woocommerce_init'])->callable(); $addedActions['woocommerce_init'](); expect($removedActions)->count(2); expect($addedActions)->count(4); - expect($addedActions['woocommerce_email_header'])->isCallable(); + expect($addedActions['woocommerce_email_header'])->callable(); ob_start(); $addedActions['woocommerce_email_header']('heading text'); expect(ob_get_clean())->equals('HTML before content with heading text'); - expect($addedActions['woocommerce_email_footer'])->isCallable(); + expect($addedActions['woocommerce_email_footer'])->callable(); ob_start(); $addedActions['woocommerce_email_footer'](); expect(ob_get_clean())->equals('HTML after content'); - expect($addedActions['woocommerce_email_styles'])->isCallable(); + expect($addedActions['woocommerce_email_styles'])->callable(); expect($addedActions['woocommerce_email_styles']('some css'))->equals('prefixed some css'); } diff --git a/tests/unit/Cron/Workers/StatsNotifications/SchedulerTest.php b/tests/unit/Cron/Workers/StatsNotifications/SchedulerTest.php index 8fac7c53a3..ec583feb51 100644 --- a/tests/unit/Cron/Workers/StatsNotifications/SchedulerTest.php +++ b/tests/unit/Cron/Workers/StatsNotifications/SchedulerTest.php @@ -7,19 +7,20 @@ use MailPoet\Entities\ScheduledTaskEntity; use MailPoet\Entities\StatsNotificationEntity; use MailPoet\Settings\SettingsController; use MailPoetVendor\Doctrine\ORM\EntityManager; +use PHPUnit\Framework\MockObject\MockObject; class SchedulerTest extends \MailPoetUnitTest { /** @var Scheduler */ private $statsNotifications; - /** @var SettingsController|\PHPUnit_Framework_MockObject_MockObject */ + /** @var SettingsController|MockObject */ private $settings; - /** @var EntityManager|\PHPUnit_Framework_MockObject_MockObject */ + /** @var EntityManager|MockObject */ private $entityManager; - /** @var StatsNotificationsRepository|\PHPUnit_Framework_MockObject_MockObject */ + /** @var StatsNotificationsRepository|MockObject */ private $repository; public function _before() { diff --git a/tests/unit/DynamicSegments/RequirementsCheckerTest.php b/tests/unit/DynamicSegments/RequirementsCheckerTest.php index 03430702d5..bebc175414 100644 --- a/tests/unit/DynamicSegments/RequirementsCheckerTest.php +++ b/tests/unit/DynamicSegments/RequirementsCheckerTest.php @@ -6,10 +6,11 @@ use MailPoet\DynamicSegments\Filters\EmailAction; use MailPoet\DynamicSegments\Filters\WooCommerceCategory; use MailPoet\Models\DynamicSegment; use MailPoet\WooCommerce\Helper; +use PHPUnit\Framework\MockObject\MockObject; class RequirementsCheckerTest extends \MailPoetUnitTest { - /** @var Helper|\PHPUnit_Framework_MockObject_MockObject */ + /** @var Helper|MockObject */ private $woocommerceHelper; /** @var RequirementsChecker */ diff --git a/tests/unit/Logging/LoggerFactoryTest.php b/tests/unit/Logging/LoggerFactoryTest.php index 27fe2941db..ffe76a2da8 100644 --- a/tests/unit/Logging/LoggerFactoryTest.php +++ b/tests/unit/Logging/LoggerFactoryTest.php @@ -4,7 +4,7 @@ namespace MailPoet\Logging; use MailPoet\Settings\SettingsController; use MailPoetVendor\Monolog\Handler\AbstractHandler; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class LoggerFactoryTest extends \MailPoetUnitTest { diff --git a/tests/unit/Referrals/ReferralDetectorTest.php b/tests/unit/Referrals/ReferralDetectorTest.php index b7af27fb11..35bdb1d3c8 100644 --- a/tests/unit/Referrals/ReferralDetectorTest.php +++ b/tests/unit/Referrals/ReferralDetectorTest.php @@ -4,7 +4,7 @@ namespace MailPoet\Referrals; use MailPoet\Settings\SettingsController; use MailPoet\WP\Functions as WPFunctions; -use PHPUnit_Framework_MockObject_MockObject as MockObject; +use PHPUnit\Framework\MockObject\MockObject; class ReferralDetectorTest extends \MailPoetUnitTest { diff --git a/tests/unit/_bootstrap.php b/tests/unit/_bootstrap.php index 7e34cd5bdf..06621c4be4 100644 --- a/tests/unit/_bootstrap.php +++ b/tests/unit/_bootstrap.php @@ -7,7 +7,7 @@ if (!function_exists('__')) { } // Fix for mocking WPFunctions -// [PHPUnit_Framework_Exception] Use of undefined constant OBJECT - assumed 'OBJECT' (this will throw an Error in a future version of PHP) +// [PHPUnit\Framework\Exception] Use of undefined constant OBJECT - assumed 'OBJECT' (this will throw an Error in a future version of PHP) if (!defined('OBJECT')) { define( 'OBJECT', 'OBJECT' ); }