diff --git a/lib/API/API.php b/lib/API/API.php index 72be267435..76e5b8c9c4 100644 --- a/lib/API/API.php +++ b/lib/API/API.php @@ -6,7 +6,6 @@ use MailPoet\DI\ContainerWrapper; use MailPoetVendor\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException; class API { - /** * @param string $version * @return \MailPoet\API\MP\v1\API diff --git a/lib/API/JSON/API.php b/lib/API/JSON/API.php index b447d4c905..e055fe64cf 100644 --- a/lib/API/JSON/API.php +++ b/lib/API/JSON/API.php @@ -41,7 +41,6 @@ class API { const CURRENT_VERSION = 'v1'; - public function __construct( ContainerInterface $container, AccessControl $accessControl, diff --git a/lib/API/JSON/ResponseBuilders/CustomFieldsResponseBuilder.php b/lib/API/JSON/ResponseBuilders/CustomFieldsResponseBuilder.php index c081220a87..9375ded51b 100644 --- a/lib/API/JSON/ResponseBuilders/CustomFieldsResponseBuilder.php +++ b/lib/API/JSON/ResponseBuilders/CustomFieldsResponseBuilder.php @@ -5,7 +5,6 @@ namespace MailPoet\API\JSON\ResponseBuilders; use MailPoet\Entities\CustomFieldEntity; class CustomFieldsResponseBuilder { - /** * @param CustomFieldEntity[] $customFields * @return array diff --git a/lib/API/JSON/v1/MP2Migrator.php b/lib/API/JSON/v1/MP2Migrator.php index 2ce62216f9..955960fe65 100644 --- a/lib/API/JSON/v1/MP2Migrator.php +++ b/lib/API/JSON/v1/MP2Migrator.php @@ -67,5 +67,4 @@ class MP2Migrator extends APIEndpoint { ]); } } - } diff --git a/lib/API/JSON/v1/NewsletterLinks.php b/lib/API/JSON/v1/NewsletterLinks.php index 4c3676ba16..b55cf65d6b 100644 --- a/lib/API/JSON/v1/NewsletterLinks.php +++ b/lib/API/JSON/v1/NewsletterLinks.php @@ -16,5 +16,4 @@ class NewsletterLinks extends APIEndpoint { $links = NewsletterLink::select(['id', 'url'])->where('newsletter_id', $data['newsletterId'])->findArray(); return $this->successResponse($links); } - } diff --git a/lib/Analytics/Analytics.php b/lib/Analytics/Analytics.php index 007bb3f418..a69f6ec80d 100644 --- a/lib/Analytics/Analytics.php +++ b/lib/Analytics/Analytics.php @@ -95,5 +95,4 @@ class Analytics { private function recordDataSent() { $this->settings->set(Analytics::SETTINGS_LAST_SENT_KEY, Carbon::now()); } - } diff --git a/lib/Config/DeactivationSurvey.php b/lib/Config/DeactivationSurvey.php index 99960465e6..08e9e18af7 100644 --- a/lib/Config/DeactivationSurvey.php +++ b/lib/Config/DeactivationSurvey.php @@ -59,5 +59,4 @@ class DeactivationSurvey { // if the website fails to render we have other places to catch and display the error } } - } diff --git a/lib/Config/DeferredAdminNotices.php b/lib/Config/DeferredAdminNotices.php index 7e2d7fbf52..d3462716a3 100644 --- a/lib/Config/DeferredAdminNotices.php +++ b/lib/Config/DeferredAdminNotices.php @@ -33,5 +33,4 @@ class DeferredAdminNotices { WPFunctions::get()->deleteOption(DeferredAdminNotices::OPTIONS_KEY_NAME); } } - } diff --git a/lib/Config/MP2Migrator.php b/lib/Config/MP2Migrator.php index 65162d1a07..3dc8627dd4 100644 --- a/lib/Config/MP2Migrator.php +++ b/lib/Config/MP2Migrator.php @@ -44,7 +44,6 @@ class MP2Migrator { private $mp2UserTable; private $mp2UserListTable; - public function __construct(SettingsController $settings, Activator $activator) { $this->defineMP2Tables(); $logFilename = 'mp2migration.log'; diff --git a/lib/Config/PersonalDataErasers.php b/lib/Config/PersonalDataErasers.php index c2026cd84d..d11c13e3e4 100644 --- a/lib/Config/PersonalDataErasers.php +++ b/lib/Config/PersonalDataErasers.php @@ -6,7 +6,6 @@ use MailPoet\Subscribers\SubscriberPersonalDataEraser; use MailPoet\WP\Functions as WPFunctions; class PersonalDataErasers { - public function init() { WPFunctions::get()->addFilter('wp_privacy_personal_data_erasers', [$this, 'registerSubscriberEraser']); } @@ -19,5 +18,4 @@ class PersonalDataErasers { return $erasers; } - } diff --git a/lib/Config/PersonalDataExporters.php b/lib/Config/PersonalDataExporters.php index a130d91302..9fd701b0d8 100644 --- a/lib/Config/PersonalDataExporters.php +++ b/lib/Config/PersonalDataExporters.php @@ -9,7 +9,6 @@ use MailPoet\Subscribers\ImportExport\PersonalDataExporters\SubscriberExporter; use MailPoet\WP\Functions as WPFunctions; class PersonalDataExporters { - public function init() { WPFunctions::get()->addFilter('wp_privacy_personal_data_exporters', [$this, 'registerSubscriberExporter']); WPFunctions::get()->addFilter('wp_privacy_personal_data_exporters', [$this, 'registerSegmentsExporter']); @@ -48,5 +47,4 @@ class PersonalDataExporters { ]; return $exporters; } - } diff --git a/lib/Config/PrivacyPolicy.php b/lib/Config/PrivacyPolicy.php index bbeca6ab92..5c65aa8c65 100644 --- a/lib/Config/PrivacyPolicy.php +++ b/lib/Config/PrivacyPolicy.php @@ -7,7 +7,6 @@ use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoet\WP\Functions as WPFunctions; class PrivacyPolicy { - public function init() { if (function_exists('wp_add_privacy_policy_content')) { wp_add_privacy_policy_content(__('MailPoet', 'mailpoet'), $this->getPrivacyPolicyContent()); @@ -66,5 +65,4 @@ class PrivacyPolicy { } return $content; } - } diff --git a/lib/Cron/Workers/ExportFilesCleanup.php b/lib/Cron/Workers/ExportFilesCleanup.php index cd0b319320..e64d187e28 100644 --- a/lib/Cron/Workers/ExportFilesCleanup.php +++ b/lib/Cron/Workers/ExportFilesCleanup.php @@ -25,5 +25,4 @@ class ExportFilesCleanup extends SimpleWorker { } return true; } - } diff --git a/lib/Cron/Workers/InactiveSubscribers.php b/lib/Cron/Workers/InactiveSubscribers.php index 642279de8d..e32990e8c3 100644 --- a/lib/Cron/Workers/InactiveSubscribers.php +++ b/lib/Cron/Workers/InactiveSubscribers.php @@ -28,7 +28,6 @@ class InactiveSubscribers extends SimpleWorker { parent::__construct(); } - public function processTaskStrategy(ScheduledTask $task, $timer) { $trackingEnabled = (bool)$this->settings->get('tracking.enabled'); if (!$trackingEnabled) { diff --git a/lib/Cron/Workers/KeyCheck/PremiumKeyCheck.php b/lib/Cron/Workers/KeyCheck/PremiumKeyCheck.php index e45480089f..27a5694953 100644 --- a/lib/Cron/Workers/KeyCheck/PremiumKeyCheck.php +++ b/lib/Cron/Workers/KeyCheck/PremiumKeyCheck.php @@ -16,7 +16,6 @@ class PremiumKeyCheck extends KeyCheckWorker { parent::__construct(); } - public function checkProcessingRequirements() { return Bridge::isPremiumKeySpecified(); } diff --git a/lib/Cron/Workers/StatsNotifications/NewsletterLinkRepository.php b/lib/Cron/Workers/StatsNotifications/NewsletterLinkRepository.php index f658402615..76dd67e458 100644 --- a/lib/Cron/Workers/StatsNotifications/NewsletterLinkRepository.php +++ b/lib/Cron/Workers/StatsNotifications/NewsletterLinkRepository.php @@ -27,5 +27,4 @@ class NewsletterLinkRepository extends Repository { ->getQuery() ->getOneOrNullResult(); } - } diff --git a/lib/Cron/Workers/StatsNotifications/Scheduler.php b/lib/Cron/Workers/StatsNotifications/Scheduler.php index 567d046740..53c9d7febd 100644 --- a/lib/Cron/Workers/StatsNotifications/Scheduler.php +++ b/lib/Cron/Workers/StatsNotifications/Scheduler.php @@ -101,5 +101,4 @@ class Scheduler { $date->addHours(self::HOURS_TO_SEND_AFTER_NEWSLETTER); return $date; } - } diff --git a/lib/Cron/Workers/StatsNotifications/StatsNotificationsRepository.php b/lib/Cron/Workers/StatsNotifications/StatsNotificationsRepository.php index cbc17d53ea..bbebcb35f5 100644 --- a/lib/Cron/Workers/StatsNotifications/StatsNotificationsRepository.php +++ b/lib/Cron/Workers/StatsNotifications/StatsNotificationsRepository.php @@ -53,5 +53,4 @@ class StatsNotificationsRepository extends Repository { } return $query->getQuery()->getResult(); } - } diff --git a/lib/Cron/Workers/StatsNotifications/Worker.php b/lib/Cron/Workers/StatsNotifications/Worker.php index 36823fc1ba..84d3dfb95c 100644 --- a/lib/Cron/Workers/StatsNotifications/Worker.php +++ b/lib/Cron/Workers/StatsNotifications/Worker.php @@ -169,5 +169,4 @@ class Worker { '[link:newsletter_view_in_browser_url]' => __('View in browser link', 'mailpoet'), ]; } - } diff --git a/lib/CustomFields/ApiDataSanitizer.php b/lib/CustomFields/ApiDataSanitizer.php index 237f72dbcb..995245e51c 100644 --- a/lib/CustomFields/ApiDataSanitizer.php +++ b/lib/CustomFields/ApiDataSanitizer.php @@ -171,5 +171,4 @@ class ApiDataSanitizer { } return $result; } - } diff --git a/lib/DI/ContainerConfigurator.php b/lib/DI/ContainerConfigurator.php index 6f82e34f46..eeee4c4930 100644 --- a/lib/DI/ContainerConfigurator.php +++ b/lib/DI/ContainerConfigurator.php @@ -7,7 +7,6 @@ use MailPoetVendor\Symfony\Component\DependencyInjection\ContainerBuilder; use MailPoetVendor\Symfony\Component\DependencyInjection\Reference; class ContainerConfigurator implements IContainerConfigurator { - public function getDumpNamespace() { return 'MailPoetGenerated'; } diff --git a/lib/DI/IContainerConfigurator.php b/lib/DI/IContainerConfigurator.php index 2218bc7035..3c47dade5c 100644 --- a/lib/DI/IContainerConfigurator.php +++ b/lib/DI/IContainerConfigurator.php @@ -9,6 +9,8 @@ interface IContainerConfigurator { const PREMIUM_CONTAINER_SERVICE_SLUG = 'premium_container'; public function configure(ContainerBuilder $container); + public function getDumpNamespace(); + public function getDumpClassname(); } diff --git a/lib/Doctrine/EntityTraits/AutoincrementedIdTrait.php b/lib/Doctrine/EntityTraits/AutoincrementedIdTrait.php index d91cb2d50e..1609cde47d 100644 --- a/lib/Doctrine/EntityTraits/AutoincrementedIdTrait.php +++ b/lib/Doctrine/EntityTraits/AutoincrementedIdTrait.php @@ -22,5 +22,4 @@ trait AutoincrementedIdTrait { public function setId($id) { $this->id = $id; } - } diff --git a/lib/DynamicSegments/Filters/Filter.php b/lib/DynamicSegments/Filters/Filter.php index 5aa968990a..0130997091 100644 --- a/lib/DynamicSegments/Filters/Filter.php +++ b/lib/DynamicSegments/Filters/Filter.php @@ -5,9 +5,7 @@ namespace MailPoet\DynamicSegments\Filters; use MailPoetVendor\Idiorm\ORM; interface Filter { - public function toSql(ORM $orm); public function toArray(); - } diff --git a/lib/DynamicSegments/FreePluginConnectors/AddToSubscribersFilters.php b/lib/DynamicSegments/FreePluginConnectors/AddToSubscribersFilters.php index d952912b8f..3eddbb6afd 100644 --- a/lib/DynamicSegments/FreePluginConnectors/AddToSubscribersFilters.php +++ b/lib/DynamicSegments/FreePluginConnectors/AddToSubscribersFilters.php @@ -63,5 +63,4 @@ class AddToSubscribersFilters { }); return array_merge($specialSegmentFilters, $segments); } - } diff --git a/lib/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinder.php b/lib/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinder.php index 6e1030ce64..b237e65b1b 100644 --- a/lib/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinder.php +++ b/lib/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinder.php @@ -52,5 +52,4 @@ class SendingNewslettersSubscribersFinder { } return $result; } - } diff --git a/lib/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandler.php b/lib/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandler.php index 7ae442a25c..2c92afca0e 100644 --- a/lib/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandler.php +++ b/lib/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandler.php @@ -8,7 +8,6 @@ use MailPoet\Listing\Handler; use MailPoet\Models\DynamicSegment; class SubscribersBulkActionHandler { - /** * @param array $segment * @param array $data @@ -22,5 +21,4 @@ class SubscribersBulkActionHandler { return $bulkAction->apply('\MailPoet\Models\SubscribersInDynamicSegment', $data); } } - } diff --git a/lib/DynamicSegments/FreePluginConnectors/SubscribersListingsHandlerFactory.php b/lib/DynamicSegments/FreePluginConnectors/SubscribersListingsHandlerFactory.php index 5b30b9affa..5b02cecb98 100644 --- a/lib/DynamicSegments/FreePluginConnectors/SubscribersListingsHandlerFactory.php +++ b/lib/DynamicSegments/FreePluginConnectors/SubscribersListingsHandlerFactory.php @@ -7,7 +7,6 @@ use MailPoet\Models\DynamicSegment; use MailPoet\Models\Segment; class SubscribersListingsHandlerFactory { - public function get(Segment $segment, $data) { if ($segment->type === DynamicSegment::TYPE_DYNAMIC) { $listing = new Handler(); diff --git a/lib/DynamicSegments/Mappers/DBMapper.php b/lib/DynamicSegments/Mappers/DBMapper.php index 4ac4e975f4..56d2c15644 100644 --- a/lib/DynamicSegments/Mappers/DBMapper.php +++ b/lib/DynamicSegments/Mappers/DBMapper.php @@ -12,7 +12,6 @@ use MailPoet\Models\DynamicSegment; use MailPoet\Models\DynamicSegmentFilter; class DBMapper { - /** * @param DynamicSegment $segmentData * @param DynamicSegmentFilter[] $filtersData @@ -82,5 +81,4 @@ class DBMapper { } return $data['segmentType']; } - } diff --git a/lib/DynamicSegments/Mappers/FormDataMapper.php b/lib/DynamicSegments/Mappers/FormDataMapper.php index c3d43fd6d5..1f267413df 100644 --- a/lib/DynamicSegments/Mappers/FormDataMapper.php +++ b/lib/DynamicSegments/Mappers/FormDataMapper.php @@ -11,7 +11,6 @@ use MailPoet\DynamicSegments\Filters\WooCommerceProduct; use MailPoet\Models\DynamicSegment; class FormDataMapper { - /** * @param array $data * @@ -116,5 +115,4 @@ class FormDataMapper { } } - } diff --git a/lib/DynamicSegments/Persistence/Loading/Loader.php b/lib/DynamicSegments/Persistence/Loading/Loader.php index 571e49a8de..01a24c14db 100644 --- a/lib/DynamicSegments/Persistence/Loading/Loader.php +++ b/lib/DynamicSegments/Persistence/Loading/Loader.php @@ -31,5 +31,4 @@ class Loader { return $this->mapper->mapSegments($segments, $filters); } - } diff --git a/lib/DynamicSegments/Persistence/Loading/SingleSegmentLoader.php b/lib/DynamicSegments/Persistence/Loading/SingleSegmentLoader.php index 905f17b3a5..e634b3f6a1 100644 --- a/lib/DynamicSegments/Persistence/Loading/SingleSegmentLoader.php +++ b/lib/DynamicSegments/Persistence/Loading/SingleSegmentLoader.php @@ -29,7 +29,4 @@ class SingleSegmentLoader { return $this->mapper->mapSegment($segment, $filters); } - - - } diff --git a/lib/DynamicSegments/Persistence/Loading/SubscribersCount.php b/lib/DynamicSegments/Persistence/Loading/SubscribersCount.php index 507763cf0a..171b0234bf 100644 --- a/lib/DynamicSegments/Persistence/Loading/SubscribersCount.php +++ b/lib/DynamicSegments/Persistence/Loading/SubscribersCount.php @@ -34,5 +34,4 @@ class SubscribersCount { } return $orm->findOne()->cnt; } - } diff --git a/lib/DynamicSegments/Persistence/Loading/SubscribersIds.php b/lib/DynamicSegments/Persistence/Loading/SubscribersIds.php index 245c1450ef..689c3b9dfd 100644 --- a/lib/DynamicSegments/Persistence/Loading/SubscribersIds.php +++ b/lib/DynamicSegments/Persistence/Loading/SubscribersIds.php @@ -40,5 +40,4 @@ class SubscribersIds { } return $orm->findMany(); } - } diff --git a/lib/DynamicSegments/Persistence/Saver.php b/lib/DynamicSegments/Persistence/Saver.php index 38a18cb8f1..852ab719d8 100644 --- a/lib/DynamicSegments/Persistence/Saver.php +++ b/lib/DynamicSegments/Persistence/Saver.php @@ -10,7 +10,6 @@ use MailPoet\Models\Model; use MailPoetVendor\Idiorm\ORM; class Saver { - /** * @param DynamicSegment $segment * diff --git a/lib/DynamicSegments/RequirementsChecker.php b/lib/DynamicSegments/RequirementsChecker.php index 251b98ce7b..2458c23db8 100644 --- a/lib/DynamicSegments/RequirementsChecker.php +++ b/lib/DynamicSegments/RequirementsChecker.php @@ -41,5 +41,4 @@ class RequirementsChecker { return $constants['SEGMENT_TYPE'] === 'woocommerce'; } - } diff --git a/lib/Entities/FormEntity.php b/lib/Entities/FormEntity.php index bc281136ac..987c7cd6a4 100644 --- a/lib/Entities/FormEntity.php +++ b/lib/Entities/FormEntity.php @@ -114,5 +114,4 @@ class FormEntity { 'deleted_at' => $this->getDeletedAt(), ]; } - } diff --git a/lib/Entities/NewsletterEntity.php b/lib/Entities/NewsletterEntity.php index 19bed3c4d0..9c5fc1c487 100644 --- a/lib/Entities/NewsletterEntity.php +++ b/lib/Entities/NewsletterEntity.php @@ -331,7 +331,6 @@ class NewsletterEntity { $this->gaCampaign = $gaCampaign; } - /** * @param string|null $unsubscribeToken */ diff --git a/lib/Entities/StatsNotificationEntity.php b/lib/Entities/StatsNotificationEntity.php index 6150e1536f..3d35f98dc5 100644 --- a/lib/Entities/StatsNotificationEntity.php +++ b/lib/Entities/StatsNotificationEntity.php @@ -46,5 +46,4 @@ class StatsNotificationEntity { public function getTask() { return $this->task; } - } diff --git a/lib/Entities/SubscriberEntity.php b/lib/Entities/SubscriberEntity.php index a07a7fba9a..22176e2df3 100644 --- a/lib/Entities/SubscriberEntity.php +++ b/lib/Entities/SubscriberEntity.php @@ -346,5 +346,4 @@ class SubscriberEntity { public function setLinkToken($linkToken) { $this->linkToken = $linkToken; } - } diff --git a/lib/Form/Block/Date.php b/lib/Form/Block/Date.php index d6f99b963e..92a1f178a2 100644 --- a/lib/Form/Block/Date.php +++ b/lib/Form/Block/Date.php @@ -90,6 +90,7 @@ class Date { 'month' => ['MM'], ]; } + public function getMonthNames(): array { return [__('January', 'mailpoet'), __('February', 'mailpoet'), __('March', 'mailpoet'), __('April', 'mailpoet'), __('May', 'mailpoet'), __('June', 'mailpoet'), __('July', 'mailpoet'), __('August', 'mailpoet'), __('September', 'mailpoet'), diff --git a/lib/Form/Block/Divider.php b/lib/Form/Block/Divider.php index 5cd5c136bc..617dfe79d6 100644 --- a/lib/Form/Block/Divider.php +++ b/lib/Form/Block/Divider.php @@ -3,7 +3,6 @@ namespace MailPoet\Form\Block; class Divider { - public function render(): string { return '
'; } diff --git a/lib/Form/Block/Html.php b/lib/Form/Block/Html.php index 1877969953..a4f00cfef6 100644 --- a/lib/Form/Block/Html.php +++ b/lib/Form/Block/Html.php @@ -3,7 +3,6 @@ namespace MailPoet\Form\Block; class Html { - public function render(array $block): string { $html = ''; $text = ''; diff --git a/lib/Form/DisplayFormInWPContent.php b/lib/Form/DisplayFormInWPContent.php index 9ccfee235c..c63ed74ec1 100644 --- a/lib/Form/DisplayFormInWPContent.php +++ b/lib/Form/DisplayFormInWPContent.php @@ -139,5 +139,4 @@ class DisplayFormInWPContent { ) return true; return false; } - } diff --git a/lib/Form/FormFactory.php b/lib/Form/FormFactory.php index 4b11365e9a..f60a98c5e4 100644 --- a/lib/Form/FormFactory.php +++ b/lib/Form/FormFactory.php @@ -5,7 +5,6 @@ namespace MailPoet\Form; use MailPoet\Models\Form; class FormFactory { - /** @return Form */ public function createEmptyForm() { $data = [ @@ -41,5 +40,4 @@ class FormFactory { ]; return Form::createOrUpdate($data); } - } diff --git a/lib/Form/FormsRepository.php b/lib/Form/FormsRepository.php index 7af0d9f47e..6f316a4f6a 100644 --- a/lib/Form/FormsRepository.php +++ b/lib/Form/FormsRepository.php @@ -31,5 +31,4 @@ class FormsRepository extends Repository { ->getQuery() ->getResult(); } - } diff --git a/lib/Form/Util/FieldNameObfuscator.php b/lib/Form/Util/FieldNameObfuscator.php index 9862b15cc6..7195c90a7f 100644 --- a/lib/Form/Util/FieldNameObfuscator.php +++ b/lib/Form/Util/FieldNameObfuscator.php @@ -46,5 +46,4 @@ class FieldNameObfuscator { private function wasFieldObfuscated($name) { return strpos($name, FieldNameObfuscator::OBFUSCATED_FIELD_PREFIX) === 0; } - } diff --git a/lib/Logging/LogHandler.php b/lib/Logging/LogHandler.php index d47bae7159..3ff59292ef 100644 --- a/lib/Logging/LogHandler.php +++ b/lib/Logging/LogHandler.php @@ -57,5 +57,4 @@ class LogHandler extends AbstractProcessingHandler { Log::whereLt('created_at', Carbon::create()->subDays(self::DAYS_TO_KEEP_LOGS)->toDateTimeString()) ->deleteMany(); } - } diff --git a/lib/Logging/LoggerFactory.php b/lib/Logging/LoggerFactory.php index c0834042ab..e2f0ceb409 100644 --- a/lib/Logging/LoggerFactory.php +++ b/lib/Logging/LoggerFactory.php @@ -82,5 +82,4 @@ class LoggerFactory { return \MailPoetVendor\Monolog\Logger::ERROR; } } - } diff --git a/lib/Mailer/WordPress/WordPressMailer.php b/lib/Mailer/WordPress/WordPressMailer.php index 669d95e0e5..6d3f97b3e3 100644 --- a/lib/Mailer/WordPress/WordPressMailer.php +++ b/lib/Mailer/WordPress/WordPressMailer.php @@ -100,5 +100,4 @@ class WordPressMailer extends \PHPMailer { } return $result; } - } diff --git a/lib/Models/DynamicSegment.php b/lib/Models/DynamicSegment.php index f655465a85..e4f016fe96 100644 --- a/lib/Models/DynamicSegment.php +++ b/lib/Models/DynamicSegment.php @@ -110,5 +110,4 @@ class DynamicSegment extends MailPoetSegment { return ['count' => $count]; } - } diff --git a/lib/Models/DynamicSegmentFilter.php b/lib/Models/DynamicSegmentFilter.php index 79bd0fc667..f56586e30a 100644 --- a/lib/Models/DynamicSegmentFilter.php +++ b/lib/Models/DynamicSegmentFilter.php @@ -53,5 +53,4 @@ class DynamicSegmentFilter extends Model { $query->deleteMany(); } - } diff --git a/lib/Models/Form.php b/lib/Models/Form.php index d48f4cd083..cd14f93f31 100644 --- a/lib/Models/Form.php +++ b/lib/Models/Form.php @@ -137,5 +137,4 @@ class Form extends Model { } } } - } diff --git a/lib/Models/MappingToExternalEntities.php b/lib/Models/MappingToExternalEntities.php index a21538d24c..2f097f4906 100644 --- a/lib/Models/MappingToExternalEntities.php +++ b/lib/Models/MappingToExternalEntities.php @@ -10,5 +10,4 @@ class MappingToExternalEntities extends Model { $relation->hydrate($data); return $relation->save(); } - } diff --git a/lib/Models/Newsletter.php b/lib/Models/Newsletter.php index 98d14370ca..47ff919ec5 100644 --- a/lib/Models/Newsletter.php +++ b/lib/Models/Newsletter.php @@ -647,7 +647,6 @@ class Newsletter extends Model { return ((int)$queue->count) > 0; } - public static function getAnalytics() { $welcomeNewslettersCount = Newsletter::getPublished() ->filter('filterType', self::TYPE_WELCOME) diff --git a/lib/Models/NewsletterTemplate.php b/lib/Models/NewsletterTemplate.php index a300e22d3d..030230489d 100644 --- a/lib/Models/NewsletterTemplate.php +++ b/lib/Models/NewsletterTemplate.php @@ -53,5 +53,4 @@ class NewsletterTemplate extends Model { } return $template; } - } diff --git a/lib/Models/SubscribersInDynamicSegment.php b/lib/Models/SubscribersInDynamicSegment.php index 92db12284a..4e6d5dd78f 100644 --- a/lib/Models/SubscribersInDynamicSegment.php +++ b/lib/Models/SubscribersInDynamicSegment.php @@ -8,7 +8,6 @@ use MailPoet\DynamicSegments\RequirementsChecker; use MailPoet\WooCommerce\Helper as WooCommerceHelper; class SubscribersInDynamicSegment extends Subscriber { - public static function listingQuery(array $data = []) { $query = self::select(self::$_table . '.*'); $singleSegmentLoader = new SingleSegmentLoader(new DBMapper()); @@ -32,6 +31,4 @@ class SubscribersInDynamicSegment extends Subscriber { $requirementsChecker = new RequirementsChecker(new WooCommerceHelper()); return $requirementsChecker->shouldSkipSegment($dynamicSegment); } - - } diff --git a/lib/Newsletter/Editor/MetaInformationManager.php b/lib/Newsletter/Editor/MetaInformationManager.php index 560a772691..08d4dcd448 100644 --- a/lib/Newsletter/Editor/MetaInformationManager.php +++ b/lib/Newsletter/Editor/MetaInformationManager.php @@ -5,7 +5,6 @@ namespace MailPoet\Newsletter\Editor; use MailPoet\WP\Functions as WPFunctions; class MetaInformationManager { - public function appendMetaInformation($content, $post, $args) { // Append author and categories above and below contents foreach (['above', 'below'] as $position) { @@ -37,7 +36,6 @@ class MetaInformationManager { return $content; } - private static function getPostCategories($postId, $postType, $precededBy) { $precededBy = trim($precededBy); diff --git a/lib/Newsletter/Editor/StructureTransformer.php b/lib/Newsletter/Editor/StructureTransformer.php index b1b8b85144..5e62b983f6 100644 --- a/lib/Newsletter/Editor/StructureTransformer.php +++ b/lib/Newsletter/Editor/StructureTransformer.php @@ -7,7 +7,6 @@ use pQuery; use pQuery\DomNode; class StructureTransformer { - public function transform($content, $imageFullWidth) { $root = pQuery::parseStr($content); @@ -129,5 +128,4 @@ class StructureTransformer { return $updatedStructure; } - } diff --git a/lib/Newsletter/Renderer/Columns/Renderer.php b/lib/Newsletter/Renderer/Columns/Renderer.php index 385237d799..5b308f808d 100644 --- a/lib/Newsletter/Renderer/Columns/Renderer.php +++ b/lib/Newsletter/Renderer/Columns/Renderer.php @@ -5,7 +5,6 @@ namespace MailPoet\Newsletter\Renderer\Columns; use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; class Renderer { - public function render($contentBlock, $columnsData) { $columnsCount = count($contentBlock['blocks']); diff --git a/lib/Newsletter/Scheduler/AutomaticEmailScheduler.php b/lib/Newsletter/Scheduler/AutomaticEmailScheduler.php index 75b8a1d2b8..d5d4671818 100644 --- a/lib/Newsletter/Scheduler/AutomaticEmailScheduler.php +++ b/lib/Newsletter/Scheduler/AutomaticEmailScheduler.php @@ -9,7 +9,6 @@ use MailPoet\Models\SendingQueue; use MailPoet\Tasks\Sending as SendingTask; class AutomaticEmailScheduler { - public function scheduleAutomaticEmail($group, $event, $schedulingCondition = false, $subscriberId = false, $meta = false) { $newsletters = Scheduler::getNewsletters(Newsletter::TYPE_AUTOMATIC, $group); if (empty($newsletters)) return false; @@ -102,5 +101,4 @@ class AutomaticEmailScheduler { $task->scheduledAt = Scheduler::getScheduledTimeWithDelay($newsletter->afterTimeType, $newsletter->afterTimeNumber); $task->save(); } - } diff --git a/lib/Newsletter/Scheduler/Scheduler.php b/lib/Newsletter/Scheduler/Scheduler.php index 9356c3d000..3fe89917c2 100644 --- a/lib/Newsletter/Scheduler/Scheduler.php +++ b/lib/Newsletter/Scheduler/Scheduler.php @@ -7,7 +7,6 @@ use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Carbon\Carbon; class Scheduler { - public static function getNextRunDate($schedule, $fromTimestamp = false) { $wp = new WPFunctions(); $fromTimestamp = ($fromTimestamp) ? $fromTimestamp : $wp->currentTime('timestamp'); diff --git a/lib/Newsletter/Scheduler/WelcomeScheduler.php b/lib/Newsletter/Scheduler/WelcomeScheduler.php index 5ac6643389..d5beff71d5 100644 --- a/lib/Newsletter/Scheduler/WelcomeScheduler.php +++ b/lib/Newsletter/Scheduler/WelcomeScheduler.php @@ -69,5 +69,4 @@ class WelcomeScheduler { ); return $sendingTask->save(); } - } diff --git a/lib/Newsletter/Shortcodes/ShortcodesHelper.php b/lib/Newsletter/Shortcodes/ShortcodesHelper.php index 58e8314e6a..fbf792f76c 100644 --- a/lib/Newsletter/Shortcodes/ShortcodesHelper.php +++ b/lib/Newsletter/Shortcodes/ShortcodesHelper.php @@ -7,7 +7,6 @@ use MailPoet\Models\NewsletterLink; use MailPoet\WP\Functions as WPFunctions; class ShortcodesHelper { - public static function getShortcodes() { $shortcodes = [ WPFunctions::get()->__('Subscriber', 'mailpoet') => [ diff --git a/lib/Newsletter/Statistics/NewsletterStatistics.php b/lib/Newsletter/Statistics/NewsletterStatistics.php index 8118b8d93c..8b2d00ebed 100644 --- a/lib/Newsletter/Statistics/NewsletterStatistics.php +++ b/lib/Newsletter/Statistics/NewsletterStatistics.php @@ -73,5 +73,4 @@ class NewsletterStatistics { 'revenue' => empty($this->wooCommerceRevenue) ? null : $this->wooCommerceRevenue->asArray(), ]; } - } diff --git a/lib/Newsletter/Statistics/NewsletterWooCommerceRevenue.php b/lib/Newsletter/Statistics/NewsletterWooCommerceRevenue.php index 493334d0cb..074883c5cb 100644 --- a/lib/Newsletter/Statistics/NewsletterWooCommerceRevenue.php +++ b/lib/Newsletter/Statistics/NewsletterWooCommerceRevenue.php @@ -56,5 +56,4 @@ class NewsletterWooCommerceRevenue { 'formatted' => $this->getFormattedValue(), ]; } - } diff --git a/lib/Segments/BulkAction.php b/lib/Segments/BulkAction.php index 9676ffc059..5522a24e80 100644 --- a/lib/Segments/BulkAction.php +++ b/lib/Segments/BulkAction.php @@ -58,5 +58,4 @@ class BulkAction { throw new \InvalidArgumentException('No handler found for segment'); } } - } diff --git a/lib/Segments/SubscribersFinder.php b/lib/Segments/SubscribersFinder.php index ab120edced..c35608ce3c 100644 --- a/lib/Segments/SubscribersFinder.php +++ b/lib/Segments/SubscribersFinder.php @@ -151,5 +151,4 @@ class SubscribersFinder { } return $result; } - } diff --git a/lib/Segments/SubscribersListings.php b/lib/Segments/SubscribersListings.php index 3860b387c5..7d910921f2 100644 --- a/lib/Segments/SubscribersListings.php +++ b/lib/Segments/SubscribersListings.php @@ -42,5 +42,4 @@ class SubscribersListings { } throw new \InvalidArgumentException('No handler found for segment'); } - } diff --git a/lib/Subscribers/ConfirmationEmailMailer.php b/lib/Subscribers/ConfirmationEmailMailer.php index ab3e010cd1..16ba78f790 100644 --- a/lib/Subscribers/ConfirmationEmailMailer.php +++ b/lib/Subscribers/ConfirmationEmailMailer.php @@ -109,5 +109,4 @@ class ConfirmationEmailMailer { return false; } } - } diff --git a/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php b/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php index e614fd0cf5..505ade191e 100644 --- a/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php +++ b/lib/Subscribers/ImportExport/Export/DefaultSubscribersGetter.php @@ -77,5 +77,4 @@ class DefaultSubscribersGetter extends SubscribersGetter { return $subscribers; } - } diff --git a/lib/Subscribers/ImportExport/Export/DynamicSubscribersGetter.php b/lib/Subscribers/ImportExport/Export/DynamicSubscribersGetter.php index be078a733f..6f8a23ea1c 100644 --- a/lib/Subscribers/ImportExport/Export/DynamicSubscribersGetter.php +++ b/lib/Subscribers/ImportExport/Export/DynamicSubscribersGetter.php @@ -76,5 +76,4 @@ class DynamicSubscribersGetter extends SubscribersGetter { return $subscribers; } - } diff --git a/lib/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporter.php b/lib/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporter.php index d920b1aa37..37d665c315 100644 --- a/lib/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporter.php +++ b/lib/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporter.php @@ -56,5 +56,4 @@ class NewsletterClicksExporter { 'data' => $newsletterData, ]; } - } diff --git a/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php b/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php index 175ba321c6..1fcd8a0372 100644 --- a/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php +++ b/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php @@ -96,5 +96,4 @@ class NewslettersExporter { } return $result; } - } diff --git a/lib/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporter.php b/lib/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporter.php index 47bf95a0fd..34647b14e0 100644 --- a/lib/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporter.php +++ b/lib/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporter.php @@ -6,7 +6,6 @@ use MailPoet\Models\Subscriber; use MailPoet\WP\Functions as WPFunctions; class SegmentsExporter { - public function export($email) { return [ 'data' => $this->exportSubscriber(Subscriber::findOne(trim($email))), @@ -48,6 +47,4 @@ class SegmentsExporter { 'data' => $segmentData, ]; } - - } diff --git a/lib/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporter.php b/lib/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporter.php index df66f96af8..577ed774d7 100644 --- a/lib/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporter.php +++ b/lib/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporter.php @@ -8,7 +8,6 @@ use MailPoet\Subscribers\Source; use MailPoet\WP\Functions as WPFunctions; class SubscriberExporter { - public function export($email) { return [ 'data' => $this->exportSubscriber(Subscriber::findOne(trim($email))), @@ -106,5 +105,4 @@ class SubscriberExporter { return WPFunctions::get()->__('Unknown', 'mailpoet'); } } - } diff --git a/lib/Subscribers/LinkTokens.php b/lib/Subscribers/LinkTokens.php index d617fe7e34..d11ec2eae1 100644 --- a/lib/Subscribers/LinkTokens.php +++ b/lib/Subscribers/LinkTokens.php @@ -41,5 +41,4 @@ class LinkTokens { } return false; } - } diff --git a/lib/Subscribers/NewSubscriberNotificationMailer.php b/lib/Subscribers/NewSubscriberNotificationMailer.php index 065bacd876..ea4134d3e0 100644 --- a/lib/Subscribers/NewSubscriberNotificationMailer.php +++ b/lib/Subscribers/NewSubscriberNotificationMailer.php @@ -107,5 +107,4 @@ class NewSubscriberNotificationMailer { } return implode(', ', $names); } - } diff --git a/lib/Subscribers/RequiredCustomFieldValidator.php b/lib/Subscribers/RequiredCustomFieldValidator.php index a0e901e423..51ee115b2b 100644 --- a/lib/Subscribers/RequiredCustomFieldValidator.php +++ b/lib/Subscribers/RequiredCustomFieldValidator.php @@ -8,7 +8,6 @@ use MailPoet\Models\Form; use MailPoet\WP\Functions as WPFunctions; class RequiredCustomFieldValidator { - /** * @param array $data * @param Form|null $form @@ -74,5 +73,4 @@ class RequiredCustomFieldValidator { } return $customFieldIds; } - } diff --git a/lib/Subscribers/Source.php b/lib/Subscribers/Source.php index 1adff68bd6..fad8fbedbe 100644 --- a/lib/Subscribers/Source.php +++ b/lib/Subscribers/Source.php @@ -37,5 +37,4 @@ class Source { $subscriber->set('source', $source); return $subscriber; } - } diff --git a/lib/Subscribers/SubscriberActions.php b/lib/Subscribers/SubscriberActions.php index dc9ea6225d..c076c9eb57 100644 --- a/lib/Subscribers/SubscriberActions.php +++ b/lib/Subscribers/SubscriberActions.php @@ -99,5 +99,4 @@ class SubscriberActions { return $subscriber; } - } diff --git a/lib/Subscribers/SubscriberPersonalDataEraser.php b/lib/Subscribers/SubscriberPersonalDataEraser.php index 478c683ed5..023d87d5ad 100644 --- a/lib/Subscribers/SubscriberPersonalDataEraser.php +++ b/lib/Subscribers/SubscriberPersonalDataEraser.php @@ -6,7 +6,6 @@ use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberCustomField; class SubscriberPersonalDataEraser { - public function erase($email) { if (empty($email)) { return [ @@ -51,5 +50,4 @@ class SubscriberPersonalDataEraser { $subscriber->confirmedIp = '0.0.0.0'; $subscriber->save(); } - } diff --git a/lib/Tracy/DIPanel/DIPanel.php b/lib/Tracy/DIPanel/DIPanel.php index 1c3d506880..cfa2de84df 100644 --- a/lib/Tracy/DIPanel/DIPanel.php +++ b/lib/Tracy/DIPanel/DIPanel.php @@ -155,5 +155,4 @@ class DIPanel implements IBarPanel { echo ''; } } - } diff --git a/lib/Twig/Filters.php b/lib/Twig/Filters.php index 51b0d43c0d..2870c445f6 100644 --- a/lib/Twig/Filters.php +++ b/lib/Twig/Filters.php @@ -6,7 +6,6 @@ use MailPoetVendor\Twig\Extension\AbstractExtension; use MailPoetVendor\Twig\TwigFilter; class Filters extends AbstractExtension { - public function getName() { return 'filters'; } diff --git a/lib/Util/DOM.php b/lib/Util/DOM.php index 670a6cef91..46e0d64d47 100644 --- a/lib/Util/DOM.php +++ b/lib/Util/DOM.php @@ -5,7 +5,6 @@ namespace MailPoet\Util; use pQuery\DomNode; class DOM { - /** * Splits a DOM tree around the cut element, bringing it up to bound * ancestor and splitting left and right siblings into subtrees along @@ -38,5 +37,4 @@ class DOM { } return $item; } - } diff --git a/lib/Util/FreeDomains.php b/lib/Util/FreeDomains.php index 907b68616c..103c5fce7a 100644 --- a/lib/Util/FreeDomains.php +++ b/lib/Util/FreeDomains.php @@ -58,5 +58,4 @@ class FreeDomains { $domain = end($emailParts); return in_array($domain, self::FREE_DOMAINS); } - } diff --git a/lib/Util/Helpers.php b/lib/Util/Helpers.php index 748a051e61..fd5b92576d 100644 --- a/lib/Util/Helpers.php +++ b/lib/Util/Helpers.php @@ -98,5 +98,4 @@ class Helpers { return trim($value); return $value; } - } diff --git a/lib/Util/Notices/AfterMigrationNotice.php b/lib/Util/Notices/AfterMigrationNotice.php index 1283e47d7f..ba61285654 100644 --- a/lib/Util/Notices/AfterMigrationNotice.php +++ b/lib/Util/Notices/AfterMigrationNotice.php @@ -47,5 +47,4 @@ class AfterMigrationNotice { \MailPoet\WP\Notice::displaySuccess($message, $extraClasses, $dataNoticeName); return $message; } - } diff --git a/lib/Util/Notices/BlackFridayNotice.php b/lib/Util/Notices/BlackFridayNotice.php index ffa05accce..985f32b975 100644 --- a/lib/Util/Notices/BlackFridayNotice.php +++ b/lib/Util/Notices/BlackFridayNotice.php @@ -39,5 +39,4 @@ class BlackFridayNotice { public function disable() { WPFunctions::get()->setTransient(self::OPTION_NAME, true, self::DISMISS_NOTICE_TIMEOUT_SECONDS); } - } diff --git a/lib/Util/Notices/PHPVersionWarnings.php b/lib/Util/Notices/PHPVersionWarnings.php index 60035767bf..9449ade0c3 100644 --- a/lib/Util/Notices/PHPVersionWarnings.php +++ b/lib/Util/Notices/PHPVersionWarnings.php @@ -40,5 +40,4 @@ class PHPVersionWarnings { public function disable() { WPFunctions::get()->setTransient(self::OPTION_NAME, true, self::DISMISS_NOTICE_TIMEOUT_SECONDS); } - } diff --git a/lib/Util/Notices/PermanentNotices.php b/lib/Util/Notices/PermanentNotices.php index 9c5e0269b8..2e8596e856 100644 --- a/lib/Util/Notices/PermanentNotices.php +++ b/lib/Util/Notices/PermanentNotices.php @@ -88,5 +88,4 @@ class PermanentNotices { break; } } - } diff --git a/lib/Util/ProgressBar.php b/lib/Util/ProgressBar.php index d6bf9f9d18..e773b7f007 100644 --- a/lib/Util/ProgressBar.php +++ b/lib/Util/ProgressBar.php @@ -100,7 +100,6 @@ if (!class_exists('ProgressBar', false)) { public function deleteProgressFile() { unlink($this->filename); } - } } diff --git a/lib/Util/SecondLevelDomainNames.php b/lib/Util/SecondLevelDomainNames.php index e627c92aea..7957f1a286 100644 --- a/lib/Util/SecondLevelDomainNames.php +++ b/lib/Util/SecondLevelDomainNames.php @@ -3,7 +3,6 @@ namespace MailPoet\Util; class SecondLevelDomainNames { - public function get($host) { if (preg_match('/[^.]*\.[^.]{2,3}(?:\.[^.]{2,3})?$/', $host, $matches)) { return $matches[0]; diff --git a/lib/WP/Functions.php b/lib/WP/Functions.php index 924d232ff9..4d21f0f27a 100644 --- a/lib/WP/Functions.php +++ b/lib/WP/Functions.php @@ -682,5 +682,4 @@ class Functions { return [$host, $port, $socket, $isIpv6]; } } - } diff --git a/lib/WP/Posts.php b/lib/WP/Posts.php index ce57d4c336..1d89a93771 100644 --- a/lib/WP/Posts.php +++ b/lib/WP/Posts.php @@ -5,7 +5,6 @@ namespace MailPoet\WP; use MailPoet\WP\Functions as WPFunctions; class Posts { - public static function getTerms($args) { // Since WordPress 4.5.0 signature of get_terms changed to require // one argument array, where taxonomy is key of that array @@ -25,5 +24,4 @@ class Posts { $args = array_merge($defaults, $args); return WPFunctions::get()->getPostTypes($args, $output, $operator); } - } diff --git a/lib/WooCommerce/Helper.php b/lib/WooCommerce/Helper.php index d867f4dedd..030c31d77b 100644 --- a/lib/WooCommerce/Helper.php +++ b/lib/WooCommerce/Helper.php @@ -3,7 +3,6 @@ namespace MailPoet\WooCommerce; class Helper { - public function isWooCommerceActive() { return class_exists('WooCommerce'); } diff --git a/mailpoet_initializer.php b/mailpoet_initializer.php index d231e3e781..67d3e48e79 100644 --- a/mailpoet_initializer.php +++ b/mailpoet_initializer.php @@ -48,6 +48,7 @@ if (WP_DEBUG && PHP_VERSION_ID >= 70100 && file_exists($tracyPath)) { $tracyScriptHtml .= "\n"; echo $tracyScriptHtml; } + add_action('admin_enqueue_scripts', 'render_tracy', PHP_INT_MAX, 0); session_start(); Debugger::enable(Debugger::DEVELOPMENT); diff --git a/tasks/phpstan/extensions/CodeceptionExtension/Type/StubDynamicReturnTypeExtension.php b/tasks/phpstan/extensions/CodeceptionExtension/Type/StubDynamicReturnTypeExtension.php index 7103748b70..17be4b4535 100644 --- a/tasks/phpstan/extensions/CodeceptionExtension/Type/StubDynamicReturnTypeExtension.php +++ b/tasks/phpstan/extensions/CodeceptionExtension/Type/StubDynamicReturnTypeExtension.php @@ -12,7 +12,6 @@ use PHPStan\Type\ObjectType; use PHPStan\Type\Type; class StubDynamicReturnTypeExtension implements DynamicStaticMethodReturnTypeExtension { - public function getClass(): string { return Stub::class; } diff --git a/tests/DataFactories/DynamicSegment.php b/tests/DataFactories/DynamicSegment.php index 9b6611cca6..b3cbdb3d18 100644 --- a/tests/DataFactories/DynamicSegment.php +++ b/tests/DataFactories/DynamicSegment.php @@ -34,5 +34,4 @@ class DynamicSegment extends Segment { $saver->save($dynamicSegment); return $dynamicSegment; } - } diff --git a/tests/DataFactories/Segment.php b/tests/DataFactories/Segment.php index 483a9cf335..69c0a30926 100644 --- a/tests/DataFactories/Segment.php +++ b/tests/DataFactories/Segment.php @@ -44,5 +44,4 @@ class Segment { public function create() { return \MailPoet\Models\Segment::createOrUpdate($this->data); } - } diff --git a/tests/DataFactories/Subscriber.php b/tests/DataFactories/Subscriber.php index e7aff98cf3..c003cc2ba9 100644 --- a/tests/DataFactories/Subscriber.php +++ b/tests/DataFactories/Subscriber.php @@ -88,5 +88,4 @@ class Subscriber { } return $subscriber; } - } diff --git a/tests/DataFactories/WooCommerceCustomer.php b/tests/DataFactories/WooCommerceCustomer.php index 3154532023..2964b84886 100644 --- a/tests/DataFactories/WooCommerceCustomer.php +++ b/tests/DataFactories/WooCommerceCustomer.php @@ -53,7 +53,6 @@ class WooCommerceCustomer { return $this->update('email', $email); } - public function create() { $createOutput = $this->tester->cliToArray(['wc', 'customer', 'create', '--porcelain', '--user=admin', "--first_name={$this->data['first_name']}", "--last_name={$this->data['last_name']}", "--email={$this->data['email']}", "--password={$this->data['password']}"]); $customerOut = $this->tester->cliToArray(['wc', 'customer', 'get', $createOutput[0], '--format=json', '--user=admin']); diff --git a/tests/DataFactories/WooCommerceOrder.php b/tests/DataFactories/WooCommerceOrder.php index fef98a78eb..0330abd22f 100644 --- a/tests/DataFactories/WooCommerceOrder.php +++ b/tests/DataFactories/WooCommerceOrder.php @@ -80,7 +80,6 @@ class WooCommerceOrder { return $this->update(['products' => $productsData]); } - public function create() { $cmd = ['wc', 'shop_order', 'create', '--porcelain', '--user=admin']; $cmd[] = '--status=' . $this->data['status']; diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php index c8822b29d0..afa5fa66b9 100644 --- a/tests/_support/AcceptanceTester.php +++ b/tests/_support/AcceptanceTester.php @@ -279,6 +279,7 @@ class AcceptanceTester extends \Codeception\Actor { // phpcs:ignore PSR1.Classes $i = $this; $i->cli(['plugin', 'activate', 'woocommerce']); } + public function deactivateWooCommerce() { $i = $this; $i->cli(['plugin', 'deactivate', 'woocommerce']); diff --git a/tests/_support/Helper/Database.php b/tests/_support/Helper/Database.php index 5d2d59b54e..126b525bb6 100644 --- a/tests/_support/Helper/Database.php +++ b/tests/_support/Helper/Database.php @@ -24,5 +24,4 @@ class Database extends \Codeception\Module $sql = preg_replace('/`wp_/', '`' . $wpdb->prefix, $sql); // Use the current database prefix $db->exec($sql); } - } diff --git a/tests/acceptance/AdvancedSettingsCest.php b/tests/acceptance/AdvancedSettingsCest.php index 0eec820168..be386fcffd 100644 --- a/tests/acceptance/AdvancedSettingsCest.php +++ b/tests/acceptance/AdvancedSettingsCest.php @@ -157,5 +157,4 @@ class AdvancedSettingsCest { $i->waitForElement($inactiveSubscribersDisabled); $i->dontSee($inactiveSubscribersEnabled); } - } diff --git a/tests/acceptance/ConfirmNewsletterAutosaveCest.php b/tests/acceptance/ConfirmNewsletterAutosaveCest.php index 673b3faf56..32aa6ad53c 100644 --- a/tests/acceptance/ConfirmNewsletterAutosaveCest.php +++ b/tests/acceptance/ConfirmNewsletterAutosaveCest.php @@ -3,7 +3,6 @@ namespace MailPoet\Test\Acceptance; class ConfirmNewsletterAutosaveCest { - public function confirmNewsletterAutoSave(\AcceptanceTester $i) { $i->wantTo('Confirm autosave works as advertised'); @@ -28,5 +27,4 @@ class ConfirmNewsletterAutosaveCest { $i->waitForText('Autosaved'); $i->seeNoJSErrors(); } - } diff --git a/tests/acceptance/ConfirmNotificationAutosaveCest.php b/tests/acceptance/ConfirmNotificationAutosaveCest.php index 7559c9086a..0df0571d56 100644 --- a/tests/acceptance/ConfirmNotificationAutosaveCest.php +++ b/tests/acceptance/ConfirmNotificationAutosaveCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class ConfirmNotificationAutosaveCest { - public function confirmNotificationAutosave(\AcceptanceTester $i) { $i->wantTo('Confirm Post Notification Autosave'); $newsletterTitle = 'Notification Autosave Test'; @@ -23,5 +22,4 @@ class ConfirmNotificationAutosaveCest { $i->fillField($titleElement, $newsletterTitle); $i->waitForText('Autosaved'); } - } diff --git a/tests/acceptance/ConfirmTitleAlignmentSettingsInALCBlockCest.php b/tests/acceptance/ConfirmTitleAlignmentSettingsInALCBlockCest.php index 670153c41d..14eb43ae95 100644 --- a/tests/acceptance/ConfirmTitleAlignmentSettingsInALCBlockCest.php +++ b/tests/acceptance/ConfirmTitleAlignmentSettingsInALCBlockCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class ConfirmTitleAlignmentSettingsInALCBlockCest { - public function createWelcomeNewsletter(\AcceptanceTester $i) { $i->wantTo('Confirm title alignment settings in ALC block'); diff --git a/tests/acceptance/CreateNewWordPressUserCest.php b/tests/acceptance/CreateNewWordPressUserCest.php index 643ee72018..8f7e80e9ff 100644 --- a/tests/acceptance/CreateNewWordPressUserCest.php +++ b/tests/acceptance/CreateNewWordPressUserCest.php @@ -28,5 +28,4 @@ class CreateNewWordPressUserCest { $i->see('You have subscribed'); $i->seeNoJSErrors(); } - } diff --git a/tests/acceptance/CreateWooCommerceNewsletterCest.php b/tests/acceptance/CreateWooCommerceNewsletterCest.php index 103435ff65..1f96945669 100644 --- a/tests/acceptance/CreateWooCommerceNewsletterCest.php +++ b/tests/acceptance/CreateWooCommerceNewsletterCest.php @@ -6,7 +6,6 @@ use MailPoet\Features\FeaturesController; use MailPoet\Test\DataFactories\Features; class CreateWooCommerceNewsletterCest { - public function createFirstPurchaseEmail(\AcceptanceTester $i) { $i->wantTo('Create and configure a first purchase automatic email'); @@ -73,5 +72,4 @@ class CreateWooCommerceNewsletterCest { $i->see($newsletterTitle, $newsletterListingElement); $i->see('Email sent when a customer abandons his cart', $newsletterListingElement); } - } diff --git a/tests/acceptance/DeleteAutomaticWooCommerceEmailCest.php b/tests/acceptance/DeleteAutomaticWooCommerceEmailCest.php index e08baa3882..8b189f609a 100644 --- a/tests/acceptance/DeleteAutomaticWooCommerceEmailCest.php +++ b/tests/acceptance/DeleteAutomaticWooCommerceEmailCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class DeleteAutomaticWooCommerceEmailCest { - public function _before(\AcceptanceTester $i) { $i->activateWooCommerce(); } diff --git a/tests/acceptance/DeleteNewsletterCest.php b/tests/acceptance/DeleteNewsletterCest.php index 489263bdfe..6d2ab9dd8c 100644 --- a/tests/acceptance/DeleteNewsletterCest.php +++ b/tests/acceptance/DeleteNewsletterCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class DeleteNewsletterCest { - public function moveNewsletterToTrash(\AcceptanceTester $i) { $newsletterName = 'Trash Newsletter'; $newsletter = new Newsletter(); diff --git a/tests/acceptance/DeleteNotificationCest.php b/tests/acceptance/DeleteNotificationCest.php index c9bc117f79..4f553d16be 100644 --- a/tests/acceptance/DeleteNotificationCest.php +++ b/tests/acceptance/DeleteNotificationCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class DeleteNotificationCest { - public function deleteNotification(\AcceptanceTester $i) { // step 1 - Prepare post notification data $i->wantTo('delete a notification'); diff --git a/tests/acceptance/DeleteNotificationHistoryCest.php b/tests/acceptance/DeleteNotificationHistoryCest.php index 98a046f2f8..2d22ab4b5d 100644 --- a/tests/acceptance/DeleteNotificationHistoryCest.php +++ b/tests/acceptance/DeleteNotificationHistoryCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class DeleteNotificationHistoryCest { - public function delete(\AcceptanceTester $i) { // step 1 - Prepare data $i->wantTo('delete a notification history'); @@ -44,5 +43,4 @@ class DeleteNotificationHistoryCest { $i->waitForText('permanently deleted.'); $i->waitForElementNotVisible($newsletterName); } - } diff --git a/tests/acceptance/DuplicateNewsletterCest.php b/tests/acceptance/DuplicateNewsletterCest.php index e56f6da193..28f236596f 100644 --- a/tests/acceptance/DuplicateNewsletterCest.php +++ b/tests/acceptance/DuplicateNewsletterCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class DuplicateNewsletterCest { - public function duplicateNewsletter(\AcceptanceTester $i) { $newsletterName = 'Duplicate Newsletter'; $newsletter = new Newsletter(); @@ -17,5 +16,4 @@ class DuplicateNewsletterCest { $i->clickItemRowActionByItemName($newsletterName, 'Duplicate'); $i->waitForText('Copy of ' . $newsletterName); } - } diff --git a/tests/acceptance/DuplicatePostNotificationCest.php b/tests/acceptance/DuplicatePostNotificationCest.php index f92e46aac6..cc137aa9f1 100644 --- a/tests/acceptance/DuplicatePostNotificationCest.php +++ b/tests/acceptance/DuplicatePostNotificationCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class DuplicatePostNotificationCest { - public function duplicatePostNotification(\AcceptanceTester $i) { $i->wantTo('Duplicate post notification email'); @@ -31,5 +30,4 @@ class DuplicatePostNotificationCest { $i->clickItemRowActionByItemName('Copy of ' . $newsletterTitle, 'Edit'); $i->waitForElement('[data-automation-id="newsletter_title"]'); } - } diff --git a/tests/acceptance/EditExistingNewsletterCest.php b/tests/acceptance/EditExistingNewsletterCest.php index 97fe3ee1d2..69ae80ca98 100644 --- a/tests/acceptance/EditExistingNewsletterCest.php +++ b/tests/acceptance/EditExistingNewsletterCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class EditExistingNewsletterCest { - public function editExistingNewsletter(\AcceptanceTester $i) { $i->wantTo('Edit a standard newsletter'); $newsletterTitle = 'Unedited Standard Title'; diff --git a/tests/acceptance/EditExistingPostNotificationEmailCest.php b/tests/acceptance/EditExistingPostNotificationEmailCest.php index 751c3f323d..7bdc7ff930 100644 --- a/tests/acceptance/EditExistingPostNotificationEmailCest.php +++ b/tests/acceptance/EditExistingPostNotificationEmailCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class EditExistingPostNotificationEmailCest { - public function editSubjectAndSchedule(\AcceptanceTester $i) { $i->wantTo('Edit existing post notification email'); @@ -44,5 +43,4 @@ class EditExistingPostNotificationEmailCest { $i->waitForElement($newsletterListingElement); $i->see($newsletterEditedTitle, $newsletterListingElement); } - } diff --git a/tests/acceptance/EditSignUpConfirmationEmailCest.php b/tests/acceptance/EditSignUpConfirmationEmailCest.php index 61e7914af3..57bea9af88 100644 --- a/tests/acceptance/EditSignUpConfirmationEmailCest.php +++ b/tests/acceptance/EditSignUpConfirmationEmailCest.php @@ -7,7 +7,6 @@ use MailPoet\Test\DataFactories\Form; use MailPoet\Test\DataFactories\Settings; class EditSignUpConfirmationEmailCest { - public function edit(\AcceptanceTester $i) { $i->wantTo('Edit sign up confirmation email'); diff --git a/tests/acceptance/EditorDividerBlockCest.php b/tests/acceptance/EditorDividerBlockCest.php index 1fcf8c1cb5..362be37d05 100644 --- a/tests/acceptance/EditorDividerBlockCest.php +++ b/tests/acceptance/EditorDividerBlockCest.php @@ -26,5 +26,4 @@ class EditorDividerBlockCest { $i->waitForElementVisible($dividerSettingsAssertion); $i->click('Done'); } - } diff --git a/tests/acceptance/EditorFooterBlockCest.php b/tests/acceptance/EditorFooterBlockCest.php index 162d43f589..a243f17297 100644 --- a/tests/acceptance/EditorFooterBlockCest.php +++ b/tests/acceptance/EditorFooterBlockCest.php @@ -23,5 +23,4 @@ class EditorFooterBlockCest { $i->waitForElementVisible($footerSettingsAssertion); $i->click($footerSettingsAssertion); } - } diff --git a/tests/acceptance/EditorHeaderBlockCest.php b/tests/acceptance/EditorHeaderBlockCest.php index 1aa0ffc872..7e69cfa0df 100644 --- a/tests/acceptance/EditorHeaderBlockCest.php +++ b/tests/acceptance/EditorHeaderBlockCest.php @@ -23,5 +23,4 @@ class EditorHeaderBlockCest { $i->waitForElementVisible($headerSettingsAssertion); $i->click($headerSettingsAssertion); } - } diff --git a/tests/acceptance/EditorHistoryCest.php b/tests/acceptance/EditorHistoryCest.php index 6f1552b592..5a74c5a631 100644 --- a/tests/acceptance/EditorHistoryCest.php +++ b/tests/acceptance/EditorHistoryCest.php @@ -60,5 +60,4 @@ class EditorHistoryCest { $i->seeElement(self::REDO_SELECTOR . self::INACTIVE_SELECTOR); } } - } diff --git a/tests/acceptance/EditorProductsCest.php b/tests/acceptance/EditorProductsCest.php index 5d1e06e6a0..472787fadb 100644 --- a/tests/acceptance/EditorProductsCest.php +++ b/tests/acceptance/EditorProductsCest.php @@ -246,5 +246,4 @@ class EditorProductsCest { $this->filterProducts($i); $this->changeDisplaySettings($i); } - } diff --git a/tests/acceptance/EditorSettingsBehaviourCest.php b/tests/acceptance/EditorSettingsBehaviourCest.php index 8530cf39f5..e221eaaf16 100644 --- a/tests/acceptance/EditorSettingsBehaviourCest.php +++ b/tests/acceptance/EditorSettingsBehaviourCest.php @@ -61,5 +61,4 @@ class EditorSettingsBehaviourCest { $i->seeNumberOfElements(self::HIGHLIGHTED_ALC_SELECTOR, 1); // ALC is highlighted $i->seeNumberOfElements(self::HIGHLIGHTED_BUTTON_SELECTOR, 0); // Button is not highlighted } - } diff --git a/tests/acceptance/EditorSocialBlockCest.php b/tests/acceptance/EditorSocialBlockCest.php index 5111ded695..defe741c9f 100644 --- a/tests/acceptance/EditorSocialBlockCest.php +++ b/tests/acceptance/EditorSocialBlockCest.php @@ -21,5 +21,4 @@ class EditorSocialBlockCest { $i->waitForElementVisible($socialBlockSettingsAssertion); $i->click('Done'); } - } diff --git a/tests/acceptance/EditorSpacerBlockCest.php b/tests/acceptance/EditorSpacerBlockCest.php index 0f210df135..da63b771d8 100644 --- a/tests/acceptance/EditorSpacerBlockCest.php +++ b/tests/acceptance/EditorSpacerBlockCest.php @@ -23,5 +23,4 @@ class EditorSpacerBlockCest { $i->waitForElementVisible($spacerSettingsAssertion); $i->click($spacerSettingsAssertion); } - } diff --git a/tests/acceptance/EnableAndDisableSignupConfirmationCest.php b/tests/acceptance/EnableAndDisableSignupConfirmationCest.php index 68134a22be..990a1e5ecb 100644 --- a/tests/acceptance/EnableAndDisableSignupConfirmationCest.php +++ b/tests/acceptance/EnableAndDisableSignupConfirmationCest.php @@ -6,7 +6,6 @@ use AcceptanceTester; use MailPoet\Test\DataFactories\Settings; class EnableAndDisableSignupConfirmationCest { - public function disableSignupConfirmation(AcceptanceTester $i) { $settings = new Settings(); $settings diff --git a/tests/acceptance/FormEditorAddNamesCest.php b/tests/acceptance/FormEditorAddNamesCest.php index d79bbfbca7..59fa41d87e 100644 --- a/tests/acceptance/FormEditorAddNamesCest.php +++ b/tests/acceptance/FormEditorAddNamesCest.php @@ -6,7 +6,6 @@ use MailPoet\Test\DataFactories\Form; use MailPoet\Test\DataFactories\Segment; class FormEditorAddNamesCest { - public function addNamesToAForm(\AcceptanceTester $i) { $segmentFactory = new Segment(); $segmentName = 'Fancy List'; @@ -39,5 +38,4 @@ class FormEditorAddNamesCest { $i->seeElement('[data-automation-id="editor_first_name_input"]'); $i->seeElement('[data-automation-id="editor_last_name_input"]'); } - } diff --git a/tests/acceptance/FormEditorCreateCustomFieldCest.php b/tests/acceptance/FormEditorCreateCustomFieldCest.php index e9958dcee7..f6b8f0aa5e 100644 --- a/tests/acceptance/FormEditorCreateCustomFieldCest.php +++ b/tests/acceptance/FormEditorCreateCustomFieldCest.php @@ -6,7 +6,6 @@ use MailPoet\Test\DataFactories\Form; use MailPoet\Test\DataFactories\Segment; class FormEditorCreateCustomFieldCest { - public function createCustomSelect(\AcceptanceTester $i) { $segmentFactory = new Segment(); $segmentName = 'Fancy List'; @@ -61,5 +60,4 @@ class FormEditorCreateCustomFieldCest { $i->waitForElement('[data-automation-id="custom_field_value_settings_value"][value="First option"]'); $i->waitForElement('[data-automation-id="custom_field_value_settings_value"][value="Option 2"]'); } - } diff --git a/tests/acceptance/FormsDeletingCest.php b/tests/acceptance/FormsDeletingCest.php index 1d048ae1ed..ca27906274 100644 --- a/tests/acceptance/FormsDeletingCest.php +++ b/tests/acceptance/FormsDeletingCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Form; class FormsDeletingCest { - public function moveFormToTrash(\AcceptanceTester $i) { $formName = 'Move to trash form'; $form = new Form(); @@ -65,5 +64,4 @@ class FormsDeletingCest { $i->waitForText('1 form was permanently deleted.'); $i->waitForElementNotVisible($formName); } - } diff --git a/tests/acceptance/FormsDuplicatingCest.php b/tests/acceptance/FormsDuplicatingCest.php index 4387152abd..c633329081 100644 --- a/tests/acceptance/FormsDuplicatingCest.php +++ b/tests/acceptance/FormsDuplicatingCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Form; class FormsDuplicatingCest { - public function duplicateForm(\AcceptanceTester $i) { $formName = 'Form for duplicate test'; $form = new Form(); @@ -22,5 +21,4 @@ class FormsDuplicatingCest { $i->waitForText('has been duplicated'); $i->waitForText('Copy of ' . $formName); } - } diff --git a/tests/acceptance/FormsListingCest.php b/tests/acceptance/FormsListingCest.php index 32727cf4ae..690256c1e2 100644 --- a/tests/acceptance/FormsListingCest.php +++ b/tests/acceptance/FormsListingCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Form; class FormsListingCest { - public function formsListing(\AcceptanceTester $i) { $form = new Form(); $form->withName('Test Form'); @@ -19,5 +18,4 @@ class FormsListingCest { $i->waitForText('Test Form', 5, '.mailpoet_listing_table'); $i->seeNoJSErrors(); } - } diff --git a/tests/acceptance/ListsListingCest.php b/tests/acceptance/ListsListingCest.php index 362dcdf24d..90733086a4 100644 --- a/tests/acceptance/ListsListingCest.php +++ b/tests/acceptance/ListsListingCest.php @@ -3,7 +3,6 @@ namespace MailPoet\Test\Acceptance; class ListsListingCest { - public function listsListing(\AcceptanceTester $i) { $i->wantTo('Open lists listings page'); @@ -14,5 +13,4 @@ class ListsListingCest { $i->see('My First List', '[data-automation-id="listing_item_3"]'); $i->seeNoJSErrors(); } - } diff --git a/tests/acceptance/ManageWelcomeEmailCest.php b/tests/acceptance/ManageWelcomeEmailCest.php index 71c26e112e..b405d7d594 100644 --- a/tests/acceptance/ManageWelcomeEmailCest.php +++ b/tests/acceptance/ManageWelcomeEmailCest.php @@ -133,5 +133,4 @@ class ManageWelcomeEmailCest { $i->waitForElement('[data-automation-id="newsletter_title"]'); $i->seeNoJSErrors(); } - } diff --git a/tests/acceptance/NewsletterCreationCest.php b/tests/acceptance/NewsletterCreationCest.php index bafcfd4a5f..7d93e403e1 100644 --- a/tests/acceptance/NewsletterCreationCest.php +++ b/tests/acceptance/NewsletterCreationCest.php @@ -3,7 +3,6 @@ namespace MailPoet\Test\Acceptance; class NewsletterCreationCest { - public function createPostNotification(\AcceptanceTester $i) { $i->wantTo('Create and configure post notification email'); diff --git a/tests/acceptance/NewslettersListingCest.php b/tests/acceptance/NewslettersListingCest.php index 72dc6c43bc..74ace3d906 100644 --- a/tests/acceptance/NewslettersListingCest.php +++ b/tests/acceptance/NewslettersListingCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class NewslettersListingCest { - public function newslettersListing(\AcceptanceTester $i) { $standardNewsletterSubject = 'Standard newsletter'; $welcomeEmailSubject = 'Welcome email'; @@ -71,5 +70,4 @@ class NewslettersListingCest { $i->see('Opened, Clicked'); $i->seeNoJSErrors(); } - } diff --git a/tests/acceptance/PreviewStandardNewsletterCest.php b/tests/acceptance/PreviewStandardNewsletterCest.php index bd32b17512..1fb2e680d5 100644 --- a/tests/acceptance/PreviewStandardNewsletterCest.php +++ b/tests/acceptance/PreviewStandardNewsletterCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class PreviewStandardNewsletterCest { - public function previewStandardNewsletter(\AcceptanceTester $i) { $newsletterName = 'Preview in Browser Newsletter'; $newsletter = new Newsletter(); diff --git a/tests/acceptance/ReceivePostNotificationCest.php b/tests/acceptance/ReceivePostNotificationCest.php index a371413fc0..781e361ada 100644 --- a/tests/acceptance/ReceivePostNotificationCest.php +++ b/tests/acceptance/ReceivePostNotificationCest.php @@ -74,5 +74,4 @@ class ReceivePostNotificationCest { $i->switchToIframe('preview-html'); $i->waitForText($postTitle, 90); } - } diff --git a/tests/acceptance/ReinstallFromScratchCest.php b/tests/acceptance/ReinstallFromScratchCest.php index 0fcc3c19e5..9d2e54e6f2 100644 --- a/tests/acceptance/ReinstallFromScratchCest.php +++ b/tests/acceptance/ReinstallFromScratchCest.php @@ -10,7 +10,6 @@ use MailPoet\Test\DataFactories\Subscriber; use PHPUnit\Framework\Assert; class ReinstallFromScratchCest { - public function reinstallFromScratch(\AcceptanceTester $i) { $i->wantTo('Reinstall from scratch'); $i->login(); diff --git a/tests/acceptance/SaveNewsletterAsDraftCest.php b/tests/acceptance/SaveNewsletterAsDraftCest.php index 1aa0d7b3d6..da48bc9851 100644 --- a/tests/acceptance/SaveNewsletterAsDraftCest.php +++ b/tests/acceptance/SaveNewsletterAsDraftCest.php @@ -3,7 +3,6 @@ namespace MailPoet\Test\Acceptance; class SaveNewsletterAsDraftCest { - public function saveStandardNewsletterAsDraft(\AcceptanceTester $i) { $i->wantTo('Create standard newsletter and save as a draft'); @@ -35,5 +34,4 @@ class SaveNewsletterAsDraftCest { $i->click('Save as draft and close'); $i->waitForText($newsletterTitle); } - } diff --git a/tests/acceptance/SaveNewsletterAsTemplateCest.php b/tests/acceptance/SaveNewsletterAsTemplateCest.php index e17340c180..edc1c341fe 100644 --- a/tests/acceptance/SaveNewsletterAsTemplateCest.php +++ b/tests/acceptance/SaveNewsletterAsTemplateCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class SaveNewsletterAsTemplateCest { - public function saveStandardNewsletterAsTemplate(\AcceptanceTester $i) { $i->wantTo('Create standard newsletter and save as a template'); @@ -40,5 +39,4 @@ class SaveNewsletterAsTemplateCest { $i->click(['xpath' => '//*[text()="' . $templateName . '"]//ancestor::*[@data-automation-id="select_template_box"]//*[starts-with(@data-automation-id,"select_template_")]']); $i->waitForElement('[data-automation-id="newsletter_title"]'); } - } diff --git a/tests/acceptance/SaveNotificationAsDraftCest.php b/tests/acceptance/SaveNotificationAsDraftCest.php index 86c21e113f..a29eb5608d 100644 --- a/tests/acceptance/SaveNotificationAsDraftCest.php +++ b/tests/acceptance/SaveNotificationAsDraftCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class SaveNotificationAsDraftCest { - public function saveNotificationAsDraft(\AcceptanceTester $i) { // step 1 - Prepare post notification data $i->wantTo('Save post notification email as draft'); @@ -27,5 +26,4 @@ class SaveNotificationAsDraftCest { $i->waitForElement('[data-automation-id="newsletters_listing_tabs"]'); $i->waitForText('Draft Test Post Notification'); } - } diff --git a/tests/acceptance/SavePostNotificationEmailAsTemplateCest.php b/tests/acceptance/SavePostNotificationEmailAsTemplateCest.php index c69d9adc95..03cbeadd76 100644 --- a/tests/acceptance/SavePostNotificationEmailAsTemplateCest.php +++ b/tests/acceptance/SavePostNotificationEmailAsTemplateCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class SavePostNotificationEmailAsTemplateCest { - public function saveAsTemplate(\AcceptanceTester $i) { $i->wantTo('Save post notification email as template'); @@ -46,5 +45,4 @@ class SavePostNotificationEmailAsTemplateCest { $i->click(['xpath' => '//*[text()="' . $templateTitle . '"]//ancestor::*[@data-automation-id="select_template_box"]//*[starts-with(@data-automation-id,"select_template_")]']); $i->waitForElement('[data-automation-id="newsletter_title"]'); } - } diff --git a/tests/acceptance/ScheduleNewsletterCest.php b/tests/acceptance/ScheduleNewsletterCest.php index 52cd195041..7f80f2b436 100644 --- a/tests/acceptance/ScheduleNewsletterCest.php +++ b/tests/acceptance/ScheduleNewsletterCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class ScheduleNewsletterCest { - public function scheduleStandardNewsletter(\AcceptanceTester $i) { $i->wantTo('Schedule a newsletter'); $newsletterTitle = 'Schedule Test Newsletter'; @@ -31,5 +30,4 @@ class ScheduleNewsletterCest { $i->waitForElement('[data-automation-id="newsletters_listing_tabs"]'); } - } diff --git a/tests/acceptance/SearchForNotificationCest.php b/tests/acceptance/SearchForNotificationCest.php index 9101b47651..d541da8884 100644 --- a/tests/acceptance/SearchForNotificationCest.php +++ b/tests/acceptance/SearchForNotificationCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class SearchForNotificationCest { - public function searchForStandardNotification(\AcceptanceTester $i) { $i->wantTo('Successfully search for an existing notification'); $newsletterTitle = 'Search Test Notification'; @@ -25,5 +24,4 @@ class SearchForNotificationCest { $i->searchFor($newsletterTitle); $i->waitForText($newsletterTitle); } - } diff --git a/tests/acceptance/SearchForStandardNewsletterCest.php b/tests/acceptance/SearchForStandardNewsletterCest.php index 100955355a..327bd0a359 100644 --- a/tests/acceptance/SearchForStandardNewsletterCest.php +++ b/tests/acceptance/SearchForStandardNewsletterCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class SearchForStandardNewsletterCest { - public function searchForStandardNewsletter(\AcceptanceTester $i) { $i->wantTo('Successfully search for an existing newsletter'); @@ -25,5 +24,4 @@ class SearchForStandardNewsletterCest { $i->searchFor($newsletterTitle); $i->waitForText($newsletterTitle); } - } diff --git a/tests/acceptance/SendCategoryPurchaseEmailCest.php b/tests/acceptance/SendCategoryPurchaseEmailCest.php index 6a46dfbfa0..a10dece769 100644 --- a/tests/acceptance/SendCategoryPurchaseEmailCest.php +++ b/tests/acceptance/SendCategoryPurchaseEmailCest.php @@ -9,7 +9,6 @@ use MailPoet\Test\DataFactories\WooCommerceProduct; use MailPoet\Util\Security; class SendCategoryPurchaseEmailCest { - public function _before(\AcceptanceTester $i) { $i->activateWooCommerce(); $settingsFactory = new Settings(); diff --git a/tests/acceptance/SentNewsletterCest.php b/tests/acceptance/SentNewsletterCest.php index b0744ef322..08b748e338 100644 --- a/tests/acceptance/SentNewsletterCest.php +++ b/tests/acceptance/SentNewsletterCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class SentNewsletterCest { - public function disableLastStep(\AcceptanceTester $i) { $i->wantTo('See that last step is disabled fot sent standard email'); @@ -21,5 +20,4 @@ class SentNewsletterCest { $i->see('It can be edited, but not sent again.'); $i->see('Duplicate this email if you want to send it again.'); } - } diff --git a/tests/acceptance/SettingsArchivePageCest.php b/tests/acceptance/SettingsArchivePageCest.php index bec0af08fd..bfa052823e 100644 --- a/tests/acceptance/SettingsArchivePageCest.php +++ b/tests/acceptance/SettingsArchivePageCest.php @@ -22,6 +22,7 @@ class SettingsArchivePageCest { $i->waitForText($pageTitle); $i->waitForText('Oops! There are no newsletters to display.'); } + public function createArchivePageWithSentNewsletters(\AcceptanceTester $i) { $i->wantTo('Create page with MP archive shortcode, showing sent newsletters'); $segmentFactory = new Segment(); diff --git a/tests/acceptance/SettingsPageBasicsCest.php b/tests/acceptance/SettingsPageBasicsCest.php index dd5a0eddcb..24c40080e0 100644 --- a/tests/acceptance/SettingsPageBasicsCest.php +++ b/tests/acceptance/SettingsPageBasicsCest.php @@ -6,7 +6,6 @@ use MailPoet\Mailer\Mailer; use MailPoet\Test\DataFactories\Settings; class SettingsPageBasicsCest { - public function checkSettingsPagesLoad(\AcceptanceTester $i) { $i->wantTo('Confirm all settings pages load correctly'); $i->login(); diff --git a/tests/acceptance/SettingsSubscriptionPageCest.php b/tests/acceptance/SettingsSubscriptionPageCest.php index 762b4f0dff..4a5e0e67d4 100644 --- a/tests/acceptance/SettingsSubscriptionPageCest.php +++ b/tests/acceptance/SettingsSubscriptionPageCest.php @@ -10,6 +10,7 @@ class SettingsSubscriptionPageCest { $i->click('[data-automation-id="preview_manage_subscription_page_link"]'); $i->waitForText('Manage your subscription'); } + public function createNewSubscriptionPage(\AcceptanceTester $i) { $i->wantTo('Make a custom subscription page'); $pageTitle = 'CustomSubscriptionPage'; diff --git a/tests/acceptance/SettingsUnsubscribePageCest.php b/tests/acceptance/SettingsUnsubscribePageCest.php index 240a27c581..0103887466 100644 --- a/tests/acceptance/SettingsUnsubscribePageCest.php +++ b/tests/acceptance/SettingsUnsubscribePageCest.php @@ -11,5 +11,4 @@ class SettingsUnsubscribePageCest { $i->switchToNextTab(); $i->waitForElement(['css' => '.entry-title']); } - } diff --git a/tests/acceptance/StatsPageCest.php b/tests/acceptance/StatsPageCest.php index 4d620dfe3d..69cf467e14 100644 --- a/tests/acceptance/StatsPageCest.php +++ b/tests/acceptance/StatsPageCest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Acceptance; use MailPoet\Test\DataFactories\Newsletter; class StatsPageCest { - public function statsPage(\AcceptanceTester $i) { $i->wantTo('Open stats page of a sent newsletter'); @@ -27,5 +26,4 @@ class StatsPageCest { $href = $i->grabAttributeFrom('//a[text()="Learn more about Premium"]', 'href'); expect($href)->endsWith('page=mailpoet-premium'); } - } diff --git a/tests/acceptance/SubscribeToMultipleListsCest.php b/tests/acceptance/SubscribeToMultipleListsCest.php index a840d8c29b..2d9f431c4b 100644 --- a/tests/acceptance/SubscribeToMultipleListsCest.php +++ b/tests/acceptance/SubscribeToMultipleListsCest.php @@ -8,7 +8,6 @@ use MailPoet\Test\DataFactories\Segment; use MailPoet\Test\DataFactories\Settings; class SubscribeToMultipleListsCest { - public function subscribeToMultipleLists(\AcceptanceTester $i) { //Step one - create form with three lists $segmentFactory = new Segment(); diff --git a/tests/acceptance/SubscriberManageImportExportCest.php b/tests/acceptance/SubscriberManageImportExportCest.php index fb6395296c..86a9a67e36 100644 --- a/tests/acceptance/SubscriberManageImportExportCest.php +++ b/tests/acceptance/SubscriberManageImportExportCest.php @@ -3,7 +3,6 @@ namespace MailPoet\Test\Acceptance; class SubscriberManageImportExportCest { - public function importBigUsersListCSV(\AcceptanceTester $i) { $i->wantTo('Import a big list'); $i->login(); @@ -96,5 +95,4 @@ class SubscriberManageImportExportCest { $i->click('.mailpoet_data_manipulation_step [data-automation-id="import-next-step"]'); $i->waitForText('Import again'); } - } diff --git a/tests/acceptance/SubscribersListingCest.php b/tests/acceptance/SubscribersListingCest.php index 8fdb15a07f..11eaf26c6a 100644 --- a/tests/acceptance/SubscribersListingCest.php +++ b/tests/acceptance/SubscribersListingCest.php @@ -6,7 +6,6 @@ use MailPoet\Subscribers\ConfirmationEmailMailer; use MailPoet\Test\DataFactories\Subscriber; class SubscribersListingCest { - public function subscribersListing(\AcceptanceTester $i) { $i->wantTo('Open subscribers listings page'); @@ -50,5 +49,4 @@ class SubscribersListingCest { $i->amOnMailboxAppPage(); $i->waitForText('Confirm your subscription'); } - } diff --git a/tests/acceptance/TemplatesPagesLoadCest.php b/tests/acceptance/TemplatesPagesLoadCest.php index 62740a557f..245f7b5266 100644 --- a/tests/acceptance/TemplatesPagesLoadCest.php +++ b/tests/acceptance/TemplatesPagesLoadCest.php @@ -31,5 +31,4 @@ class TemplatesPagesLoadCest { $i->waitForElement('[data-automation-id="select_template_5"]'); $i->waitForElement('[data-automation-id="select_template_2"]'); } - } diff --git a/tests/acceptance/TrashExistingSegmentCest.php b/tests/acceptance/TrashExistingSegmentCest.php index c0e3c627c5..8e6e6ce318 100644 --- a/tests/acceptance/TrashExistingSegmentCest.php +++ b/tests/acceptance/TrashExistingSegmentCest.php @@ -6,7 +6,6 @@ use MailPoet\Test\DataFactories\DynamicSegment; use MailPoet\Test\DataFactories\Settings; class TrashExistingSegmentCest { - public function _before() { (new Settings())->withWooCommerceListImportPageDisplayed(true); (new Settings())->withCookieRevenueTrackingDisabled(); diff --git a/tests/acceptance/ViewSegmentSubscribersCest.php b/tests/acceptance/ViewSegmentSubscribersCest.php index 9f65b3f440..7b0ae4a7e8 100644 --- a/tests/acceptance/ViewSegmentSubscribersCest.php +++ b/tests/acceptance/ViewSegmentSubscribersCest.php @@ -6,7 +6,6 @@ use MailPoet\Test\DataFactories\DynamicSegment; use MailPoet\Test\DataFactories\Settings; class ViewSegmentSubscribersCest { - public function _before() { (new Settings())->withWooCommerceListImportPageDisplayed(true); (new Settings())->withCookieRevenueTrackingDisabled(); diff --git a/tests/integration/API/APITest.php b/tests/integration/API/APITest.php index 7879da7246..fa04d440b5 100644 --- a/tests/integration/API/APITest.php +++ b/tests/integration/API/APITest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\API; use MailPoet\API\API; class APITest extends \MailPoetTest { - public function testItCallsMPAPI() { expect(API::MP('v1'))->isInstanceOf('MailPoet\API\MP\v1\API'); } diff --git a/tests/integration/API/JSON/ResponseBuilders/NewslettersResponseBuilderTest.php b/tests/integration/API/JSON/ResponseBuilders/NewslettersResponseBuilderTest.php index 1ded7e51c2..916bb9d0da 100644 --- a/tests/integration/API/JSON/ResponseBuilders/NewslettersResponseBuilderTest.php +++ b/tests/integration/API/JSON/ResponseBuilders/NewslettersResponseBuilderTest.php @@ -10,7 +10,6 @@ use MailPoet\Newsletter\Statistics\NewsletterStatisticsRepository; use MailPoetVendor\Doctrine\ORM\EntityManager; class NewslettersResponseBuilderTest extends \MailPoetTest { - public function testItBuildsStats() { $di = ContainerWrapper::getInstance(); $em = $di->get(EntityManager::class); diff --git a/tests/integration/API/JSON/v1/AutomaticEmailsTest.php b/tests/integration/API/JSON/v1/AutomaticEmailsTest.php index 97a444c23a..68c9d437cb 100644 --- a/tests/integration/API/JSON/v1/AutomaticEmailsTest.php +++ b/tests/integration/API/JSON/v1/AutomaticEmailsTest.php @@ -6,9 +6,11 @@ use MailPoet\WP\Functions as WPFunctions; class AutomaticEmailsTest extends \MailPoetTest { public $wp; + public function _before() { $this->wp = new WPFunctions; } + public function testItRequiresProperlyFormattedRequestWhenGettingEventOptions() { $API = new AutomaticEmails(); $expectedErrorMessage = 'Improperly formatted request.'; diff --git a/tests/integration/API/JSON/v1/DynamicSegmentsTest.php b/tests/integration/API/JSON/v1/DynamicSegmentsTest.php index 23b0e1e092..802867a360 100644 --- a/tests/integration/API/JSON/v1/DynamicSegmentsTest.php +++ b/tests/integration/API/JSON/v1/DynamicSegmentsTest.php @@ -235,5 +235,4 @@ class DynamicSegmentsTest extends \MailPoetTest { expect(DynamicSegment::count())->equals(0); expect(DynamicSegmentFilter::findOne($filter->id))->equals(false); } - } diff --git a/tests/integration/API/JSON/v1/FeatureFlagsTest.php b/tests/integration/API/JSON/v1/FeatureFlagsTest.php index 8826659d37..86a8df3b1d 100644 --- a/tests/integration/API/JSON/v1/FeatureFlagsTest.php +++ b/tests/integration/API/JSON/v1/FeatureFlagsTest.php @@ -79,7 +79,6 @@ class FeatureFlagsTest extends \MailPoetTest { expect($features[0]->getValue())->equals(false); } - public function testItUpdatesDatabaseValue() { $this->repository->createOrUpdate([ 'name' => 'feature-a', @@ -135,5 +134,4 @@ class FeatureFlagsTest extends \MailPoetTest { ]); return new FeatureFlags($featuresController, $featureFlags); } - } diff --git a/tests/integration/API/JSON/v1/SendingQueueTest.php b/tests/integration/API/JSON/v1/SendingQueueTest.php index dfd446d3e8..285458999b 100644 --- a/tests/integration/API/JSON/v1/SendingQueueTest.php +++ b/tests/integration/API/JSON/v1/SendingQueueTest.php @@ -21,6 +21,7 @@ use MailPoetVendor\Idiorm\ORM; class SendingQueueTest extends \MailPoetTest { public $newsletter; + public function _before() { parent::_before(); $this->newsletter = Newsletter::createOrUpdate( diff --git a/tests/integration/API/JSON/v1/WoocommerceSettingsTest.php b/tests/integration/API/JSON/v1/WoocommerceSettingsTest.php index a55c3d9067..3003fef1e8 100644 --- a/tests/integration/API/JSON/v1/WoocommerceSettingsTest.php +++ b/tests/integration/API/JSON/v1/WoocommerceSettingsTest.php @@ -18,6 +18,7 @@ class WoocommerceSettingsTest extends \MailPoetTest { $this->wp = new WPFunctions(); $this->endpoint = new WoocommerceSettings($this->wp); } + public function testItCanSetSettings() { $this->wp->updateOption('woocommerce_email_base_color', '#ffffff'); $response = $this->endpoint->set([ diff --git a/tests/integration/API/MP/APITest.php b/tests/integration/API/MP/APITest.php index 70965c34b6..4e5810bdaa 100644 --- a/tests/integration/API/MP/APITest.php +++ b/tests/integration/API/MP/APITest.php @@ -421,7 +421,6 @@ class APITest extends \MailPoetTest { } } - public function testItOnlyAcceptsWhitelistedProperties() { $subscriber = [ 'email' => 'test-ignore-status@example.com', diff --git a/tests/integration/Analytics/AnalyticsTest.php b/tests/integration/Analytics/AnalyticsTest.php index b7701052ed..b8c5790e5e 100644 --- a/tests/integration/Analytics/AnalyticsTest.php +++ b/tests/integration/Analytics/AnalyticsTest.php @@ -142,5 +142,4 @@ class AnalyticsTest extends \MailPoetTest { expect($this->analytics->isPublicIdNew())->false(); expect($this->settings->get('new_public_id'))->equals('false'); } - } diff --git a/tests/integration/AutomaticEmails/AutomaticEmailsTest.php b/tests/integration/AutomaticEmails/AutomaticEmailsTest.php index e67693c42c..15d3e25719 100644 --- a/tests/integration/AutomaticEmails/AutomaticEmailsTest.php +++ b/tests/integration/AutomaticEmails/AutomaticEmailsTest.php @@ -7,10 +7,12 @@ use MailPoet\WP\Functions as WPFunctions; class AutomaticEmailsTest extends \MailPoetTest { public $wp; public $AM; + public function _before() { $this->AM = new AutomaticEmails(); $this->wp = new WPFunctions(); } + public function testItCanUnregisterAutomaticEmails() { $this->wp->addFilter('mailpoet_automatic_email_test1', function() { return [ @@ -151,7 +153,6 @@ class AutomaticEmailsTest extends \MailPoetTest { $this->wp->removeAllFilters('mailpoet_automatic_email_test'); } - public function testItReturnsNullWhenGettingEmailEventBySlugAndThereAreNoRegisteredEmails() { expect($this->AM->getAutomaticEmailEventBySlug('some_email', 'some_slug'))->null(); } diff --git a/tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php b/tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php index bcc44f9e3e..a56d54e807 100644 --- a/tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php +++ b/tests/integration/AutomaticEmails/WooCommerce/Events/AbandonedCartTest.php @@ -112,7 +112,6 @@ class AbandonedCartTest extends \MailPoetTest { expect(ScheduledTask::findMany())->count(1); } - public function testItFindsUserByCookie() { $this->createNewsletter(); $subscriber = $this->createSubscriber(); diff --git a/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php b/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php index 575c4082ac..3cdf11df31 100644 --- a/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php +++ b/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php @@ -90,7 +90,6 @@ class PurchasedProductTest extends \MailPoetTest { expect($result)->isEmpty(); } - public function testItDoesNotScheduleEmailWhenPurchasedProductDoesNotMatchConfiguredProductIds() { WPFunctions::get()->removeAllFilters('woocommerce_order_status_completed'); $newsletter = Newsletter::createOrUpdate( @@ -172,7 +171,6 @@ class PurchasedProductTest extends \MailPoetTest { $this->_runTestItSchedulesEmailForState('completed'); } - public function _runTestItSchedulesEmailForState($state) { $newsletter = Newsletter::createOrUpdate( [ diff --git a/tests/integration/Config/CapabilitiesTest.php b/tests/integration/Config/CapabilitiesTest.php index 082de7a0ab..302da78a08 100644 --- a/tests/integration/Config/CapabilitiesTest.php +++ b/tests/integration/Config/CapabilitiesTest.php @@ -127,5 +127,4 @@ class CapabilitiesTest extends \MailPoetTest { $caps->registerMembersCapabilities(); } } - } diff --git a/tests/integration/Config/EnvTest.php b/tests/integration/Config/EnvTest.php index edd1c55d10..9b23ee5959 100644 --- a/tests/integration/Config/EnvTest.php +++ b/tests/integration/Config/EnvTest.php @@ -7,6 +7,7 @@ use MailPoet\Config\Env; class EnvTest extends \MailPoetTest { public $version; public $file; + public function _before() { parent::_before(); // Back up original environment values diff --git a/tests/integration/Config/InstallerTest.php b/tests/integration/Config/InstallerTest.php index 80239b9fc3..e599d314d6 100644 --- a/tests/integration/Config/InstallerTest.php +++ b/tests/integration/Config/InstallerTest.php @@ -10,6 +10,7 @@ use MailPoet\Config\Installer; class InstallerTest extends \MailPoetTest { public $installer; public $slug; + public function _before() { parent::_before(); $this->slug = 'some-plugin'; diff --git a/tests/integration/Config/MP2MigratorTest.php b/tests/integration/Config/MP2MigratorTest.php index c8b1dc9d5e..4ca22fa7cc 100644 --- a/tests/integration/Config/MP2MigratorTest.php +++ b/tests/integration/Config/MP2MigratorTest.php @@ -801,5 +801,4 @@ class MP2MigratorTest extends \MailPoetTest { ]; update_option('wysija', base64_encode(serialize($wysijaOptions))); } - } diff --git a/tests/integration/Config/MigratorTest.php b/tests/integration/Config/MigratorTest.php index f588a0852e..a06cd8596a 100644 --- a/tests/integration/Config/MigratorTest.php +++ b/tests/integration/Config/MigratorTest.php @@ -6,6 +6,7 @@ use MailPoet\Config\Migrator; class MigratorTest extends \MailPoetTest { public $migrator; + public function _before() { parent::_before(); $this->migrator = new Migrator(); diff --git a/tests/integration/Config/PluginActivatedHookTest.php b/tests/integration/Config/PluginActivatedHookTest.php index cd05b03f59..b816029501 100644 --- a/tests/integration/Config/PluginActivatedHookTest.php +++ b/tests/integration/Config/PluginActivatedHookTest.php @@ -6,8 +6,6 @@ use Codeception\Stub; use Codeception\Stub\Expected; class PluginActivatedHookTest extends \MailPoetTest { - - public function testItAddsANewMessageIfNetworkActivation() { $deferredAdminNotices = Stub::makeEmpty( 'MailPoet\Config\DeferredAdminNotices', @@ -44,5 +42,4 @@ class PluginActivatedHookTest extends \MailPoetTest { $hook = new PluginActivatedHook($deferredAdminNotices); $hook->action("mailpoet/mailpoet.php", false); } - } diff --git a/tests/integration/Config/RendererTest.php b/tests/integration/Config/RendererTest.php index ffb735ca67..20d8975d9c 100644 --- a/tests/integration/Config/RendererTest.php +++ b/tests/integration/Config/RendererTest.php @@ -10,6 +10,7 @@ use MailPoetVendor\Twig_Environment; class RendererTest extends \MailPoetTest { public $renderer; + public function _before() { parent::_before(); $this->renderer = new Renderer($caching = false, $debugging = false); diff --git a/tests/integration/Config/ShortcodesTest.php b/tests/integration/Config/ShortcodesTest.php index 0cb259a939..25b5975405 100644 --- a/tests/integration/Config/ShortcodesTest.php +++ b/tests/integration/Config/ShortcodesTest.php @@ -19,6 +19,7 @@ use MailPoetVendor\Idiorm\ORM; class ShortcodesTest extends \MailPoetTest { public $queue; public $newsletter; + public function _before() { parent::_before(); $newsletter = Newsletter::create(); diff --git a/tests/integration/Config/UpdaterTest.php b/tests/integration/Config/UpdaterTest.php index bbd2ee85ef..f96850ae6c 100644 --- a/tests/integration/Config/UpdaterTest.php +++ b/tests/integration/Config/UpdaterTest.php @@ -11,6 +11,7 @@ class UpdaterTest extends \MailPoetTest { public $version; public $slug; public $pluginName; + public function _before() { parent::_before(); $this->pluginName = 'some-plugin/some-plugin.php'; diff --git a/tests/integration/Cron/CronHelperTest.php b/tests/integration/Cron/CronHelperTest.php index 0b41682523..75f100b80c 100644 --- a/tests/integration/Cron/CronHelperTest.php +++ b/tests/integration/Cron/CronHelperTest.php @@ -205,7 +205,6 @@ class CronHelperTest extends \MailPoetTest { expect($daemon['last_error_date'])->greaterOrEquals($time); } - public function testItSavesRunCompletedAt() { $daemon = $this->getDeamonTestData(); $this->settings->set( diff --git a/tests/integration/Cron/DaemonHttpRunnerTest.php b/tests/integration/Cron/DaemonHttpRunnerTest.php index 8093bf022e..b8b1ea2d24 100644 --- a/tests/integration/Cron/DaemonHttpRunnerTest.php +++ b/tests/integration/Cron/DaemonHttpRunnerTest.php @@ -113,7 +113,6 @@ class DaemonHttpRunnerTest extends \MailPoetTest { $daemonHttpRunner->run($data); } - public function testItTerminatesExecutionWhenDaemonIsDeleted() { $daemon = $this->make(Daemon::class, [ 'run' => function () { diff --git a/tests/integration/Cron/Triggers/WordPressTest.php b/tests/integration/Cron/Triggers/WordPressTest.php index c27de818b3..64483a6b9a 100644 --- a/tests/integration/Cron/Triggers/WordPressTest.php +++ b/tests/integration/Cron/Triggers/WordPressTest.php @@ -90,7 +90,6 @@ class WordPressTest extends \MailPoetTest { expect($this->wordpressTrigger->checkExecutionRequirements())->true(); } - public function testItFailsExecutionRequiremenetsCheckWhenQueueStatusIsCompleted() { expect($this->wordpressTrigger->checkExecutionRequirements())->false(); $this->_addQueue($status = 'completed'); diff --git a/tests/integration/Cron/Workers/BeamerTest.php b/tests/integration/Cron/Workers/BeamerTest.php index a5cac38fd8..7fac9b1b3d 100644 --- a/tests/integration/Cron/Workers/BeamerTest.php +++ b/tests/integration/Cron/Workers/BeamerTest.php @@ -9,7 +9,6 @@ use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Carbon\Carbon; class BeamerTest extends \MailPoetTest { - public function testItSetsLastAnnouncementDate() { $oldDate = '2019-05-18T10:25:00.000Z'; $newDate = '2019-05-22T10:25:00.000Z'; @@ -68,5 +67,4 @@ class BeamerTest extends \MailPoetTest { expect($done)->equals(false); expect($settings->get('last_announcement_date'))->equals(Carbon::createFromTimeString($oldDate)->getTimestamp()); } - } diff --git a/tests/integration/Cron/Workers/BounceTest.php b/tests/integration/Cron/Workers/BounceTest.php index 21e2ca45bb..03b0af30d0 100644 --- a/tests/integration/Cron/Workers/BounceTest.php +++ b/tests/integration/Cron/Workers/BounceTest.php @@ -20,6 +20,7 @@ require_once('BounceTestMockAPI.php'); class BounceTest extends \MailPoetTest { public $worker; public $emails; + public function _before() { parent::_before(); $this->emails = [ diff --git a/tests/integration/Cron/Workers/ExportFilesCleanupTest.php b/tests/integration/Cron/Workers/ExportFilesCleanupTest.php index e994dd80a8..6aae788036 100644 --- a/tests/integration/Cron/Workers/ExportFilesCleanupTest.php +++ b/tests/integration/Cron/Workers/ExportFilesCleanupTest.php @@ -6,7 +6,6 @@ use MailPoet\Cron\Workers\ExportFilesCleanup; use MailPoet\Models\ScheduledTask; class ExportFilesCleanupTest extends \MailPoetTest { - public function testItWorks() { $wpUploadDir = wp_upload_dir(); $oldFilePath = $wpUploadDir['basedir'] . '/mailpoet/MailPoet_export_old_file.csv'; @@ -20,5 +19,4 @@ class ExportFilesCleanupTest extends \MailPoetTest { $this->assertFileExists($newFilePath); $this->assertFileNotExists($oldFilePath); } - } diff --git a/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php b/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php index 97aac85d14..942fdc9fb0 100644 --- a/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php @@ -16,6 +16,7 @@ require_once('KeyCheckWorkerMockImplementation.php'); class KeyCheckWorkerTest extends \MailPoetTest { public $worker; + public function _before() { parent::_before(); $this->worker = new MockKeyCheckWorker(); diff --git a/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php b/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php index 37a5422a92..83fbc14b13 100644 --- a/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php @@ -14,6 +14,7 @@ use PHPUnit\Framework\MockObject\MockObject; class SendingServiceKeyCheckTest extends \MailPoetTest { public $worker; public $mssKey; + public function _before() { parent::_before(); $this->mssKey = 'some_key'; diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php index e0efea6c9f..5f8a374592 100644 --- a/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php @@ -10,6 +10,7 @@ use MailPoetVendor\Idiorm\ORM; class ShortcodesTest extends \MailPoetTest { public $wPPost; + public function _before() { parent::_before(); $this->wPPost = wp_insert_post( diff --git a/tests/integration/Cron/Workers/SimpleWorkerTest.php b/tests/integration/Cron/Workers/SimpleWorkerTest.php index c9e54c010d..68776da011 100644 --- a/tests/integration/Cron/Workers/SimpleWorkerTest.php +++ b/tests/integration/Cron/Workers/SimpleWorkerTest.php @@ -17,6 +17,7 @@ require_once __DIR__ . '/SimpleWorkerMockImplementation.php'; class SimpleWorkerTest extends \MailPoetTest { public $worker; public $cronHelper; + public function _before() { parent::_before(); $this->cronHelper = ContainerWrapper::getInstance()->get(CronHelper::class); diff --git a/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php b/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php index 9104dca720..40568e6384 100644 --- a/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php +++ b/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php @@ -242,5 +242,4 @@ class AutomatedEmailsTest extends \MailPoetTest { 'count_processed' => $countProcessed, ]); } - } diff --git a/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php b/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php index 686534495f..1aa49f049e 100644 --- a/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php +++ b/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php @@ -311,5 +311,4 @@ class WorkerTest extends \MailPoetTest { $this->statsNotifications->process(); } - } diff --git a/tests/integration/Cron/Workers/WooCommerceOrdersTest.php b/tests/integration/Cron/Workers/WooCommerceOrdersTest.php index 3dcb34927c..2bf317abe7 100644 --- a/tests/integration/Cron/Workers/WooCommerceOrdersTest.php +++ b/tests/integration/Cron/Workers/WooCommerceOrdersTest.php @@ -104,7 +104,6 @@ class WooCommerceOrdersTest extends \MailPoetTest { expect($tasks[0]->status)->equals(null); // null means 'running' } - public function testItContinuesFromLastId() { $this->woocommerceHelper->method('isWooCommerceActive')->willReturn(true); $this->woocommerceHelper->method('wcGetOrders')->willReturnOnConsecutiveCalls([1, 2, 3], [4, 5], []); @@ -164,7 +163,6 @@ class WooCommerceOrdersTest extends \MailPoetTest { $this->cleanup(); } - private function createClick($createdDaysAgo = 5) { $click = StatisticsClicks::create(); $click->newsletterId = 1; diff --git a/tests/integration/Cron/Workers/WooCommerceSyncTest.php b/tests/integration/Cron/Workers/WooCommerceSyncTest.php index 22010f7745..513c9d472d 100644 --- a/tests/integration/Cron/Workers/WooCommerceSyncTest.php +++ b/tests/integration/Cron/Workers/WooCommerceSyncTest.php @@ -14,6 +14,7 @@ class WooCommerceSyncTest extends \MailPoetTest { public $worker; public $woocommerceHelper; public $woocommerceSegment; + public function _before() { $this->woocommerceSegment = $this->createMock(WooCommerceSegment::class); $this->woocommerceHelper = $this->createMock(WooCommerceHelper::class); diff --git a/tests/integration/DynamicSegments/Filters/UserRoleTest.php b/tests/integration/DynamicSegments/Filters/UserRoleTest.php index 28431dfd6f..f09c1cc773 100644 --- a/tests/integration/DynamicSegments/Filters/UserRoleTest.php +++ b/tests/integration/DynamicSegments/Filters/UserRoleTest.php @@ -5,7 +5,6 @@ namespace MailPoet\DynamicSegments\Filters; use MailPoet\Models\Subscriber; class UserRoleTest extends \MailPoetTest { - public function _before() { $this->cleanData(); wp_insert_user([ diff --git a/tests/integration/DynamicSegments/Filters/WooCommerceCategoryTest.php b/tests/integration/DynamicSegments/Filters/WooCommerceCategoryTest.php index ae4065dc4e..d55522adc5 100644 --- a/tests/integration/DynamicSegments/Filters/WooCommerceCategoryTest.php +++ b/tests/integration/DynamicSegments/Filters/WooCommerceCategoryTest.php @@ -3,7 +3,6 @@ namespace MailPoet\DynamicSegments\Filters; class WooCommerceCategoryTest extends \MailPoetTest { - public function testToArray() { $filter = new WooCommerceCategory(5); $data = $filter->toArray(); diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php index d972b424ab..4a6794425f 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php @@ -8,7 +8,6 @@ use MailPoet\Models\DynamicSegment; use PHPUnit\Framework\MockObject\MockObject; class AddToNewslettersSegmentsTest extends \MailPoetTest { - public function testItReturnsOriginalArray() { $dynamicSegment = DynamicSegment::create(); $dynamicSegment->hydrate([ diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php index a4650d2fd8..1be6f7ae57 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php @@ -8,7 +8,6 @@ use MailPoet\Models\DynamicSegment; use PHPUnit\Framework\MockObject\MockObject; class AddToSubscribersFiltersTest extends \MailPoetTest { - public function testItReturnsOriginalArray() { $originalSegment = [ 'label' => 'segment1', diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php index 3d129b6a3a..beac4e1cb6 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php @@ -65,7 +65,6 @@ class SendingNewslettersSubscribersFinderTest extends \MailPoetTest { expect($result)->count(1); } - public function testGetSubscriberIdsInSegmentReturnsEmptyIfNotDynamic() { $this->singleSegmentLoader ->expects($this->never()) @@ -107,5 +106,4 @@ class SendingNewslettersSubscribersFinderTest extends \MailPoetTest { expect($result[0]['id'])->equals(1); expect($result[1]['id'])->equals(2); } - } diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandlerTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandlerTest.php index 41b8253478..76b320be32 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandlerTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersBulkActionHandlerTest.php @@ -6,7 +6,6 @@ use MailPoet\Models\DynamicSegment; use MailPoetVendor\Idiorm\ORM; class SubscribersBulkActionHandlerTest extends \MailPoetTest { - public function testItReturnsNullWithUnknownSegment() { $segment = [ 'name' => 'name', diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersListingsHandlerFactoryTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersListingsHandlerFactoryTest.php index fa4c87f76f..ff1510ce40 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersListingsHandlerFactoryTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/SubscribersListingsHandlerFactoryTest.php @@ -6,7 +6,6 @@ use MailPoet\Models\DynamicSegment; use MailPoetVendor\Idiorm\ORM; class SubscribersListingsHandlerFactoryTest extends \MailPoetTest { - public function testItReturnsNullWithUnknownSegment() { $segment = DynamicSegment::create(); $segment->id = 1; @@ -39,5 +38,4 @@ class SubscribersListingsHandlerFactoryTest extends \MailPoetTest { private function cleanData() { ORM::raw_execute('TRUNCATE ' . DynamicSegment::$_table); } - } diff --git a/tests/integration/DynamicSegments/Mappers/FormDataMapperTest.php b/tests/integration/DynamicSegments/Mappers/FormDataMapperTest.php index cf7fd9eb05..90a4310b3e 100644 --- a/tests/integration/DynamicSegments/Mappers/FormDataMapperTest.php +++ b/tests/integration/DynamicSegments/Mappers/FormDataMapperTest.php @@ -110,5 +110,4 @@ class FormDataMapperTest extends \MailPoetTest { $this->assertSame($dynamicSegment->id(), $segment->id); } - } diff --git a/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php b/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php index 9ca8d88a74..f3aae1a02a 100644 --- a/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php +++ b/tests/integration/DynamicSegments/Persistence/Loading/SingleSegmentLoaderTest.php @@ -62,5 +62,4 @@ class SingleSegmentLoaderTest extends \MailPoetTest { ORM::raw_execute('TRUNCATE ' . DynamicSegment::$_table); ORM::raw_execute('TRUNCATE ' . DynamicSegmentFilter::$_table); } - } diff --git a/tests/integration/DynamicSegments/Persistence/SaverTest.php b/tests/integration/DynamicSegments/Persistence/SaverTest.php index aa32de6f97..39a5fc0e2a 100644 --- a/tests/integration/DynamicSegments/Persistence/SaverTest.php +++ b/tests/integration/DynamicSegments/Persistence/SaverTest.php @@ -64,5 +64,4 @@ class SaverTest extends \MailPoetTest { $loaded = DynamicSegmentFilter::select('*')->where('segment_id', $id)->findOne(); expect($loaded)->isInstanceOf('\MailPoet\Models\DynamicSegmentFilter'); } - } diff --git a/tests/integration/Helpscout/BeaconTest.php b/tests/integration/Helpscout/BeaconTest.php index 839617a658..93e288fa31 100644 --- a/tests/integration/Helpscout/BeaconTest.php +++ b/tests/integration/Helpscout/BeaconTest.php @@ -11,6 +11,7 @@ use MailPoet\WP\Functions as WPFunctions; class BeaconTest extends \MailPoetTest { public $settings; public $beaconData; + public function _before() { parent::_before(); // create 4 users (1 confirmed, 1 subscribed, 1 unsubscribed, 1 bounced) diff --git a/tests/integration/Listing/BulkActionClassStub.php b/tests/integration/Listing/BulkActionClassStub.php index e597697d2b..c62f3f4693 100644 --- a/tests/integration/Listing/BulkActionClassStub.php +++ b/tests/integration/Listing/BulkActionClassStub.php @@ -3,9 +3,7 @@ namespace MailPoet\Listing; class BulkActionClassStub { - public function bulkTestAction() { } - } diff --git a/tests/integration/Logging/LogHandlerTest.php b/tests/integration/Logging/LogHandlerTest.php index 1bc54dcb04..a4ab572802 100644 --- a/tests/integration/Logging/LogHandlerTest.php +++ b/tests/integration/Logging/LogHandlerTest.php @@ -7,7 +7,6 @@ use MailPoetVendor\Carbon\Carbon; use MailPoetVendor\Idiorm\ORM; class LogHandlerTest extends \MailPoetTest { - public function testItCreatesLog() { $logHandler = new LogHandler(); $time = new \DateTime(); @@ -79,5 +78,4 @@ class LogHandlerTest extends \MailPoetTest { public function _after() { ORM::raw_execute('TRUNCATE ' . Log::$_table); } - } diff --git a/tests/integration/Mailer/Methods/AmazonSESTest.php b/tests/integration/Mailer/Methods/AmazonSESTest.php index 7cc6270a7e..63487461dd 100644 --- a/tests/integration/Mailer/Methods/AmazonSESTest.php +++ b/tests/integration/Mailer/Methods/AmazonSESTest.php @@ -17,6 +17,7 @@ class AmazonSESTest extends \MailPoetTest { public $replyTo; public $sender; public $settings; + public function _before() { parent::_before(); $this->settings = [ diff --git a/tests/integration/Mailer/Methods/MailPoetAPITest.php b/tests/integration/Mailer/Methods/MailPoetAPITest.php index 6895c36a7e..103bfd2c6c 100644 --- a/tests/integration/Mailer/Methods/MailPoetAPITest.php +++ b/tests/integration/Mailer/Methods/MailPoetAPITest.php @@ -20,6 +20,7 @@ class MailPoetAPITest extends \MailPoetTest { public $replyTo; public $sender; public $settings; + public function _before() { parent::_before(); $this->settings = [ diff --git a/tests/integration/Mailer/Methods/PHPMailTest.php b/tests/integration/Mailer/Methods/PHPMailTest.php index d1c8cab7aa..3b62cca1e5 100644 --- a/tests/integration/Mailer/Methods/PHPMailTest.php +++ b/tests/integration/Mailer/Methods/PHPMailTest.php @@ -16,6 +16,7 @@ class PHPMailTest extends \MailPoetTest { public $returnPath; public $replyTo; public $sender; + public function _before() { parent::_before(); $this->sender = [ diff --git a/tests/integration/Mailer/Methods/SMTPTest.php b/tests/integration/Mailer/Methods/SMTPTest.php index 5c9f1e861f..5eeb017363 100644 --- a/tests/integration/Mailer/Methods/SMTPTest.php +++ b/tests/integration/Mailer/Methods/SMTPTest.php @@ -18,6 +18,7 @@ class SMTPTest extends \MailPoetTest { public $replyTo; public $sender; public $settings; + public function _before() { parent::_before(); $this->settings = [ diff --git a/tests/integration/Mailer/Methods/SendGridTest.php b/tests/integration/Mailer/Methods/SendGridTest.php index f9a5ef954a..4a0154966c 100644 --- a/tests/integration/Mailer/Methods/SendGridTest.php +++ b/tests/integration/Mailer/Methods/SendGridTest.php @@ -16,6 +16,7 @@ class SendGridTest extends \MailPoetTest { public $replyTo; public $sender; public $settings; + public function _before() { parent::_before(); $this->settings = [ diff --git a/tests/integration/Models/CustomFieldTest.php b/tests/integration/Models/CustomFieldTest.php index b69c3ab85c..4dfc87112d 100644 --- a/tests/integration/Models/CustomFieldTest.php +++ b/tests/integration/Models/CustomFieldTest.php @@ -10,6 +10,7 @@ class CustomFieldTest extends \MailPoetTest { public $data; public $subscribers; public $customField; + public function _before() { parent::_before(); $this->data = [ diff --git a/tests/integration/Models/NewsletterOptionFieldTest.php b/tests/integration/Models/NewsletterOptionFieldTest.php index 608232063f..9750edb90f 100644 --- a/tests/integration/Models/NewsletterOptionFieldTest.php +++ b/tests/integration/Models/NewsletterOptionFieldTest.php @@ -11,6 +11,7 @@ class NewsletterOptionFieldTest extends \MailPoetTest { public $data; public $newsletterData; public $optionField; + public function _before() { parent::_before(); $this->data = [ diff --git a/tests/integration/Models/NewsletterOptionTest.php b/tests/integration/Models/NewsletterOptionTest.php index 9972c427fa..70feed4702 100644 --- a/tests/integration/Models/NewsletterOptionTest.php +++ b/tests/integration/Models/NewsletterOptionTest.php @@ -35,7 +35,6 @@ class NewsletterOptionTest extends \MailPoetTest { expect($newsletterOption->value)->equals($data['value']); } - public function _after() { ORM::raw_execute('TRUNCATE ' . NewsletterOption::$_table); } diff --git a/tests/integration/Models/NewsletterTemplateTest.php b/tests/integration/Models/NewsletterTemplateTest.php index e9fb58ce71..61c671ea60 100644 --- a/tests/integration/Models/NewsletterTemplateTest.php +++ b/tests/integration/Models/NewsletterTemplateTest.php @@ -8,6 +8,7 @@ use MailPoetVendor\Idiorm\ORM; class NewsletterTemplateTest extends \MailPoetTest { public $data; public $saved; + public function _before() { parent::_before(); $this->data = [ diff --git a/tests/integration/Models/NewsletterTest.php b/tests/integration/Models/NewsletterTest.php index 3a384a5156..06557af690 100644 --- a/tests/integration/Models/NewsletterTest.php +++ b/tests/integration/Models/NewsletterTest.php @@ -25,6 +25,7 @@ class NewsletterTest extends \MailPoetTest { public $segment2; public $segment1; public $newsletter; + public function _before() { parent::_before(); $this->newsletter = Newsletter::createOrUpdate([ diff --git a/tests/integration/Models/ScheduledTaskSubscriberTest.php b/tests/integration/Models/ScheduledTaskSubscriberTest.php index 4b5cd88a00..587c23b690 100644 --- a/tests/integration/Models/ScheduledTaskSubscriberTest.php +++ b/tests/integration/Models/ScheduledTaskSubscriberTest.php @@ -13,6 +13,7 @@ class ScheduledTaskSubscriberTest extends \MailPoetTest { public $taskSubscriber; public $subscriber; public $task; + public function _before() { parent::_before(); $task = ScheduledTask::create(); diff --git a/tests/integration/Models/ScheduledTaskTest.php b/tests/integration/Models/ScheduledTaskTest.php index e3a1f3ebb3..e57bd87849 100644 --- a/tests/integration/Models/ScheduledTaskTest.php +++ b/tests/integration/Models/ScheduledTaskTest.php @@ -13,6 +13,7 @@ use MailPoetVendor\Idiorm\ORM; class ScheduledTaskTest extends \MailPoetTest { public $task; + public function _before() { parent::_before(); $this->task = ScheduledTask::create(); diff --git a/tests/integration/Models/SegmentTest.php b/tests/integration/Models/SegmentTest.php index 1f645b2a7a..9397aa426b 100644 --- a/tests/integration/Models/SegmentTest.php +++ b/tests/integration/Models/SegmentTest.php @@ -14,6 +14,7 @@ class SegmentTest extends \MailPoetTest { public $newslettersData; public $subscribersData; public $segmentData; + public function _before() { parent::_before(); $this->segmentData = [ diff --git a/tests/integration/Models/SendingQueueTest.php b/tests/integration/Models/SendingQueueTest.php index a18936ad5c..a7b51f7945 100644 --- a/tests/integration/Models/SendingQueueTest.php +++ b/tests/integration/Models/SendingQueueTest.php @@ -12,6 +12,7 @@ use MailPoetVendor\Idiorm\ORM; class SendingQueueTest extends \MailPoetTest { public $renderedBody; public $queue; + public function _before() { parent::_before(); $this->queue = SendingQueue::create(); diff --git a/tests/integration/Models/StatisticsFormsTest.php b/tests/integration/Models/StatisticsFormsTest.php index e0b89b2edc..f86dd2d6b2 100644 --- a/tests/integration/Models/StatisticsFormsTest.php +++ b/tests/integration/Models/StatisticsFormsTest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Models; use MailPoet\Models\StatisticsForms; class StatisticsFormsTest extends \MailPoetTest { - public function testItCanRecordStats() { $record = StatisticsForms::record($formId = 1, $subscriberId = 2); expect($record->formId)->equals(1); diff --git a/tests/integration/Models/SubscriberCustomFieldTest.php b/tests/integration/Models/SubscriberCustomFieldTest.php index 5f4ccdae4b..c15f6b55c7 100644 --- a/tests/integration/Models/SubscriberCustomFieldTest.php +++ b/tests/integration/Models/SubscriberCustomFieldTest.php @@ -7,6 +7,7 @@ use MailPoetVendor\Idiorm\ORM; class SubscriberCustomFieldTest extends \MailPoetTest { public $data; + public function __construct() { parent::__construct(); $this->data = [ diff --git a/tests/integration/Models/SubscribersInDynamicSegmentTest.php b/tests/integration/Models/SubscribersInDynamicSegmentTest.php index 88aa32e557..75f12fc297 100644 --- a/tests/integration/Models/SubscribersInDynamicSegmentTest.php +++ b/tests/integration/Models/SubscribersInDynamicSegmentTest.php @@ -87,5 +87,4 @@ class SubscribersInDynamicSegmentTest extends \MailPoetTest { } } } - } diff --git a/tests/integration/Newsletter/AutomatedLatestContentTest.php b/tests/integration/Newsletter/AutomatedLatestContentTest.php index 0130a999e2..541c1dd09f 100644 --- a/tests/integration/Newsletter/AutomatedLatestContentTest.php +++ b/tests/integration/Newsletter/AutomatedLatestContentTest.php @@ -6,6 +6,7 @@ use MailPoet\Newsletter\AutomatedLatestContent; class AutomatedLatestContentTest extends \MailPoetTest { public $alc; + public function __construct() { parent::__construct(); $this->alc = new AutomatedLatestContent(); diff --git a/tests/integration/Newsletter/Editor/PostContentManagerTest.php b/tests/integration/Newsletter/Editor/PostContentManagerTest.php index 5e3ba62727..5bedd64547 100644 --- a/tests/integration/Newsletter/Editor/PostContentManagerTest.php +++ b/tests/integration/Newsletter/Editor/PostContentManagerTest.php @@ -135,7 +135,6 @@ class PostContentManagerTest extends \MailPoetTest { } } - public function testItAppliesCustomMaxExcerptLenghViaHook() { $postContentManager = new PostContentManager( $this->make(WooCommerceHelper::class, ['isWooCommerceActive' => false]) diff --git a/tests/integration/Newsletter/Links/LinksTest.php b/tests/integration/Newsletter/Links/LinksTest.php index 4f58a3d181..16f202a59e 100644 --- a/tests/integration/Newsletter/Links/LinksTest.php +++ b/tests/integration/Newsletter/Links/LinksTest.php @@ -80,7 +80,6 @@ class LinksTest extends \MailPoetTest { expect($updatedContent)->notContains('link'); } - public function testItHashesAndReplacesLinksWithSpecialCharacters() { $template = 'some site'; $result = Links::process($template, 0, 0); diff --git a/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php b/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php index 65d6dbbab2..f4e98e6df9 100644 --- a/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php +++ b/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php @@ -25,6 +25,7 @@ class AutomaticEmailTest extends \MailPoetTest { parent::_before(); $this->automaticEmailScheduler = new AutomaticEmailScheduler; } + public function testItCreatesScheduledAutomaticEmailSendingTaskForUser() { $newsletter = $this->_createNewsletter(); $this->_createNewsletterOptions( diff --git a/tests/integration/Newsletter/Scheduler/PostNotificationTest.php b/tests/integration/Newsletter/Scheduler/PostNotificationTest.php index f1b3f71646..adcf23ecc1 100644 --- a/tests/integration/Newsletter/Scheduler/PostNotificationTest.php +++ b/tests/integration/Newsletter/Scheduler/PostNotificationTest.php @@ -222,7 +222,6 @@ class PostNotificationTest extends \MailPoetTest { ->equals('2017-01-01 13:01:00'); } - public function testUnsearchablePostTypeDoesNotSchedulePostNotification() { $hook = ContainerWrapper::getInstance()->get(Hooks::class); @@ -341,7 +340,4 @@ class PostNotificationTest extends \MailPoetTest { ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); ORM::raw_execute('TRUNCATE ' . Subscriber::$_table); } - - - } diff --git a/tests/integration/Newsletter/Scheduler/SchedulerTest.php b/tests/integration/Newsletter/Scheduler/SchedulerTest.php index 06fd2d2505..a89982418c 100644 --- a/tests/integration/Newsletter/Scheduler/SchedulerTest.php +++ b/tests/integration/Newsletter/Scheduler/SchedulerTest.php @@ -21,7 +21,6 @@ use MailPoetVendor\Carbon\Carbon; use MailPoetVendor\Idiorm\ORM; class SchedulerTest extends \MailPoetTest { - public function testItGetsActiveNewslettersFilteredByTypeAndGroup() { $this->_createNewsletter($type = Newsletter::TYPE_WELCOME); diff --git a/tests/integration/Newsletter/Scheduler/WelcomeTest.php b/tests/integration/Newsletter/Scheduler/WelcomeTest.php index e8a1618f6b..a344af1328 100644 --- a/tests/integration/Newsletter/Scheduler/WelcomeTest.php +++ b/tests/integration/Newsletter/Scheduler/WelcomeTest.php @@ -165,7 +165,6 @@ class WelcomeTest extends \MailPoetTest { expect($result[0]->id())->equals($queue->id()); } - public function itDoesNotScheduleAnythingWhenNewsletterDoesNotExist() { // subscriber welcome notification is not scheduled @@ -318,5 +317,4 @@ class WelcomeTest extends \MailPoetTest { ORM::raw_execute('TRUNCATE ' . SendingQueue::$_table); ORM::raw_execute('TRUNCATE ' . Subscriber::$_table); } - } diff --git a/tests/integration/Newsletter/ShortcodesTest.php b/tests/integration/Newsletter/ShortcodesTest.php index f9d38a13a0..f367681cb6 100644 --- a/tests/integration/Newsletter/ShortcodesTest.php +++ b/tests/integration/Newsletter/ShortcodesTest.php @@ -397,5 +397,4 @@ class ShortcodesTest extends \MailPoetTest { wp_delete_post($this->wPPost, true); wp_delete_user($this->wPUser->ID); } - } diff --git a/tests/integration/Router/Endpoints/SubscriptionTest.php b/tests/integration/Router/Endpoints/SubscriptionTest.php index 73aeda241d..7b5b0c7989 100644 --- a/tests/integration/Router/Endpoints/SubscriptionTest.php +++ b/tests/integration/Router/Endpoints/SubscriptionTest.php @@ -12,6 +12,7 @@ use MailPoet\WP\Functions as WPFunctions; class SubscriptionTest extends \MailPoetTest { public $data; public $subscription; + public function _before() { $this->data = []; // instantiate class diff --git a/tests/integration/Router/Endpoints/TrackTest.php b/tests/integration/Router/Endpoints/TrackTest.php index 403cb5d697..b59599f2e1 100644 --- a/tests/integration/Router/Endpoints/TrackTest.php +++ b/tests/integration/Router/Endpoints/TrackTest.php @@ -25,6 +25,7 @@ class TrackTest extends \MailPoetTest { public $queue; public $subscriber; public $newsletter; + public function _before() { parent::_before(); // create newsletter diff --git a/tests/integration/Segments/BulkActionTest.php b/tests/integration/Segments/BulkActionTest.php index 43d07a5d59..7d0b6cfbd6 100644 --- a/tests/integration/Segments/BulkActionTest.php +++ b/tests/integration/Segments/BulkActionTest.php @@ -109,5 +109,4 @@ class BulkActionTest extends \MailPoetTest { $result = $handler->apply(); expect($result)->equals('result'); } - } diff --git a/tests/integration/Segments/DynamicListingsHandlerMock.php b/tests/integration/Segments/DynamicListingsHandlerMock.php index e500678e0e..670611eaaa 100644 --- a/tests/integration/Segments/DynamicListingsHandlerMock.php +++ b/tests/integration/Segments/DynamicListingsHandlerMock.php @@ -3,9 +3,7 @@ namespace MailPoet\Test\Segments; class DynamicListingsHandlerMock { - public function get() { } - } diff --git a/tests/integration/Segments/FinderMock.php b/tests/integration/Segments/FinderMock.php index 87eebf035b..326955b97a 100644 --- a/tests/integration/Segments/FinderMock.php +++ b/tests/integration/Segments/FinderMock.php @@ -3,7 +3,6 @@ namespace MailPoet\Segments; class FinderMock { - public function getSubscriberIdsInSegment() { } @@ -11,5 +10,4 @@ class FinderMock { public function findSubscribersInSegment() { } - } diff --git a/tests/integration/Segments/SubscribersBulkActionHandlerMock.php b/tests/integration/Segments/SubscribersBulkActionHandlerMock.php index f9f61beaf2..9a36c6b73c 100644 --- a/tests/integration/Segments/SubscribersBulkActionHandlerMock.php +++ b/tests/integration/Segments/SubscribersBulkActionHandlerMock.php @@ -3,9 +3,7 @@ namespace MailPoet\Test\Segments; class SubscribersBulkActionHandlerMock { - public function apply() { } - } diff --git a/tests/integration/Segments/SubscribersFinderTest.php b/tests/integration/Segments/SubscribersFinderTest.php index 615c119ebf..c5a164e3c2 100644 --- a/tests/integration/Segments/SubscribersFinderTest.php +++ b/tests/integration/Segments/SubscribersFinderTest.php @@ -189,5 +189,4 @@ class SubscribersFinderTest extends \MailPoetTest { $segment->type = $type; return $segment; } - } diff --git a/tests/integration/Segments/SubscribersListingsTest.php b/tests/integration/Segments/SubscribersListingsTest.php index 9e5070e5ac..4510da1698 100644 --- a/tests/integration/Segments/SubscribersListingsTest.php +++ b/tests/integration/Segments/SubscribersListingsTest.php @@ -97,5 +97,4 @@ class SubscribersListingsTest extends \MailPoetTest { remove_all_filters('mailpoet_get_subscribers_listings_in_segment_handlers'); $this->finder->getListingsInSegment(['filter' => ['segment' => $this->segment2->id]]); } - } diff --git a/tests/integration/Segments/WPTest.php b/tests/integration/Segments/WPTest.php index b58f0f232b..39272c6f6f 100644 --- a/tests/integration/Segments/WPTest.php +++ b/tests/integration/Segments/WPTest.php @@ -450,5 +450,4 @@ class WPTest extends \MailPoetTest { SET `email` = "" WHERE `id` = ' . $subscriber->id ); } - } diff --git a/tests/integration/Segments/WooCommerceTest.php b/tests/integration/Segments/WooCommerceTest.php index 5c9995ba84..39cbbcc887 100644 --- a/tests/integration/Segments/WooCommerceTest.php +++ b/tests/integration/Segments/WooCommerceTest.php @@ -676,5 +676,4 @@ class WooCommerceTest extends \MailPoetTest { SET `email` = "" WHERE `id` = ' . $subscriber->id ); } - } diff --git a/tests/integration/Statistics/Track/OpensTest.php b/tests/integration/Statistics/Track/OpensTest.php index 31879c254a..72651c222d 100644 --- a/tests/integration/Statistics/Track/OpensTest.php +++ b/tests/integration/Statistics/Track/OpensTest.php @@ -20,6 +20,7 @@ class OpensTest extends \MailPoetTest { public $queue; public $subscriber; public $newsletter; + public function _before() { parent::_before(); // create newsletter diff --git a/tests/integration/Statistics/Track/UnsubscribesTest.php b/tests/integration/Statistics/Track/UnsubscribesTest.php index 02b89d9e27..238a440e75 100644 --- a/tests/integration/Statistics/Track/UnsubscribesTest.php +++ b/tests/integration/Statistics/Track/UnsubscribesTest.php @@ -15,6 +15,7 @@ class UnsubscribesTest extends \MailPoetTest { public $queue; public $subscriber; public $newsletter; + public function _before() { parent::_before(); // create newsletter diff --git a/tests/integration/Subscribers/ConfirmationEmailMailerTest.php b/tests/integration/Subscribers/ConfirmationEmailMailerTest.php index d427e99255..d650b074e5 100644 --- a/tests/integration/Subscribers/ConfirmationEmailMailerTest.php +++ b/tests/integration/Subscribers/ConfirmationEmailMailerTest.php @@ -14,7 +14,6 @@ use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Idiorm\ORM; class ConfirmationEmailMailerTest extends \MailPoetTest { - public function testItSendsConfirmationEmail() { $subcriptionUrlFacroryMock = $this->createMock(SubscriptionUrlFactory::class); $subcriptionUrlFacroryMock->method('getConfirmationUrl')->willReturn('http://example.com'); @@ -177,5 +176,4 @@ class ConfirmationEmailMailerTest extends \MailPoetTest { ORM::raw_execute('TRUNCATE ' . Segment::$_table); ORM::raw_execute('TRUNCATE ' . SubscriberSegment::$_table); } - } diff --git a/tests/integration/Subscribers/ImportExport/Export/DefaultSubscribersGetterTest.php b/tests/integration/Subscribers/ImportExport/Export/DefaultSubscribersGetterTest.php index 98374b4698..fe52a2ea72 100644 --- a/tests/integration/Subscribers/ImportExport/Export/DefaultSubscribersGetterTest.php +++ b/tests/integration/Subscribers/ImportExport/Export/DefaultSubscribersGetterTest.php @@ -15,6 +15,7 @@ class DefaultSubscribersGetterTest extends \MailPoetTest { public $customFieldsData; public $subscribersData; public $subscriberFields; + public function _before() { parent::_before(); $this->subscriberFields = [ diff --git a/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php b/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php index 798edd0147..2beef49222 100644 --- a/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php +++ b/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php @@ -15,6 +15,7 @@ class DynamicSubscribersGetterTest extends \MailPoetTest { public $customFieldsData; public $subscribersData; public $subscriberFields; + public function _before() { parent::_before(); $this->subscriberFields = [ diff --git a/tests/integration/Subscribers/ImportExport/Export/ExportTest.php b/tests/integration/Subscribers/ImportExport/Export/ExportTest.php index 1fd1aab5bb..908307396e 100644 --- a/tests/integration/Subscribers/ImportExport/Export/ExportTest.php +++ b/tests/integration/Subscribers/ImportExport/Export/ExportTest.php @@ -19,6 +19,7 @@ class ExportTest extends \MailPoetTest { public $subscribersData; public $subscriberFields; public $jSONData; + public function _before() { parent::_before(); $this->jSONData = json_decode((string)file_get_contents(dirname(__FILE__) . '/ExportTestData.json'), true); diff --git a/tests/integration/Subscribers/ImportExport/Import/ImportTest.php b/tests/integration/Subscribers/ImportExport/Import/ImportTest.php index 420827df1a..3f7559f341 100644 --- a/tests/integration/Subscribers/ImportExport/Import/ImportTest.php +++ b/tests/integration/Subscribers/ImportExport/Import/ImportTest.php @@ -18,6 +18,7 @@ class ImportTest extends \MailPoetTest { public $testData; public $segment2; public $segment1; + public function _before() { $customField = CustomField::create(); $customField->name = 'country'; diff --git a/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php b/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php index a9e0f4380a..c4a8289568 100644 --- a/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php +++ b/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php @@ -11,6 +11,7 @@ use MailPoet\Subscribers\ImportExport\ImportExportFactory; class ImportExportFactoryTest extends \MailPoetTest { public $exportFactory; public $importFactory; + public function _before() { parent::_before(); $segment1 = Segment::createOrUpdate(['name' => 'Unconfirmed Segment']); diff --git a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php index 6f47889be1..6dabba6ad6 100644 --- a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php +++ b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php @@ -78,5 +78,4 @@ class NewsletterClicksExporterTest extends \MailPoetTest { expect($result['data'][0]['data'])->contains(['name' => 'URL', 'value' => 'Link url']); expect($result['data'][0]['data'])->contains(['name' => 'Timestamp of the click event', 'value' => '2018-01-02 15:16:17']); } - } diff --git a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php index e0230a620c..baee85f8b4 100644 --- a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php +++ b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php @@ -94,5 +94,4 @@ class SegmentsExporterTest extends \MailPoetTest { expect($result['data'][1])->hasKey('data'); expect($result['data'])->equals($expected); } - } diff --git a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php index c10c04200b..0608f69d03 100644 --- a/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php +++ b/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php @@ -85,7 +85,6 @@ class SubscriberExporterTest extends \MailPoetTest { expect($result['data'][0]['data'])->contains(['name' => 'Confirmed IP', 'value' => 'IP2']); } - public function testExportSubscriberWithCustomField() { $subscriber = Subscriber::createOrUpdate([ 'email' => 'email.that@has.custom.fields', @@ -103,5 +102,4 @@ class SubscriberExporterTest extends \MailPoetTest { $result = $this->exporter->export('email.that@has.custom.fields'); expect($result['data'][0]['data'])->contains(['name' => 'Custom field1', 'value' => 'Value']); } - } diff --git a/tests/integration/Subscribers/LinkTokensTest.php b/tests/integration/Subscribers/LinkTokensTest.php index 941cc00819..ed5ece94e3 100644 --- a/tests/integration/Subscribers/LinkTokensTest.php +++ b/tests/integration/Subscribers/LinkTokensTest.php @@ -51,5 +51,4 @@ class LinkTokensTest extends \MailPoetTest { $subscriber->save(); return $subscriber; } - } diff --git a/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php b/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php index 13170dc5d2..1d9ab6ed88 100644 --- a/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php +++ b/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php @@ -45,7 +45,6 @@ class NewSubscriberNotificationMailerTest extends \MailPoetTest { $service->send($this->subscriber, $this->segments); } - public function testItDoesNotSendIfSettingsDoesNotHaveAddress() { $this->settings->set(NewSubscriberNotificationMailer::SETTINGS_KEY, ['enabled' => false]); $mailer = Stub::makeEmpty(Mailer::class, ['send' => Expected::never()], $this); diff --git a/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php b/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php index dac47a3de1..ce4fc5bbd7 100644 --- a/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php +++ b/tests/integration/Subscribers/RequiredCustomFieldValidatorTest.php @@ -69,5 +69,4 @@ class RequiredCustomFieldValidatorTest extends \MailPoetTest { $validator = new RequiredCustomFieldValidator(); $validator->validate(['cf_' . $this->customField->id() => 'value'], $form); } - } diff --git a/tests/integration/Subscribers/SourceTest.php b/tests/integration/Subscribers/SourceTest.php index f3c11c1b05..8f3f429c4f 100644 --- a/tests/integration/Subscribers/SourceTest.php +++ b/tests/integration/Subscribers/SourceTest.php @@ -5,7 +5,6 @@ namespace MailPoet\Subscribers; use MailPoet\Models\Subscriber; class SourceTest extends \MailPoetTest { - public function testItDoesntOverrideSource() { $subscriber = Subscriber::createOrUpdate([ 'source' => Source::FORM, @@ -35,5 +34,4 @@ class SourceTest extends \MailPoetTest { $updatedSubscriber = Source::setSource($subscriber, Source::FORM); expect($updatedSubscriber->source)->equals(Source::FORM); } - } diff --git a/tests/integration/Tasks/SendingTest.php b/tests/integration/Tasks/SendingTest.php index 41d809f5b5..01e41f1098 100644 --- a/tests/integration/Tasks/SendingTest.php +++ b/tests/integration/Tasks/SendingTest.php @@ -17,6 +17,7 @@ class SendingTest extends \MailPoetTest { public $queue; public $task; public $newsletter; + public function _before() { parent::_before(); $this->newsletter = $this->createNewNewsletter(); diff --git a/tests/integration/Tasks/Subscribers/BatchIteratorTest.php b/tests/integration/Tasks/Subscribers/BatchIteratorTest.php index fc14be55a3..a8cd293e43 100644 --- a/tests/integration/Tasks/Subscribers/BatchIteratorTest.php +++ b/tests/integration/Tasks/Subscribers/BatchIteratorTest.php @@ -11,6 +11,7 @@ class BatchIteratorTest extends \MailPoetTest { public $subscriberCount; public $batchSize; public $taskId; + public function _before() { parent::_before(); $this->taskId = 123; // random ID diff --git a/tests/integration/Twig/AssetsTest.php b/tests/integration/Twig/AssetsTest.php index 814350c979..823a5dd227 100644 --- a/tests/integration/Twig/AssetsTest.php +++ b/tests/integration/Twig/AssetsTest.php @@ -8,6 +8,7 @@ class AssetsTest extends \MailPoetTest { public $assetsExtension; public $version; public $assetsUrl; + public function _before() { parent::_before(); $this->assetsUrl = 'https://www.testing.com/wp-content/plugins/mailpoet/assets'; diff --git a/tests/integration/Util/Notices/AfterMigrationNoticeTest.php b/tests/integration/Util/Notices/AfterMigrationNoticeTest.php index a14d63a49a..65d43580b8 100644 --- a/tests/integration/Util/Notices/AfterMigrationNoticeTest.php +++ b/tests/integration/Util/Notices/AfterMigrationNoticeTest.php @@ -3,7 +3,6 @@ namespace MailPoet\Util\Notices; class AfterMigrationNoticeTest extends \MailPoetTest { - public function testItDoesntDisplayIfShouldntDisplay() { $notice = new AfterMigrationNotice(); $result = $notice->init(false); @@ -23,5 +22,4 @@ class AfterMigrationNoticeTest extends \MailPoetTest { $result = $notice->init(true); expect($result)->notEmpty(); } - } diff --git a/tests/integration/Util/Notices/PHPVersionWarningsTest.php b/tests/integration/Util/Notices/PHPVersionWarningsTest.php index c5c58abbf7..df479ff276 100644 --- a/tests/integration/Util/Notices/PHPVersionWarningsTest.php +++ b/tests/integration/Util/Notices/PHPVersionWarningsTest.php @@ -61,5 +61,4 @@ class PHPVersionWarningsTest extends \MailPoetTest { $warning = $this->phpVersionWarning->init('5.5.3', true); expect($warning)->null(); } - } diff --git a/tests/integration/WP/EmojiTest.php b/tests/integration/WP/EmojiTest.php index 63706c4a75..d737cd0535 100644 --- a/tests/integration/WP/EmojiTest.php +++ b/tests/integration/WP/EmojiTest.php @@ -12,6 +12,7 @@ class EmojiTest extends \MailPoetTest { public $column; public $dataDecoded; public $dataEncoded; + public function _before() { parent::_before(); $this->dataEncoded = "Emojis: 😃😵💪, not emojis: .Ž"; diff --git a/tests/integration/WP/FunctionsTest.php b/tests/integration/WP/FunctionsTest.php index df1eb2e917..a08ad23f0e 100644 --- a/tests/integration/WP/FunctionsTest.php +++ b/tests/integration/WP/FunctionsTest.php @@ -10,6 +10,7 @@ class FunctionsTest extends \MailPoetTest { public $filter; public $action; public $contentWidth; + public function _before() { parent::_before(); global $content_width; // phpcs:ignore Squiz.NamingConventions.ValidVariableName.NotCamelCaps diff --git a/tests/integration/WooCommerce/TransactionalEmails/RendererTest.php b/tests/integration/WooCommerce/TransactionalEmails/RendererTest.php index 6ebe4e4014..f065fdfedf 100644 --- a/tests/integration/WooCommerce/TransactionalEmails/RendererTest.php +++ b/tests/integration/WooCommerce/TransactionalEmails/RendererTest.php @@ -94,5 +94,4 @@ class RendererTest extends \MailPoetTest { expect($css)->contains("#mailpoet_woocommerce_container .some-class {\nheight:50px;\nwidth:30px\n}"); expect($css)->contains("#mailpoet_woocommerce_container h1 {\nfont-weight:700\n}"); } - } diff --git a/tests/integration/_bootstrap.php b/tests/integration/_bootstrap.php index c0bf657a75..1293ba4538 100644 --- a/tests/integration/_bootstrap.php +++ b/tests/integration/_bootstrap.php @@ -205,7 +205,6 @@ function asCallable($fn) { }; } - // this is needed since it is not possible to mock __unset on non-existing class // (PHPUnit creates empty __unset method without parameters which is a PHP error) if (!class_exists(WC_Session::class)) { @@ -220,6 +219,7 @@ if (!function_exists('WC')) { class WC_Mailer { // phpcs:ignore public function email_header() { // phpcs:ignore } + public function email_footer() { // phpcs:ignore } } @@ -228,9 +228,11 @@ if (!function_exists('WC')) { return new WC_Mailer; } } + function WC() { return new WooCommerce; } + class WC_Order_Item_Product { // phpcs:ignore public function get_product_id() { // phpcs:ignore } diff --git a/tests/unit/Cron/Workers/StatsNotifications/SchedulerTest.php b/tests/unit/Cron/Workers/StatsNotifications/SchedulerTest.php index ec583feb51..e3763ddf62 100644 --- a/tests/unit/Cron/Workers/StatsNotifications/SchedulerTest.php +++ b/tests/unit/Cron/Workers/StatsNotifications/SchedulerTest.php @@ -258,5 +258,4 @@ class SchedulerTest extends \MailPoetUnitTest { $newsletter->setType(NewsletterEntity::TYPE_WELCOME); $this->statsNotifications->schedule($newsletter); } - } diff --git a/tests/unit/DynamicSegments/RequirementsCheckerTest.php b/tests/unit/DynamicSegments/RequirementsCheckerTest.php index bebc175414..100402676b 100644 --- a/tests/unit/DynamicSegments/RequirementsCheckerTest.php +++ b/tests/unit/DynamicSegments/RequirementsCheckerTest.php @@ -46,5 +46,4 @@ class RequirementsCheckerTest extends \MailPoetUnitTest { $segment->setFilters([new EmailAction(EmailAction::ACTION_OPENED, 2)]); expect($this->requirementsChecker->shouldSkipSegment($segment))->false(); } - } diff --git a/tests/unit/Features/FeaturesControllerTest.php b/tests/unit/Features/FeaturesControllerTest.php index 3264142949..1d8cf35982 100644 --- a/tests/unit/Features/FeaturesControllerTest.php +++ b/tests/unit/Features/FeaturesControllerTest.php @@ -7,7 +7,6 @@ use MailPoet\Features\FeatureFlagsRepository; use MailPoet\Features\FeaturesController; class FeaturesControllerTest extends \MailPoetUnitTest { - public function testItWorksWithDefaults() { $repository = $this->makeEmpty( FeatureFlagsRepository::class, @@ -73,5 +72,4 @@ class FeaturesControllerTest extends \MailPoetUnitTest { } expect($controller->getAllFlags())->isEmpty(); } - } diff --git a/tests/unit/Form/Block/BlockRendererHelperTest.php b/tests/unit/Form/Block/BlockRendererHelperTest.php index 45040804d7..465a56a6d0 100644 --- a/tests/unit/Form/Block/BlockRendererHelperTest.php +++ b/tests/unit/Form/Block/BlockRendererHelperTest.php @@ -30,6 +30,7 @@ class BlockRendererHelperTest extends \MailPoetUnitTest { ], 'position' => '1', ]; + public function _before() { parent::_before(); $this->wpMock = $this->createMock(WPFunctions::class); diff --git a/tests/unit/Form/Block/DateTest.php b/tests/unit/Form/Block/DateTest.php index a150b692af..6afa821ee6 100644 --- a/tests/unit/Form/Block/DateTest.php +++ b/tests/unit/Form/Block/DateTest.php @@ -64,7 +64,6 @@ class DateTest extends \MailPoetUnitTest { expect($selectedYear->textContent)->equals($currentYear); } - public function testItShouldRenderYearMonthDayDateFormat() { $this->baseMock->expects($this->once())->method('renderLabel')->willReturn(''); $this->baseMock->expects($this->once())->method('getFieldName')->willReturn('Field name'); diff --git a/tests/unit/Form/Util/StylesTest.php b/tests/unit/Form/Util/StylesTest.php index e9248c5cc3..922f4fe847 100644 --- a/tests/unit/Form/Util/StylesTest.php +++ b/tests/unit/Form/Util/StylesTest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Form\Util; use MailPoet\Form\Util\Styles; class StylesTest extends \MailPoetUnitTest { - public function testItSetsDefaultCSSStyles() { $styles = new Styles(); expect($styles->getDefaultStyles())->notEmpty(); diff --git a/tests/unit/Mailer/MailerErrorTest.php b/tests/unit/Mailer/MailerErrorTest.php index 16c489bb87..e1ae52ce2c 100644 --- a/tests/unit/Mailer/MailerErrorTest.php +++ b/tests/unit/Mailer/MailerErrorTest.php @@ -8,7 +8,6 @@ use MailPoet\Mailer\SubscriberError; use MailPoet\WP\Functions as WPFunctions; class MailerErrorTest extends \MailPoetUnitTest { - public function _before() { WPFunctions::set(Stub::make(new WPFunctions, [ '__' => function ($value) { diff --git a/tests/unit/Newsletter/Editor/StructureTransformerTest.php b/tests/unit/Newsletter/Editor/StructureTransformerTest.php index a078ad398c..ea5c953245 100644 --- a/tests/unit/Newsletter/Editor/StructureTransformerTest.php +++ b/tests/unit/Newsletter/Editor/StructureTransformerTest.php @@ -29,5 +29,4 @@ class StructureTransformerTest extends \MailPoetUnitTest { expect($blocks[2]['type'])->equals('text'); expect($blocks[2]['text'])->equals('

next textbolded

'); } - } diff --git a/tests/unit/Newsletter/Renderer/EscapeHelperTest.php b/tests/unit/Newsletter/Renderer/EscapeHelperTest.php index 02e6afac12..8bbd039019 100644 --- a/tests/unit/Newsletter/Renderer/EscapeHelperTest.php +++ b/tests/unit/Newsletter/Renderer/EscapeHelperTest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Newsletter; use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; class EscapeHelperTest extends \MailPoetUnitTest { - public function testItEscapesHtmlText() { expect(EHelper::escapeHtmlText('Text\'"Hello')) ->equals("Text<tag>'\"Hello</tag>"); diff --git a/tests/unit/Newsletter/Renderer/PreprocessorTest.php b/tests/unit/Newsletter/Renderer/PreprocessorTest.php index 65191ea866..6ebda22fb9 100644 --- a/tests/unit/Newsletter/Renderer/PreprocessorTest.php +++ b/tests/unit/Newsletter/Renderer/PreprocessorTest.php @@ -8,7 +8,6 @@ use MailPoet\Newsletter\Renderer\Preprocessor; use MailPoet\WooCommerce\TransactionalEmails; class PreprocessorTest extends \MailPoetUnitTest { - public function testProcessWooCommerceHeadingBlock() { $renderer = Stub::make(Renderer::class); $transactionalEmails = Stub::make(TransactionalEmails::class, [ @@ -64,5 +63,4 @@ class PreprocessorTest extends \MailPoetUnitTest { ], ]]); } - } diff --git a/tests/unit/Newsletter/Renderer/StylesHelperTest.php b/tests/unit/Newsletter/Renderer/StylesHelperTest.php index a328fcb7b7..1207af9eab 100644 --- a/tests/unit/Newsletter/Renderer/StylesHelperTest.php +++ b/tests/unit/Newsletter/Renderer/StylesHelperTest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Newsletter; use MailPoet\Newsletter\Renderer\StylesHelper; class StylesHelperTest extends \MailPoetUnitTest { - public function testItGetsCustomFontsLinks() { $stylesWithCustomFonts = [ "text" => [ diff --git a/tests/unit/Util/License/Features/SubscribersTest.php b/tests/unit/Util/License/Features/SubscribersTest.php index 05e93ce807..f07114cf5e 100644 --- a/tests/unit/Util/License/Features/SubscribersTest.php +++ b/tests/unit/Util/License/Features/SubscribersTest.php @@ -9,7 +9,6 @@ use MailPoet\Subscribers\SubscribersRepository; use MailPoet\Util\License\Features\Subscribers as SubscribersFeature; class SubscribersTest extends \MailPoetUnitTest { - public function testCheckReturnsTrueIfOldUserReachedLimit() { $subscribersFeature = $this->constructWith([ 'mss_key_state' => 'invalid', diff --git a/tests/unit/Util/SecurityTest.php b/tests/unit/Util/SecurityTest.php index 1eb1bfac2e..1a5fc584dc 100644 --- a/tests/unit/Util/SecurityTest.php +++ b/tests/unit/Util/SecurityTest.php @@ -5,7 +5,6 @@ namespace MailPoet\Test\Util; use MailPoet\Util\Security; class SecurityTest extends \MailPoetUnitTest { - public function testItCanGenerateARandomString() { // it has a default length of 5 $hash = Security::generateRandomString(); diff --git a/tests/unit/Util/XlsxWriterTest.php b/tests/unit/Util/XlsxWriterTest.php index 3a973937b7..a3a667c75c 100644 --- a/tests/unit/Util/XlsxWriterTest.php +++ b/tests/unit/Util/XlsxWriterTest.php @@ -3,7 +3,6 @@ namespace MailPoet\Test\Util; class XlsxWriterTest extends \MailPoetUnitTest { - public function _before() { } diff --git a/tests/unit/WP/DateTimeTest.php b/tests/unit/WP/DateTimeTest.php index a8c9814fff..d64675e1e6 100644 --- a/tests/unit/WP/DateTimeTest.php +++ b/tests/unit/WP/DateTimeTest.php @@ -7,7 +7,6 @@ use MailPoet\WP\DateTime as WPDateTime; use MailPoet\WP\Functions as WPFunctions; class DateTimeTest extends \MailPoetUnitTest { - public function testGetTimeFormat() { $dateTime = new WPDateTime(Stub::make(new WPFunctions(), [ 'getOption' => function($key) { diff --git a/tests/unit/WP/PostsTest.php b/tests/unit/WP/PostsTest.php index 4666b3b24f..c69e1eca91 100644 --- a/tests/unit/WP/PostsTest.php +++ b/tests/unit/WP/PostsTest.php @@ -7,7 +7,6 @@ use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Posts; class PostsTest extends \MailPoetUnitTest { - public function testGetTermsProxiesCallToWordPress() { $args = [ 'taxonomy' => 'post_tags', diff --git a/tests/unit/WooCommerce/TransactionalEmailsUnitTest.php b/tests/unit/WooCommerce/TransactionalEmailsUnitTest.php index cb78c07655..e1031b4679 100644 --- a/tests/unit/WooCommerce/TransactionalEmailsUnitTest.php +++ b/tests/unit/WooCommerce/TransactionalEmailsUnitTest.php @@ -11,7 +11,6 @@ use MailPoet\WooCommerce\TransactionalEmails\Template; use MailPoet\WP\Functions as WPFunctions; class TransactionalEmailsUnitTest extends \MailPoetUnitTest { - public function testGetEmailHeadings() { $wp = Stub::make(new WPFunctions, [ 'getOption' => function($name) {