diff --git a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php index adb3fe8d9e..df40dd7241 100644 --- a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php +++ b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php @@ -387,7 +387,6 @@ class AbandonedCartTest extends \MailPoetTest { public function _after() { parent::_after(); - WPFunctions::set(new WPFunctions()); Carbon::setTestNow(); // Restore original cart object $this->wooCommerce->cart = $this->cartBackup; diff --git a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php index 5395d43f10..371d1ddd52 100644 --- a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php +++ b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php @@ -359,9 +359,4 @@ class FirstPurchaseTest extends \MailPoetTest { $this->entityManager->flush(); return $sendingQueue; } - - public function _after() { - parent::_after(); - WPFunctions::set(new WPFunctions); - } } diff --git a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php index f687683f66..e10eba7e87 100644 --- a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php +++ b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php @@ -36,7 +36,6 @@ class PurchasedInCategoryTest extends \MailPoetTest { private $segmentsRepository; public function _before() { - WPFunctions::set(new WPFunctions); WPFunctions::get()->removeAllFilters('woocommerce_payment_complete'); $this->woocommerceHelper = $this->createMock(WCHelper::class); $this->event = new PurchasedInCategory($this->woocommerceHelper); diff --git a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php index 2d84182e52..46cad225cf 100644 --- a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php +++ b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php @@ -280,9 +280,4 @@ class PurchasedProductTest extends \MailPoetTest { return $subscriber; } - - public function _after() { - parent::_after(); - WPFunctions::set(new WPFunctions); - } } diff --git a/mailpoet/tests/integration/Config/AccessControlTest.php b/mailpoet/tests/integration/Config/AccessControlTest.php index f5ec5a6d14..699bbc465c 100644 --- a/mailpoet/tests/integration/Config/AccessControlTest.php +++ b/mailpoet/tests/integration/Config/AccessControlTest.php @@ -112,9 +112,4 @@ class AccessControlTest extends \MailPoetTest { expect($accessControl->validatePermission($capability))->true(); } - - public function _after() { - parent::_after(); - WPFunctions::set(new WPFunctions); - } } diff --git a/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php b/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php index b15be7e1e6..56dbe3e94b 100644 --- a/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php +++ b/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php @@ -427,7 +427,6 @@ class SchedulerTest extends \MailPoetTest { $scheduledTask = $this->scheduledTasksRepository->findOneBySendingQueue($sendingQueue); $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask); $this->tester->assertEqualDateTimes($scheduledTask->getScheduledAt(), $currentTime->addMinutes(ScheduledTask::BASIC_RESCHEDULE_TIMEOUT), 1); - WPFunctions::set(new WPFunctions()); } public function testItDoesntRunQueueDeliveryWhenMailpoetSubscriberHasUnsubscribed() { diff --git a/mailpoet/tests/integration/Newsletter/Preview/SendPreviewControllerTest.php b/mailpoet/tests/integration/Newsletter/Preview/SendPreviewControllerTest.php index 6e4d37c9bb..1061d97f1d 100644 --- a/mailpoet/tests/integration/Newsletter/Preview/SendPreviewControllerTest.php +++ b/mailpoet/tests/integration/Newsletter/Preview/SendPreviewControllerTest.php @@ -56,11 +56,6 @@ class SendPreviewControllerTest extends \MailPoetTest { $this->newsletter = $newsletter; } - public function _after() { - parent::_after(); - WPFunctions::set(new WPFunctions()); - } - public function testItCanSendAPreview() { $mailer = $this->makeEmpty(Mailer::class, [ 'send' => Expected::once( diff --git a/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php b/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php index cbf644378d..430900896f 100644 --- a/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php +++ b/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php @@ -85,11 +85,6 @@ class UserFlagsControllerTest extends \MailPoetTest { expect($flag)->null(); } - public function _after() { - parent::_after(); - WPFunctions::set(new WPFunctions); - } - private function createUserFlag($userId, $name, $value) { $flag = new UserFlagEntity(); $flag->setUserId($userId); diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php index 7d51d95c7c..f838807d32 100644 --- a/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php +++ b/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php @@ -797,7 +797,6 @@ class ImportTest extends \MailPoetTest { $data['subscribers'][1][2], ]]); expect($newSubscribers)->count(2); - WPFunctions::set(new WPFunctions()); } public function testItOnlyAppliesCustomFormatToSitesWithCustomFormat(): void { @@ -823,7 +822,6 @@ class ImportTest extends \MailPoetTest { ]]); expect($newSubscribers)->count(1); expect($newSubscribers[0]->getEmail())->equals('correctdateformat2@yopmail.com'); - WPFunctions::set(new WPFunctions()); } private function createImportInstance(array $data): Import { diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/Import/MailChimpTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/Import/MailChimpTest.php index f69fc931a2..416b98eaa3 100644 --- a/mailpoet/tests/integration/Subscribers/ImportExport/Import/MailChimpTest.php +++ b/mailpoet/tests/integration/Subscribers/ImportExport/Import/MailChimpTest.php @@ -176,9 +176,4 @@ class MailChimpTest extends \MailPoetTest { ]; expect($this->mailchimp->isSubscriberAllowed($subscribed))->true(); } - - public function _after(): void { - parent::_after(); - WPFunctions::set(new WPFunctions); - } } diff --git a/mailpoet/tests/integration/Twig/FunctionsTest.php b/mailpoet/tests/integration/Twig/FunctionsTest.php index 2efdd305aa..79ba688850 100644 --- a/mailpoet/tests/integration/Twig/FunctionsTest.php +++ b/mailpoet/tests/integration/Twig/FunctionsTest.php @@ -21,9 +21,4 @@ class FunctionsTest extends \MailPoetTest { $resultNoRtl = $twig->render('template'); expect($resultNoRtl)->isEmpty(); } - - public function _after() { - parent::_after(); - WPFunctions::set(new WPFunctions); - } } diff --git a/mailpoet/tests/integration/_bootstrap.php b/mailpoet/tests/integration/_bootstrap.php index 60af97cb16..014377f10d 100644 --- a/mailpoet/tests/integration/_bootstrap.php +++ b/mailpoet/tests/integration/_bootstrap.php @@ -6,6 +6,7 @@ use MailPoet\Cron\CronTrigger; use MailPoet\DI\ContainerWrapper; use MailPoet\Features\FeaturesController; use MailPoet\Settings\SettingsController; +use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Doctrine\DBAL\Connection; use MailPoetVendor\Doctrine\ORM\EntityManager; use MailPoetVendor\Doctrine\Persistence\Mapping\ClassMetadata; @@ -97,6 +98,8 @@ abstract class MailPoetTest extends \Codeception\TestCase\Test { // phpcs:ignore $this->diContainer = ContainerWrapper::getInstance(WP_DEBUG); $this->connection = $this->diContainer->get(Connection::class); $this->entityManager = $this->diContainer->get(EntityManager::class); + // Reset WPFunctions + WPFunctions::set(new WPFunctions()); // switch cron to Linux method $this->diContainer->get(\MailPoet\Cron\DaemonActionSchedulerRunner::class)->deactivate(); $this->diContainer->get(SettingsController::class)->set('cron_trigger.method', CronTrigger::METHOD_LINUX_CRON);