From ade1cc4d8e86e2d0f2e2d9c9181dc1f58017a544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jakes=CC=8C?= Date: Mon, 30 Sep 2019 15:35:37 +0200 Subject: [PATCH] Autofix alphabetically sorted use statements [MAILPOET-2409] --- lib/API/JSON/API.php | 2 +- lib/API/JSON/v1/Newsletters.php | 2 +- lib/API/JSON/v1/SendingTaskSubscribers.php | 12 ++++---- lib/API/JSON/v1/Settings.php | 2 +- lib/API/JSON/v1/Setup.php | 2 +- lib/API/JSON/v1/Subscribers.php | 2 +- lib/API/MP/v1/API.php | 2 +- lib/AdminPages/Pages/FormEditor.php | 2 +- lib/Analytics/Analytics.php | 2 +- lib/Config/DeferredAdminNotices.php | 2 +- lib/Config/Hooks.php | 4 +-- lib/Config/Initializer.php | 2 +- lib/Config/Migrator.php | 2 +- lib/Config/Populator.php | 10 +++---- lib/Config/PopulatorData/DefaultForm.php | 2 +- lib/Config/PrivacyPolicy.php | 2 +- lib/Config/Renderer.php | 3 +- lib/Config/RequirementsChecker.php | 3 +- lib/Config/ServicesChecker.php | 3 +- lib/Cron/Triggers/WordPress.php | 28 +++++++++---------- lib/Cron/Workers/Bounce.php | 6 ++-- lib/Cron/Workers/SendingQueue/Tasks/Links.php | 14 +++++----- .../Workers/StatsNotifications/Worker.php | 2 +- lib/Cron/Workers/SubscriberLinkTokens.php | 2 +- lib/Cron/Workers/UnsubscribeTokens.php | 4 +-- lib/Cron/Workers/WorkersFactory.php | 22 +++++++-------- lib/DI/ContainerConfigurator.php | 2 +- lib/Doctrine/ConfigurationFactory.php | 2 +- lib/Features/FeatureFlagsRepository.php | 2 +- lib/Form/Util/Export.php | 2 +- lib/Logging/LogHandler.php | 2 +- .../Methods/ErrorMappers/AmazonSESMapper.php | 2 +- .../Methods/ErrorMappers/MailPoetMapper.php | 5 ++-- .../Methods/ErrorMappers/PHPMailMapper.php | 2 +- .../Methods/ErrorMappers/SMTPMapper.php | 2 +- .../Methods/ErrorMappers/SendGridMapper.php | 2 +- lib/Mailer/Methods/MailPoet.php | 2 +- lib/Models/Newsletter.php | 2 +- lib/Models/Segment.php | 2 +- lib/Models/SendingQueue.php | 2 +- lib/Models/Subscriber.php | 4 +-- lib/Newsletter/Editor/PostTransformer.php | 2 +- .../Editor/StructureTransformer.php | 2 +- lib/Newsletter/Links/Links.php | 2 +- lib/Newsletter/NewslettersRepository.php | 2 +- lib/Newsletter/Renderer/Blocks/Button.php | 2 +- lib/Newsletter/Renderer/Blocks/Divider.php | 2 +- lib/Newsletter/Renderer/Blocks/Footer.php | 2 +- lib/Newsletter/Renderer/Blocks/Header.php | 2 +- lib/Newsletter/Renderer/Blocks/Image.php | 2 +- lib/Newsletter/Renderer/Blocks/Text.php | 2 +- lib/Newsletter/Renderer/Renderer.php | 2 +- lib/Newsletter/Url.php | 4 +-- lib/Router/Router.php | 2 +- lib/Segments/WP.php | 2 +- lib/Segments/WooCommerce.php | 2 +- lib/Services/Bridge/API.php | 2 +- lib/Settings/UserFlagsRepository.php | 2 +- .../ImportExport/Export/Export.php | 2 +- lib/Subscription/CaptchaRenderer.php | 2 +- lib/Subscription/Pages.php | 10 +++---- lib/Subscription/SubscriptionUrlFactory.php | 4 +-- lib/Tasks/Sending.php | 2 +- lib/Tracy/DoctrinePanel/DoctrinePanel.php | 2 +- lib/Twig/Analytics.php | 4 +-- lib/Util/Installation.php | 2 +- lib/Util/Notices/DiscountsAnnouncement.php | 2 +- lib/Util/Notices/UnauthorizedEmailNotice.php | 2 +- tests/DataFactories/Newsletter.php | 4 +-- tests/DataFactories/UserFlags.php | 2 +- .../ReceivePostNotificationCest.php | 2 +- tests/integration/API/JSON/APITest.php | 4 +-- .../API/JSON/v1/CustomFieldsTest.php | 2 +- tests/integration/API/JSON/v1/FormsTest.php | 2 +- tests/integration/API/JSON/v1/MailerTest.php | 2 +- .../integration/API/JSON/v1/SegmentsTest.php | 2 +- .../JSON/v1/SendingTaskSubscribersTest.php | 12 ++++---- .../integration/API/JSON/v1/ServicesTest.php | 2 +- .../integration/API/JSON/v1/SettingsTest.php | 2 +- tests/integration/API/JSON/v1/SetupTest.php | 8 +++--- .../API/JSON/v1/SubscribersTest.php | 6 ++-- .../integration/API/JSON/v1/UserFlagsTest.php | 4 +-- tests/integration/API/MP/APITest.php | 2 +- tests/integration/Config/MP2MigratorTest.php | 4 +-- tests/integration/Cron/CronHelperTest.php | 2 +- .../Cron/Triggers/WordPressTest.php | 6 ++-- tests/integration/Cron/Workers/BounceTest.php | 4 +-- .../Workers/KeyCheck/KeyCheckWorkerTest.php | 2 +- .../Workers/SendingQueue/SendingQueueTest.php | 2 +- .../SendingQueue/Tasks/NewsletterTest.php | 2 +- .../Cron/Workers/SimpleWorkerTest.php | 2 +- .../AutomatedEmailsTest.php | 2 +- .../Workers/StatsNotifications/WorkerTest.php | 2 +- .../Cron/Workers/UnsubscribeTokensTest.php | 8 +++--- tests/integration/Helpscout/BeaconTest.php | 2 +- .../Mailer/Methods/AmazonSESTest.php | 2 +- .../Mailer/Methods/MailPoetAPITest.php | 2 +- .../Mailer/Methods/PHPMailTest.php | 2 +- tests/integration/Mailer/Methods/SMTPTest.php | 2 +- .../Mailer/Methods/SendGridTest.php | 2 +- tests/integration/Models/NewsletterTest.php | 16 +++++------ .../integration/Models/ScheduledTaskTest.php | 2 +- .../Models/SubscriberSegmentTest.php | 2 +- tests/integration/Router/RouterTest.php | 4 +-- .../Settings/UserFlagsControllerTest.php | 2 +- .../Export/DynamicSubscribersGetterTest.php | 2 +- .../ImportExport/Export/ExportTest.php | 2 +- tests/integration/Subscription/UrlTest.php | 10 +++---- tests/unit/DI/ContainerWrapperTest.php | 2 +- tests/unit/Util/DOMTest.php | 2 +- tests/unit/WP/PostsTest.php | 2 +- 111 files changed, 194 insertions(+), 198 deletions(-) diff --git a/lib/API/JSON/API.php b/lib/API/JSON/API.php index 256baf0453..662c4d8ca8 100644 --- a/lib/API/JSON/API.php +++ b/lib/API/JSON/API.php @@ -8,10 +8,10 @@ use MailPoet\Settings\SettingsController; use MailPoet\Subscription\Captcha; use MailPoet\Tracy\ApiPanel\ApiPanel; use MailPoet\Tracy\DIPanel\DIPanel; -use MailPoetVendor\Psr\Container\ContainerInterface; use MailPoet\Util\Helpers; use MailPoet\Util\Security; use MailPoet\WP\Functions as WPFunctions; +use MailPoetVendor\Psr\Container\ContainerInterface; use Tracy\Debugger; use Tracy\ILogger; diff --git a/lib/API/JSON/v1/Newsletters.php b/lib/API/JSON/v1/Newsletters.php index 448aea0c5d..cf2cd99603 100644 --- a/lib/API/JSON/v1/Newsletters.php +++ b/lib/API/JSON/v1/Newsletters.php @@ -26,8 +26,8 @@ use MailPoet\Newsletter\Scheduler\Scheduler; use MailPoet\Newsletter\Url as NewsletterUrl; use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Settings\SettingsController; -use MailPoet\WP\Functions as WPFunctions; use MailPoet\WooCommerce\Helper as WCHelper; +use MailPoet\WP\Functions as WPFunctions; class Newsletters extends APIEndpoint { diff --git a/lib/API/JSON/v1/SendingTaskSubscribers.php b/lib/API/JSON/v1/SendingTaskSubscribers.php index 88772658b1..66cc1824da 100644 --- a/lib/API/JSON/v1/SendingTaskSubscribers.php +++ b/lib/API/JSON/v1/SendingTaskSubscribers.php @@ -2,17 +2,17 @@ namespace MailPoet\API\JSON\v1; -use MailPoet\Listing; +use MailPoet\API\JSON\Endpoint as APIEndpoint; +use MailPoet\API\JSON\Error as APIError; +use MailPoet\Config\AccessControl; use MailPoet\Cron\CronHelper; +use MailPoet\Listing; use MailPoet\Models\Newsletter; use MailPoet\Models\ScheduledTask; -use MailPoet\Config\AccessControl; -use MailPoet\API\JSON\Error as APIError; +use MailPoet\Models\ScheduledTaskSubscriber; +use MailPoet\Models\SendingQueue as SendingQueueModel; use MailPoet\Settings\SettingsController; use MailPoet\WP\Functions as WPFunctions; -use MailPoet\Models\ScheduledTaskSubscriber; -use MailPoet\API\JSON\Endpoint as APIEndpoint; -use MailPoet\Models\SendingQueue as SendingQueueModel; class SendingTaskSubscribers extends APIEndpoint { public $permissions = [ diff --git a/lib/API/JSON/v1/Settings.php b/lib/API/JSON/v1/Settings.php index 9eb9d93f5c..84da31c7e1 100644 --- a/lib/API/JSON/v1/Settings.php +++ b/lib/API/JSON/v1/Settings.php @@ -8,12 +8,12 @@ use MailPoet\API\JSON\Error as APIError; use MailPoet\Config\AccessControl; use MailPoet\Cron\Workers\InactiveSubscribers; use MailPoet\Cron\Workers\WooCommerceSync; +use MailPoet\Models\Form; use MailPoet\Models\ScheduledTask; use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\Bridge; use MailPoet\Settings\SettingsController; use MailPoet\WP\Functions as WPFunctions; -use MailPoet\Models\Form; class Settings extends APIEndpoint { diff --git a/lib/API/JSON/v1/Setup.php b/lib/API/JSON/v1/Setup.php index e916014bef..e4dd6ca731 100644 --- a/lib/API/JSON/v1/Setup.php +++ b/lib/API/JSON/v1/Setup.php @@ -3,9 +3,9 @@ namespace MailPoet\API\JSON\v1; use MailPoet\API\JSON\Endpoint as APIEndpoint; -use MailPoet\WP\Functions as WPFunctions; use MailPoet\Config\AccessControl; use MailPoet\Config\Activator; +use MailPoet\WP\Functions as WPFunctions; class Setup extends APIEndpoint { public $permissions = [ diff --git a/lib/API/JSON/v1/Subscribers.php b/lib/API/JSON/v1/Subscribers.php index 1fe6f5399b..e6c8ee45c1 100644 --- a/lib/API/JSON/v1/Subscribers.php +++ b/lib/API/JSON/v1/Subscribers.php @@ -23,8 +23,8 @@ use MailPoet\Subscribers\Source; use MailPoet\Subscribers\SubscriberActions; use MailPoet\Subscription\Captcha; use MailPoet\Subscription\CaptchaSession; -use MailPoet\Subscription\Throttling as SubscriptionThrottling; use MailPoet\Subscription\SubscriptionUrlFactory; +use MailPoet\Subscription\Throttling as SubscriptionThrottling; use MailPoet\WP\Functions as WPFunctions; class Subscribers extends APIEndpoint { diff --git a/lib/API/MP/v1/API.php b/lib/API/MP/v1/API.php index b059e82497..b42520d58b 100644 --- a/lib/API/MP/v1/API.php +++ b/lib/API/MP/v1/API.php @@ -8,9 +8,9 @@ use MailPoet\Models\Segment; use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberSegment; use MailPoet\Newsletter\Scheduler\WelcomeScheduler; -use MailPoet\Subscribers\RequiredCustomFieldValidator; use MailPoet\Subscribers\ConfirmationEmailMailer; use MailPoet\Subscribers\NewSubscriberNotificationMailer; +use MailPoet\Subscribers\RequiredCustomFieldValidator; use MailPoet\Subscribers\Source; use MailPoet\Tasks\Sending; use MailPoet\WP\Functions as WPFunctions; diff --git a/lib/AdminPages/Pages/FormEditor.php b/lib/AdminPages/Pages/FormEditor.php index 26e15b19d9..9f394bb137 100644 --- a/lib/AdminPages/Pages/FormEditor.php +++ b/lib/AdminPages/Pages/FormEditor.php @@ -3,8 +3,8 @@ namespace MailPoet\AdminPages\Pages; use MailPoet\AdminPages\PageRenderer; -use MailPoet\Form\Renderer as FormRenderer; use MailPoet\Form\Block; +use MailPoet\Form\Renderer as FormRenderer; use MailPoet\Models\Form; use MailPoet\Models\Segment; use MailPoet\Settings\Pages; diff --git a/lib/Analytics/Analytics.php b/lib/Analytics/Analytics.php index f6a1950073..eb22232724 100644 --- a/lib/Analytics/Analytics.php +++ b/lib/Analytics/Analytics.php @@ -3,8 +3,8 @@ namespace MailPoet\Analytics; use Carbon\Carbon; -use MailPoet\WP\Functions as WPFunctions; use MailPoet\Settings\SettingsController; +use MailPoet\WP\Functions as WPFunctions; class Analytics { diff --git a/lib/Config/DeferredAdminNotices.php b/lib/Config/DeferredAdminNotices.php index d549209de6..7e2d7fbf52 100644 --- a/lib/Config/DeferredAdminNotices.php +++ b/lib/Config/DeferredAdminNotices.php @@ -2,8 +2,8 @@ namespace MailPoet\Config; -use MailPoet\WP\Notice; use MailPoet\WP\Functions as WPFunctions; +use MailPoet\WP\Notice; class DeferredAdminNotices { diff --git a/lib/Config/Hooks.php b/lib/Config/Hooks.php index a9d29b040a..3c7a34c4c9 100644 --- a/lib/Config/Hooks.php +++ b/lib/Config/Hooks.php @@ -2,16 +2,16 @@ namespace MailPoet\Config; -use MailPoet\Newsletter\Scheduler\PostNotificationScheduler; use MailPoet\Mailer\WordPress\Replacer; use MailPoet\Mailer\WordPress\WordpressMailerReplacer; +use MailPoet\Newsletter\Scheduler\PostNotificationScheduler; +use MailPoet\Segments\WooCommerce as WooCommerceSegment; use MailPoet\Settings\SettingsController; use MailPoet\Statistics\Track\WooCommercePurchases; use MailPoet\Subscription\Comment; use MailPoet\Subscription\Form; use MailPoet\Subscription\Manage; use MailPoet\Subscription\Registration; -use MailPoet\Segments\WooCommerce as WooCommerceSegment; use MailPoet\WooCommerce\Subscription as WooCommerceSubscription; use MailPoet\WP\Functions as WPFunctions; diff --git a/lib/Config/Initializer.php b/lib/Config/Initializer.php index f943e0d75b..2e8beb5899 100644 --- a/lib/Config/Initializer.php +++ b/lib/Config/Initializer.php @@ -9,8 +9,8 @@ use MailPoet\Settings\SettingsController; use MailPoet\Util\ConflictResolver; use MailPoet\Util\Helpers; use MailPoet\Util\Notices\PermanentNotices; -use MailPoet\WP\Notice as WPNotice; use MailPoet\WP\Functions as WPFunctions; +use MailPoet\WP\Notice as WPNotice; require_once(ABSPATH . 'wp-admin/includes/plugin.php'); diff --git a/lib/Config/Migrator.php b/lib/Config/Migrator.php index d1d8dc6f65..0c1befc649 100644 --- a/lib/Config/Migrator.php +++ b/lib/Config/Migrator.php @@ -2,8 +2,8 @@ namespace MailPoet\Config; -use MailPoet\Models\Subscriber; use MailPoet\Models\Newsletter; +use MailPoet\Models\Subscriber; use MailPoet\Util\Helpers; require_once(ABSPATH . 'wp-admin/includes/upgrade.php'); diff --git a/lib/Config/Populator.php b/lib/Config/Populator.php index b3028c34e1..e602139851 100644 --- a/lib/Config/Populator.php +++ b/lib/Config/Populator.php @@ -8,25 +8,25 @@ use MailPoet\Cron\CronTrigger; use MailPoet\Cron\Workers\AuthorizedSendingEmailsCheck; use MailPoet\Cron\Workers\Beamer; use MailPoet\Cron\Workers\InactiveSubscribers; +use MailPoet\Cron\Workers\StatsNotifications\Worker; +use MailPoet\Cron\Workers\SubscriberLinkTokens; +use MailPoet\Cron\Workers\UnsubscribeTokens; use MailPoet\Entities\UserFlagEntity; use MailPoet\Features\FeaturesController; -use MailPoet\Settings\UserFlagsRepository; -use MailPoet\Cron\Workers\StatsNotifications\Worker; -use MailPoet\Cron\Workers\UnsubscribeTokens; -use MailPoet\Cron\Workers\SubscriberLinkTokens; use MailPoet\Mailer\MailerLog; use MailPoet\Models\Form; use MailPoet\Models\ScheduledTask; use MailPoet\Models\Segment; use MailPoet\Models\SendingQueue; +use MailPoet\Models\Setting; use MailPoet\Models\StatisticsForms; use MailPoet\Models\Subscriber; -use MailPoet\Models\Setting; use MailPoet\Referrals\ReferralDetector; use MailPoet\Segments\WP; use MailPoet\Services\Bridge; use MailPoet\Settings\Pages; use MailPoet\Settings\SettingsController; +use MailPoet\Settings\UserFlagsRepository; use MailPoet\Subscribers\NewSubscriberNotificationMailer; use MailPoet\Subscribers\Source; use MailPoet\Subscription\Captcha; diff --git a/lib/Config/PopulatorData/DefaultForm.php b/lib/Config/PopulatorData/DefaultForm.php index e8713961aa..07dfa6f288 100644 --- a/lib/Config/PopulatorData/DefaultForm.php +++ b/lib/Config/PopulatorData/DefaultForm.php @@ -3,8 +3,8 @@ namespace MailPoet\Config\PopulatorData; use MailPoet\Form\Util\Styles; -use MailPoet\Models\Segment; use MailPoet\Models\Form; +use MailPoet\Models\Segment; use MailPoet\WP\Functions as WPFunctions; class DefaultForm { diff --git a/lib/Config/PrivacyPolicy.php b/lib/Config/PrivacyPolicy.php index 73256dc8b8..6204924b9a 100644 --- a/lib/Config/PrivacyPolicy.php +++ b/lib/Config/PrivacyPolicy.php @@ -3,8 +3,8 @@ namespace MailPoet\Config; use MailPoet\Util\Helpers; -use MailPoet\WP\Functions as WPFunctions; use MailPoet\WooCommerce\Helper as WooCommerceHelper; +use MailPoet\WP\Functions as WPFunctions; class PrivacyPolicy { diff --git a/lib/Config/Renderer.php b/lib/Config/Renderer.php index e8aa0b5ed0..5866b56919 100644 --- a/lib/Config/Renderer.php +++ b/lib/Config/Renderer.php @@ -3,13 +3,12 @@ namespace MailPoet\Config; use MailPoet\Twig; +use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Twig\Environment as TwigEnv; use MailPoetVendor\Twig\Extension\DebugExtension; use MailPoetVendor\Twig\Lexer as TwigLexer; use MailPoetVendor\Twig\Loader\FilesystemLoader as TwigFileSystem; -use MailPoet\WP\Functions as WPFunctions; - class Renderer { protected $cache_path; protected $caching_enabled; diff --git a/lib/Config/RequirementsChecker.php b/lib/Config/RequirementsChecker.php index 35f0e4608f..abda4325b8 100644 --- a/lib/Config/RequirementsChecker.php +++ b/lib/Config/RequirementsChecker.php @@ -3,9 +3,8 @@ namespace MailPoet\Config; use MailPoet\Util\Helpers; -use MailPoet\WP\Notice as WPNotice; - use MailPoet\WP\Functions as WPFunctions; +use MailPoet\WP\Notice as WPNotice; class RequirementsChecker { const TEST_FOLDER_PERMISSIONS = 'TempAndCacheFolderCreation'; diff --git a/lib/Config/ServicesChecker.php b/lib/Config/ServicesChecker.php index c2de6f67c2..deb957e309 100644 --- a/lib/Config/ServicesChecker.php +++ b/lib/Config/ServicesChecker.php @@ -8,9 +8,8 @@ use MailPoet\Settings\SettingsController; use MailPoet\Util\Helpers; use MailPoet\Util\License\License; use MailPoet\WP\DateTime; -use MailPoet\WP\Notice as WPNotice; - use MailPoet\WP\Functions as WPFunctions; +use MailPoet\WP\Notice as WPNotice; class ServicesChecker { diff --git a/lib/Cron/Triggers/WordPress.php b/lib/Cron/Triggers/WordPress.php index 4878b26292..d72dca01f5 100644 --- a/lib/Cron/Triggers/WordPress.php +++ b/lib/Cron/Triggers/WordPress.php @@ -2,27 +2,27 @@ namespace MailPoet\Cron\Triggers; -use MailPoet\Cron\Workers\AuthorizedSendingEmailsCheck; -use MailPoet\Cron\Workers\InactiveSubscribers; -use MailPoet\Cron\Workers\StatsNotifications\AutomatedEmails; -use MailPoet\Cron\Workers\WooCommerceOrders; -use MailPoet\Services\Bridge; use MailPoet\Cron\CronHelper; -use MailPoet\Mailer\MailerLog; -use MailPoet\Models\ScheduledTask; -use MailPoet\Settings\SettingsController; -use MailPoet\WP\Functions as WPFunctions; +use MailPoet\Cron\Workers\AuthorizedSendingEmailsCheck; +use MailPoet\Cron\Workers\Beamer as BeamerWorker; use MailPoet\Cron\Workers\Bounce as BounceWorker; +use MailPoet\Cron\Workers\InactiveSubscribers; +use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck as PremiumKeyCheckWorker; +use MailPoet\Cron\Workers\KeyCheck\SendingServiceKeyCheck as SendingServiceKeyCheckWorker; use MailPoet\Cron\Workers\Scheduler as SchedulerWorker; use MailPoet\Cron\Workers\SendingQueue\Migration as MigrationWorker; use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker; -use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck as PremiumKeyCheckWorker; +use MailPoet\Cron\Workers\StatsNotifications\AutomatedEmails; use MailPoet\Cron\Workers\StatsNotifications\Worker as StatsNotificationsWorker; -use MailPoet\Cron\Workers\KeyCheck\SendingServiceKeyCheck as SendingServiceKeyCheckWorker; -use MailPoet\Cron\Workers\WooCommerceSync as WooCommerceSyncWorker; -use MailPoet\Cron\Workers\Beamer as BeamerWorker; -use MailPoet\Cron\Workers\UnsubscribeTokens; use MailPoet\Cron\Workers\SubscriberLinkTokens; +use MailPoet\Cron\Workers\UnsubscribeTokens; +use MailPoet\Cron\Workers\WooCommerceOrders; +use MailPoet\Cron\Workers\WooCommerceSync as WooCommerceSyncWorker; +use MailPoet\Mailer\MailerLog; +use MailPoet\Models\ScheduledTask; +use MailPoet\Services\Bridge; +use MailPoet\Settings\SettingsController; +use MailPoet\WP\Functions as WPFunctions; class WordPress { const SCHEDULED_IN_THE_PAST = 'past'; diff --git a/lib/Cron/Workers/Bounce.php b/lib/Cron/Workers/Bounce.php index 08d75c1063..fa917f90c7 100644 --- a/lib/Cron/Workers/Bounce.php +++ b/lib/Cron/Workers/Bounce.php @@ -6,12 +6,12 @@ use MailPoet\Cron\CronHelper; use MailPoet\Mailer\Mailer; use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTaskSubscriber; -use MailPoet\Tasks\Bounce as BounceTask; -use MailPoet\Tasks\Subscribers as TaskSubscribers; -use MailPoet\Tasks\Subscribers\BatchIterator; use MailPoet\Models\Subscriber; use MailPoet\Services\Bridge; use MailPoet\Services\Bridge\API; +use MailPoet\Tasks\Bounce as BounceTask; +use MailPoet\Tasks\Subscribers as TaskSubscribers; +use MailPoet\Tasks\Subscribers\BatchIterator; use function MailPoet\Util\array_column; class Bounce extends SimpleWorker { diff --git a/lib/Cron/Workers/SendingQueue/Tasks/Links.php b/lib/Cron/Workers/SendingQueue/Tasks/Links.php index eff49e9157..1a3f585590 100644 --- a/lib/Cron/Workers/SendingQueue/Tasks/Links.php +++ b/lib/Cron/Workers/SendingQueue/Tasks/Links.php @@ -2,15 +2,15 @@ namespace MailPoet\Cron\Workers\SendingQueue\Tasks; -use MailPoet\Settings\SettingsController; -use MailPoet\Util\Helpers; -use MailPoet\Router\Router; -use MailPoet\Subscription\SubscriptionUrlFactory; -use MailPoet\Models\Subscriber; -use MailPoet\Router\Endpoints\Track; -use MailPoet\Newsletter\Links\Links as NewsletterLinks; use MailPoet\Models\NewsletterLink as NewsletterLinkModel; +use MailPoet\Models\Subscriber; +use MailPoet\Newsletter\Links\Links as NewsletterLinks; +use MailPoet\Router\Endpoints\Track; +use MailPoet\Router\Router; +use MailPoet\Settings\SettingsController; use MailPoet\Subscribers\LinkTokens; +use MailPoet\Subscription\SubscriptionUrlFactory; +use MailPoet\Util\Helpers; class Links { static function process($rendered_newsletter, $newsletter, $queue) { diff --git a/lib/Cron/Workers/StatsNotifications/Worker.php b/lib/Cron/Workers/StatsNotifications/Worker.php index b7e9cd100d..f195d9cc52 100644 --- a/lib/Cron/Workers/StatsNotifications/Worker.php +++ b/lib/Cron/Workers/StatsNotifications/Worker.php @@ -13,8 +13,8 @@ use MailPoet\Models\ScheduledTask; use MailPoet\Models\StatsNotification; use MailPoet\Settings\SettingsController; use MailPoet\Tasks\Sending; -use MailPoet\WP\Functions as WPFunctions; use MailPoet\WooCommerce\Helper as WCHelper; +use MailPoet\WP\Functions as WPFunctions; class Worker { diff --git a/lib/Cron/Workers/SubscriberLinkTokens.php b/lib/Cron/Workers/SubscriberLinkTokens.php index d08278e782..aeed426432 100644 --- a/lib/Cron/Workers/SubscriberLinkTokens.php +++ b/lib/Cron/Workers/SubscriberLinkTokens.php @@ -3,8 +3,8 @@ namespace MailPoet\Cron\Workers; use Carbon\Carbon; -use MailPoet\Models\Subscriber; use MailPoet\Models\ScheduledTask; +use MailPoet\Models\Subscriber; use MailPoet\WP\Functions as WPFunctions; if (!defined('ABSPATH')) exit; diff --git a/lib/Cron/Workers/UnsubscribeTokens.php b/lib/Cron/Workers/UnsubscribeTokens.php index 83445cb25b..250691c0a0 100644 --- a/lib/Cron/Workers/UnsubscribeTokens.php +++ b/lib/Cron/Workers/UnsubscribeTokens.php @@ -3,11 +3,11 @@ namespace MailPoet\Cron\Workers; use Carbon\Carbon; -use MailPoet\Util\Security; use MailPoet\Cron\CronHelper; -use MailPoet\Models\Subscriber; use MailPoet\Models\Newsletter; use MailPoet\Models\ScheduledTask; +use MailPoet\Models\Subscriber; +use MailPoet\Util\Security; use MailPoet\WP\Functions as WPFunctions; class UnsubscribeTokens extends SimpleWorker { diff --git a/lib/Cron/Workers/WorkersFactory.php b/lib/Cron/Workers/WorkersFactory.php index 0d6f15bd74..9129f86f9a 100644 --- a/lib/Cron/Workers/WorkersFactory.php +++ b/lib/Cron/Workers/WorkersFactory.php @@ -3,26 +3,26 @@ namespace MailPoet\Cron\Workers; use MailPoet\Config\Renderer; -use MailPoet\Cron\Workers\Scheduler as SchedulerWorker; -use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker; -use MailPoet\Cron\Workers\SendingQueue\Migration as MigrationWorker; -use MailPoet\Cron\Workers\StatsNotifications\AutomatedEmails as StatsNotificationsWorkerForAutomatedEmails; -use MailPoet\Cron\Workers\StatsNotifications\Scheduler as StatsNotificationScheduler; -use MailPoet\Cron\Workers\StatsNotifications\Worker as StatsNotificationsWorker; use MailPoet\Cron\Workers\Bounce as BounceWorker; use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck as PremiumKeyCheckWorker; use MailPoet\Cron\Workers\KeyCheck\SendingServiceKeyCheck as SendingServiceKeyCheckWorker; -use MailPoet\Cron\Workers\WooCommerceSync as WooCommerceSyncWorker; +use MailPoet\Cron\Workers\Scheduler as SchedulerWorker; +use MailPoet\Cron\Workers\SendingQueue\Migration as MigrationWorker; use MailPoet\Cron\Workers\SendingQueue\SendingErrorHandler; +use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker; +use MailPoet\Cron\Workers\StatsNotifications\AutomatedEmails as StatsNotificationsWorkerForAutomatedEmails; +use MailPoet\Cron\Workers\StatsNotifications\Scheduler as StatsNotificationScheduler; +use MailPoet\Cron\Workers\StatsNotifications\Worker as StatsNotificationsWorker; +use MailPoet\Cron\Workers\WooCommerceSync as WooCommerceSyncWorker; +use MailPoet\Mailer\Mailer; +use MailPoet\Mailer\MetaInfo; use MailPoet\Segments\SubscribersFinder; use MailPoet\Segments\WooCommerce as WooCommerceSegment; use MailPoet\Services\AuthorizedEmailsController; -use MailPoet\Statistics\Track\WooCommercePurchases; -use MailPoet\WooCommerce\Helper as WooCommerceHelper; -use MailPoet\Mailer\Mailer; -use MailPoet\Mailer\MetaInfo; use MailPoet\Settings\SettingsController; +use MailPoet\Statistics\Track\WooCommercePurchases; use MailPoet\Subscribers\InactiveSubscribersController; +use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoet\WP\Functions as WPFunctions; class WorkersFactory { diff --git a/lib/DI/ContainerConfigurator.php b/lib/DI/ContainerConfigurator.php index b221c1c6a8..6d1640fec2 100644 --- a/lib/DI/ContainerConfigurator.php +++ b/lib/DI/ContainerConfigurator.php @@ -2,9 +2,9 @@ namespace MailPoet\DI; +use MailPoetVendor\Psr\Container\ContainerInterface; use MailPoetVendor\Symfony\Component\DependencyInjection\ContainerBuilder; use MailPoetVendor\Symfony\Component\DependencyInjection\Reference; -use MailPoetVendor\Psr\Container\ContainerInterface; class ContainerConfigurator implements IContainerConfigurator { diff --git a/lib/Doctrine/ConfigurationFactory.php b/lib/Doctrine/ConfigurationFactory.php index e4d1fe83b1..973941983a 100644 --- a/lib/Doctrine/ConfigurationFactory.php +++ b/lib/Doctrine/ConfigurationFactory.php @@ -6,8 +6,8 @@ use MailPoetVendor\Doctrine\Common\Annotations\SimpleAnnotationReader; use MailPoetVendor\Doctrine\Common\Cache\ArrayCache; use MailPoetVendor\Doctrine\Common\Proxy\AbstractProxyFactory; use MailPoetVendor\Doctrine\ORM\Configuration; -use MailPoetVendor\Doctrine\ORM\Mapping\UnderscoreNamingStrategy; use MailPoetVendor\Doctrine\ORM\Mapping\Driver\PHPDriver; +use MailPoetVendor\Doctrine\ORM\Mapping\UnderscoreNamingStrategy; class ConfigurationFactory { const ENTITY_DIR = __DIR__ . '/../Entities'; diff --git a/lib/Features/FeatureFlagsRepository.php b/lib/Features/FeatureFlagsRepository.php index 2db9d2f1be..270a2e268c 100644 --- a/lib/Features/FeatureFlagsRepository.php +++ b/lib/Features/FeatureFlagsRepository.php @@ -2,8 +2,8 @@ namespace MailPoet\Features; -use MailPoet\Entities\FeatureFlagEntity; use MailPoet\Doctrine\Repository; +use MailPoet\Entities\FeatureFlagEntity; /** * @method FeatureFlagEntity[] findAll() diff --git a/lib/Form/Util/Export.php b/lib/Form/Util/Export.php index e584903eac..cff6e319bf 100644 --- a/lib/Form/Util/Export.php +++ b/lib/Form/Util/Export.php @@ -2,8 +2,8 @@ namespace MailPoet\Form\Util; -use MailPoet\Form\Widget; use MailPoet\Config\Env; +use MailPoet\Form\Widget; use MailPoet\WP\Functions as WPFunctions; class Export { diff --git a/lib/Logging/LogHandler.php b/lib/Logging/LogHandler.php index 925ad74cba..47d183ab33 100644 --- a/lib/Logging/LogHandler.php +++ b/lib/Logging/LogHandler.php @@ -3,8 +3,8 @@ namespace MailPoet\Logging; use Carbon\Carbon; -use MailPoetVendor\Monolog\Handler\AbstractProcessingHandler; use MailPoet\Models\Log; +use MailPoetVendor\Monolog\Handler\AbstractProcessingHandler; class LogHandler extends AbstractProcessingHandler { diff --git a/lib/Mailer/Methods/ErrorMappers/AmazonSESMapper.php b/lib/Mailer/Methods/ErrorMappers/AmazonSESMapper.php index 15327787b3..bf9cadeaae 100644 --- a/lib/Mailer/Methods/ErrorMappers/AmazonSESMapper.php +++ b/lib/Mailer/Methods/ErrorMappers/AmazonSESMapper.php @@ -2,8 +2,8 @@ namespace MailPoet\Mailer\Methods\ErrorMappers; -use MailPoet\Mailer\MailerError; use MailPoet\Mailer\Mailer; +use MailPoet\Mailer\MailerError; use MailPoet\Mailer\SubscriberError; use MailPoet\WP\Functions as WPFunctions; diff --git a/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php b/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php index 8e88360e7a..37f984bdf2 100644 --- a/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php +++ b/lib/Mailer/Methods/ErrorMappers/MailPoetMapper.php @@ -2,13 +2,12 @@ namespace MailPoet\Mailer\Methods\ErrorMappers; -use MailPoet\Mailer\MailerError; +use InvalidArgumentException; use MailPoet\Mailer\Mailer; +use MailPoet\Mailer\MailerError; use MailPoet\Mailer\SubscriberError; use MailPoet\Services\Bridge\API; -use InvalidArgumentException; use MailPoet\Util\Helpers; - use MailPoet\WP\Functions as WPFunctions; class MailPoetMapper { diff --git a/lib/Mailer/Methods/ErrorMappers/PHPMailMapper.php b/lib/Mailer/Methods/ErrorMappers/PHPMailMapper.php index 2f380e2845..f75667cc99 100644 --- a/lib/Mailer/Methods/ErrorMappers/PHPMailMapper.php +++ b/lib/Mailer/Methods/ErrorMappers/PHPMailMapper.php @@ -2,8 +2,8 @@ namespace MailPoet\Mailer\Methods\ErrorMappers; -use MailPoet\Mailer\MailerError; use MailPoet\Mailer\Mailer; +use MailPoet\Mailer\MailerError; use MailPoet\Mailer\SubscriberError; use MailPoet\WP\Functions as WPFunctions; diff --git a/lib/Mailer/Methods/ErrorMappers/SMTPMapper.php b/lib/Mailer/Methods/ErrorMappers/SMTPMapper.php index e750b2f3fe..3207e2a035 100644 --- a/lib/Mailer/Methods/ErrorMappers/SMTPMapper.php +++ b/lib/Mailer/Methods/ErrorMappers/SMTPMapper.php @@ -2,8 +2,8 @@ namespace MailPoet\Mailer\Methods\ErrorMappers; -use MailPoet\Mailer\MailerError; use MailPoet\Mailer\Mailer; +use MailPoet\Mailer\MailerError; use MailPoet\Mailer\SubscriberError; use MailPoet\WP\Functions as WPFunctions; diff --git a/lib/Mailer/Methods/ErrorMappers/SendGridMapper.php b/lib/Mailer/Methods/ErrorMappers/SendGridMapper.php index b643dfd8fa..527d99aadc 100644 --- a/lib/Mailer/Methods/ErrorMappers/SendGridMapper.php +++ b/lib/Mailer/Methods/ErrorMappers/SendGridMapper.php @@ -2,8 +2,8 @@ namespace MailPoet\Mailer\Methods\ErrorMappers; -use MailPoet\Mailer\MailerError; use MailPoet\Mailer\Mailer; +use MailPoet\Mailer\MailerError; use MailPoet\Mailer\SubscriberError; use MailPoet\WP\Functions as WPFunctions; diff --git a/lib/Mailer/Methods/MailPoet.php b/lib/Mailer/Methods/MailPoet.php index f3e1016e86..45bd8968df 100644 --- a/lib/Mailer/Methods/MailPoet.php +++ b/lib/Mailer/Methods/MailPoet.php @@ -2,8 +2,8 @@ namespace MailPoet\Mailer\Methods; -use MailPoet\Mailer\Mailer; use MailPoet\Config\ServicesChecker; +use MailPoet\Mailer\Mailer; use MailPoet\Mailer\MailerError; use MailPoet\Mailer\Methods\Common\BlacklistCheck; use MailPoet\Mailer\Methods\ErrorMappers\MailPoetMapper; diff --git a/lib/Models/Newsletter.php b/lib/Models/Newsletter.php index 363b585ae3..ea67183007 100644 --- a/lib/Models/Newsletter.php +++ b/lib/Models/Newsletter.php @@ -11,8 +11,8 @@ use MailPoet\Util\Helpers; use MailPoet\Util\Security; use MailPoet\WooCommerce\Helper as WCHelper; use MailPoet\WP\Emoji; -use function MailPoet\Util\array_column; use MailPoet\WP\Functions as WPFunctions; +use function MailPoet\Util\array_column; /** * @property int $id diff --git a/lib/Models/Segment.php b/lib/Models/Segment.php index 5ccaa1d9df..08c8ad84dc 100644 --- a/lib/Models/Segment.php +++ b/lib/Models/Segment.php @@ -4,8 +4,8 @@ namespace MailPoet\Models; use MailPoet\Entities\NewsletterEntity; use MailPoet\Entities\SegmentEntity; -use MailPoet\WP\Functions as WPFunctions; use MailPoet\WooCommerce\Helper as WCHelper; +use MailPoet\WP\Functions as WPFunctions; /** * @property array $subscribers_count diff --git a/lib/Models/SendingQueue.php b/lib/Models/SendingQueue.php index e1264dc76e..740af1dc7e 100644 --- a/lib/Models/SendingQueue.php +++ b/lib/Models/SendingQueue.php @@ -3,9 +3,9 @@ namespace MailPoet\Models; use MailPoet\Entities\SendingQueueEntity; +use MailPoet\Tasks\Subscribers as TaskSubscribers; use MailPoet\Util\Helpers; use MailPoet\WP\Emoji; -use MailPoet\Tasks\Subscribers as TaskSubscribers; use MailPoet\WP\Functions as WPFunctions; /** diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php index 7de6f81d1f..75f59f8b14 100644 --- a/lib/Models/Subscriber.php +++ b/lib/Models/Subscriber.php @@ -5,9 +5,9 @@ namespace MailPoet\Models; use MailPoet\DI\ContainerWrapper; use MailPoet\Settings\SettingsController; use MailPoet\Util\Helpers; -use function MailPoet\Util\array_column; -use MailPoet\WP\Functions as WPFunctions; use MailPoet\Util\Security; +use MailPoet\WP\Functions as WPFunctions; +use function MailPoet\Util\array_column; /** * @property int $id diff --git a/lib/Newsletter/Editor/PostTransformer.php b/lib/Newsletter/Editor/PostTransformer.php index 94d06dc473..cd8ee7075b 100644 --- a/lib/Newsletter/Editor/PostTransformer.php +++ b/lib/Newsletter/Editor/PostTransformer.php @@ -2,9 +2,9 @@ namespace MailPoet\Newsletter\Editor; +use MailPoet\Config\Env; use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoet\WP\Functions as WPFunctions; -use MailPoet\Config\Env; class PostTransformer { diff --git a/lib/Newsletter/Editor/StructureTransformer.php b/lib/Newsletter/Editor/StructureTransformer.php index 06b69db628..b0443ebe66 100644 --- a/lib/Newsletter/Editor/StructureTransformer.php +++ b/lib/Newsletter/Editor/StructureTransformer.php @@ -2,9 +2,9 @@ namespace MailPoet\Newsletter\Editor; +use MailPoet\Util\DOM as DOMUtil; use pQuery; use pQuery\DomNode; -use MailPoet\Util\DOM as DOMUtil; class StructureTransformer { diff --git a/lib/Newsletter/Links/Links.php b/lib/Newsletter/Links/Links.php index b874f113e2..c74cb53953 100644 --- a/lib/Newsletter/Links/Links.php +++ b/lib/Newsletter/Links/Links.php @@ -10,8 +10,8 @@ use MailPoet\Router\Endpoints\Track as TrackEndpoint; use MailPoet\Router\Router; use MailPoet\Subscribers\LinkTokens; use MailPoet\Util\Helpers; -use MailPoet\Util\Security; use MailPoet\Util\pQuery\pQuery as DomParser; +use MailPoet\Util\Security; use function MailPoet\Util\array_column; diff --git a/lib/Newsletter/NewslettersRepository.php b/lib/Newsletter/NewslettersRepository.php index 38fc07fa35..217a548fdf 100644 --- a/lib/Newsletter/NewslettersRepository.php +++ b/lib/Newsletter/NewslettersRepository.php @@ -2,8 +2,8 @@ namespace MailPoet\Newsletter; -use MailPoet\Entities\NewsletterEntity; use MailPoet\Doctrine\Repository; +use MailPoet\Entities\NewsletterEntity; /** * @method NewsletterEntity[] findBy(array $criteria, array $order_by = null, int $limit = null, int $offset = null) diff --git a/lib/Newsletter/Renderer/Blocks/Button.php b/lib/Newsletter/Renderer/Blocks/Button.php index e5eb048439..a9a5dc4a78 100644 --- a/lib/Newsletter/Renderer/Blocks/Button.php +++ b/lib/Newsletter/Renderer/Blocks/Button.php @@ -2,8 +2,8 @@ namespace MailPoet\Newsletter\Renderer\Blocks; -use MailPoet\Newsletter\Renderer\StylesHelper; use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; +use MailPoet\Newsletter\Renderer\StylesHelper; class Button { static function render($element, $column_base_width) { diff --git a/lib/Newsletter/Renderer/Blocks/Divider.php b/lib/Newsletter/Renderer/Blocks/Divider.php index 40ce71540c..c5cb6c1e75 100644 --- a/lib/Newsletter/Renderer/Blocks/Divider.php +++ b/lib/Newsletter/Renderer/Blocks/Divider.php @@ -2,8 +2,8 @@ namespace MailPoet\Newsletter\Renderer\Blocks; -use MailPoet\Newsletter\Renderer\StylesHelper; use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; +use MailPoet\Newsletter\Renderer\StylesHelper; class Divider { static function render($element) { diff --git a/lib/Newsletter/Renderer/Blocks/Footer.php b/lib/Newsletter/Renderer/Blocks/Footer.php index 0ef99511ce..26d218a726 100644 --- a/lib/Newsletter/Renderer/Blocks/Footer.php +++ b/lib/Newsletter/Renderer/Blocks/Footer.php @@ -2,10 +2,10 @@ namespace MailPoet\Newsletter\Renderer\Blocks; +use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; use MailPoet\Newsletter\Renderer\StylesHelper; use MailPoet\Util\CSS; use MailPoet\Util\pQuery\pQuery; -use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; class Footer { static function render($element) { diff --git a/lib/Newsletter/Renderer/Blocks/Header.php b/lib/Newsletter/Renderer/Blocks/Header.php index 24515be523..091afffc38 100644 --- a/lib/Newsletter/Renderer/Blocks/Header.php +++ b/lib/Newsletter/Renderer/Blocks/Header.php @@ -2,10 +2,10 @@ namespace MailPoet\Newsletter\Renderer\Blocks; +use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; use MailPoet\Newsletter\Renderer\StylesHelper; use MailPoet\Util\CSS; use MailPoet\Util\pQuery\pQuery; -use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; class Header { static function render($element) { diff --git a/lib/Newsletter/Renderer/Blocks/Image.php b/lib/Newsletter/Renderer/Blocks/Image.php index 092f386bd7..eb6c008bb1 100644 --- a/lib/Newsletter/Renderer/Blocks/Image.php +++ b/lib/Newsletter/Renderer/Blocks/Image.php @@ -2,9 +2,9 @@ namespace MailPoet\Newsletter\Renderer\Blocks; +use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; use MailPoet\Newsletter\Renderer\StylesHelper; use MailPoet\WP\Functions as WPFunctions; -use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; class Image { static function render($element, $column_base_width) { diff --git a/lib/Newsletter/Renderer/Blocks/Text.php b/lib/Newsletter/Renderer/Blocks/Text.php index 51f9140312..51094e214a 100644 --- a/lib/Newsletter/Renderer/Blocks/Text.php +++ b/lib/Newsletter/Renderer/Blocks/Text.php @@ -3,8 +3,8 @@ namespace MailPoet\Newsletter\Renderer\Blocks; use MailPoet\Newsletter\Editor\PostContentManager; -use MailPoet\Newsletter\Renderer\StylesHelper; use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; +use MailPoet\Newsletter\Renderer\StylesHelper; use MailPoet\Util\pQuery\pQuery; class Text { diff --git a/lib/Newsletter/Renderer/Renderer.php b/lib/Newsletter/Renderer/Renderer.php index 1bb731312b..b573efedd4 100644 --- a/lib/Newsletter/Renderer/Renderer.php +++ b/lib/Newsletter/Renderer/Renderer.php @@ -4,11 +4,11 @@ namespace MailPoet\Newsletter\Renderer; use MailPoet\Config\Env; use MailPoet\Models\Newsletter; +use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; use MailPoet\Services\Bridge; use MailPoet\Util\License\License; use MailPoet\Util\pQuery\DomNode; use MailPoet\WP\Functions as WPFunctions; -use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; class Renderer { public $blocks_renderer; diff --git a/lib/Newsletter/Url.php b/lib/Newsletter/Url.php index e5481a629e..91bb80d217 100644 --- a/lib/Newsletter/Url.php +++ b/lib/Newsletter/Url.php @@ -2,9 +2,9 @@ namespace MailPoet\Newsletter; -use MailPoet\Router\Router; -use MailPoet\Router\Endpoints\ViewInBrowser as ViewInBrowserEndpoint; use MailPoet\Models\Subscriber as SubscriberModel; +use MailPoet\Router\Endpoints\ViewInBrowser as ViewInBrowserEndpoint; +use MailPoet\Router\Router; use MailPoet\Subscribers\LinkTokens; class Url { diff --git a/lib/Router/Router.php b/lib/Router/Router.php index fd35ef4a4f..baa8a24728 100644 --- a/lib/Router/Router.php +++ b/lib/Router/Router.php @@ -3,9 +3,9 @@ namespace MailPoet\Router; use MailPoet\Config\AccessControl; -use MailPoetVendor\Psr\Container\ContainerInterface; use MailPoet\Util\Helpers; use MailPoet\WP\Functions as WPFunctions; +use MailPoetVendor\Psr\Container\ContainerInterface; class Router { public $api_request; diff --git a/lib/Segments/WP.php b/lib/Segments/WP.php index 9afacce197..9da4588458 100644 --- a/lib/Segments/WP.php +++ b/lib/Segments/WP.php @@ -3,10 +3,10 @@ namespace MailPoet\Segments; use MailPoet\Models\ModelValidator; +use MailPoet\Models\Segment; use MailPoet\Models\StatisticsClicks; use MailPoet\Models\StatisticsOpens; use MailPoet\Models\Subscriber; -use MailPoet\Models\Segment; use MailPoet\Models\SubscriberSegment; use MailPoet\Newsletter\Scheduler\WelcomeScheduler; use MailPoet\Settings\SettingsController; diff --git a/lib/Segments/WooCommerce.php b/lib/Segments/WooCommerce.php index 1ce8341b9d..63e7cfd40f 100644 --- a/lib/Segments/WooCommerce.php +++ b/lib/Segments/WooCommerce.php @@ -4,8 +4,8 @@ namespace MailPoet\Segments; use MailPoet\Config\Env; use MailPoet\Models\ModelValidator; -use MailPoet\Models\Subscriber; use MailPoet\Models\Segment; +use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberSegment; use MailPoet\Settings\SettingsController; use MailPoet\Subscribers\Source; diff --git a/lib/Services/Bridge/API.php b/lib/Services/Bridge/API.php index 31857c0bf2..929ca4b160 100644 --- a/lib/Services/Bridge/API.php +++ b/lib/Services/Bridge/API.php @@ -2,8 +2,8 @@ namespace MailPoet\Services\Bridge; -use MailPoet\WP\Functions as WPFunctions; use MailPoet\Logging\Logger; +use MailPoet\WP\Functions as WPFunctions; class API { const SENDING_STATUS_OK = 'ok'; diff --git a/lib/Settings/UserFlagsRepository.php b/lib/Settings/UserFlagsRepository.php index 5a495e64a0..684ee5cd59 100644 --- a/lib/Settings/UserFlagsRepository.php +++ b/lib/Settings/UserFlagsRepository.php @@ -2,8 +2,8 @@ namespace MailPoet\Settings; -use MailPoet\Entities\UserFlagEntity; use MailPoet\Doctrine\Repository; +use MailPoet\Entities\UserFlagEntity; /** * @method UserFlagEntity[] findBy(array $criteria, array $order_by = null, int $limit = null, int $offset = null) diff --git a/lib/Subscribers/ImportExport/Export/Export.php b/lib/Subscribers/ImportExport/Export/Export.php index f9f85aaacc..2ec6a49add 100644 --- a/lib/Subscribers/ImportExport/Export/Export.php +++ b/lib/Subscribers/ImportExport/Export/Export.php @@ -5,10 +5,10 @@ namespace MailPoet\Subscribers\ImportExport\Export; use MailPoet\Config\Env; use MailPoet\Models\CustomField; use MailPoet\Subscribers\ImportExport\ImportExportFactory; -use function MailPoet\Util\array_column; use MailPoet\Util\Security; use MailPoet\Util\XLSXWriter; use MailPoet\WP\Functions as WPFunctions; +use function MailPoet\Util\array_column; class Export { const SUBSCRIBER_BATCH_SIZE = 15000; diff --git a/lib/Subscription/CaptchaRenderer.php b/lib/Subscription/CaptchaRenderer.php index 3d184e120d..bcf232115c 100644 --- a/lib/Subscription/CaptchaRenderer.php +++ b/lib/Subscription/CaptchaRenderer.php @@ -2,9 +2,9 @@ namespace MailPoet\Subscription; +use MailPoet\Form\Renderer as FormRenderer; use MailPoet\Models\Form as FormModel; use MailPoet\Util\Url as UrlHelper; -use MailPoet\Form\Renderer as FormRenderer; use MailPoet\WP\Functions as WPFunctions; class CaptchaRenderer { diff --git a/lib/Subscription/Pages.php b/lib/Subscription/Pages.php index 33f226c5c8..b42af45484 100644 --- a/lib/Subscription/Pages.php +++ b/lib/Subscription/Pages.php @@ -2,18 +2,18 @@ namespace MailPoet\Subscription; -use MailPoet\Models\Subscriber; -use MailPoet\Models\SubscriberSegment; +use MailPoet\Form\Block\Date as FormBlockDate; +use MailPoet\Form\Renderer as FormRenderer; use MailPoet\Models\CustomField; use MailPoet\Models\Segment; +use MailPoet\Models\Subscriber; +use MailPoet\Models\SubscriberSegment; use MailPoet\Newsletter\Scheduler\WelcomeScheduler; use MailPoet\Settings\SettingsController; +use MailPoet\Subscribers\LinkTokens; use MailPoet\Subscribers\NewSubscriberNotificationMailer; use MailPoet\Util\Helpers; use MailPoet\Util\Url as UrlHelper; -use MailPoet\Form\Renderer as FormRenderer; -use MailPoet\Form\Block\Date as FormBlockDate; -use MailPoet\Subscribers\LinkTokens; use MailPoet\WP\Functions as WPFunctions; class Pages { diff --git a/lib/Subscription/SubscriptionUrlFactory.php b/lib/Subscription/SubscriptionUrlFactory.php index ed768aadd5..e9ec8e98a1 100644 --- a/lib/Subscription/SubscriptionUrlFactory.php +++ b/lib/Subscription/SubscriptionUrlFactory.php @@ -2,9 +2,9 @@ namespace MailPoet\Subscription; -use MailPoet\Router\Router; -use MailPoet\Router\Endpoints\Subscription as SubscriptionEndpoint; use MailPoet\Models\Subscriber; +use MailPoet\Router\Endpoints\Subscription as SubscriptionEndpoint; +use MailPoet\Router\Router; use MailPoet\Settings\Pages as SettingsPages; use MailPoet\Settings\SettingsController; use MailPoet\Subscribers\LinkTokens; diff --git a/lib/Tasks/Sending.php b/lib/Tasks/Sending.php index 3821fa5f1c..a5b28efc3b 100644 --- a/lib/Tasks/Sending.php +++ b/lib/Tasks/Sending.php @@ -6,8 +6,8 @@ use Carbon\Carbon; use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTaskSubscriber; use MailPoet\Models\SendingQueue; -use function MailPoet\Util\array_column; use MailPoet\WP\Functions as WPFunctions; +use function MailPoet\Util\array_column; /** * A facade class containing all necessary models to work with a sending queue diff --git a/lib/Tracy/DoctrinePanel/DoctrinePanel.php b/lib/Tracy/DoctrinePanel/DoctrinePanel.php index 8541949d74..0e9883c44e 100644 --- a/lib/Tracy/DoctrinePanel/DoctrinePanel.php +++ b/lib/Tracy/DoctrinePanel/DoctrinePanel.php @@ -2,8 +2,8 @@ namespace MailPoet\Tracy\DoctrinePanel; -use MailPoetVendor\Doctrine\DBAL\Logging\DebugStack; use MailPoetVendor\Doctrine\DBAL\Configuration; +use MailPoetVendor\Doctrine\DBAL\Logging\DebugStack; use MailPoetVendor\Doctrine\DBAL\Platforms\Keywords\MySQLKeywords; use MailPoetVendor\Doctrine\ORM\EntityManagerInterface; use Tracy\Debugger; diff --git a/lib/Twig/Analytics.php b/lib/Twig/Analytics.php index bf6e6a18de..9ba49cd838 100644 --- a/lib/Twig/Analytics.php +++ b/lib/Twig/Analytics.php @@ -2,13 +2,13 @@ namespace MailPoet\Twig; -use MailPoet\Analytics\Reporter; use MailPoet\Analytics\Analytics as AnalyticsGenerator; +use MailPoet\Analytics\Reporter; use MailPoet\Settings\SettingsController; use MailPoet\WooCommerce\Helper as WooCommerceHelper; +use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Twig\Extension\AbstractExtension; use MailPoetVendor\Twig\TwigFunction; -use MailPoet\WP\Functions as WPFunctions; class Analytics extends AbstractExtension { public function getFunctions() { diff --git a/lib/Util/Installation.php b/lib/Util/Installation.php index 49baae8577..85ed71d418 100644 --- a/lib/Util/Installation.php +++ b/lib/Util/Installation.php @@ -3,8 +3,8 @@ namespace MailPoet\Util; use Carbon\Carbon; -use MailPoet\WP\Functions as WPFunctions; use MailPoet\Settings\SettingsController; +use MailPoet\WP\Functions as WPFunctions; class Installation { const NEW_INSTALLATION_DAYS_LIMIT = 30; diff --git a/lib/Util/Notices/DiscountsAnnouncement.php b/lib/Util/Notices/DiscountsAnnouncement.php index 9a21650edf..33ae6086d4 100644 --- a/lib/Util/Notices/DiscountsAnnouncement.php +++ b/lib/Util/Notices/DiscountsAnnouncement.php @@ -4,8 +4,8 @@ namespace MailPoet\Util\Notices; use MailPoet\Settings\SettingsController; use MailPoet\Util\Helpers; -use MailPoet\WP\Notice as WPNotice; use MailPoet\WP\Functions as WPFunctions; +use MailPoet\WP\Notice as WPNotice; class DiscountsAnnouncement { diff --git a/lib/Util/Notices/UnauthorizedEmailNotice.php b/lib/Util/Notices/UnauthorizedEmailNotice.php index 2a56495710..8c615180c4 100644 --- a/lib/Util/Notices/UnauthorizedEmailNotice.php +++ b/lib/Util/Notices/UnauthorizedEmailNotice.php @@ -2,12 +2,12 @@ namespace MailPoet\Util\Notices; +use MailPoet\Newsletter\Renderer\EscapeHelper; use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Settings\SettingsController; use MailPoet\Util\Helpers; use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Notice; -use MailPoet\Newsletter\Renderer\EscapeHelper; class UnauthorizedEmailNotice { diff --git a/tests/DataFactories/Newsletter.php b/tests/DataFactories/Newsletter.php index 9e9a07d5b0..22f276ca08 100644 --- a/tests/DataFactories/Newsletter.php +++ b/tests/DataFactories/Newsletter.php @@ -3,11 +3,11 @@ namespace MailPoet\Test\DataFactories; use Carbon\Carbon; -use MailPoet\Models\ScheduledTask; use MailPoet\Models\NewsletterSegment; +use MailPoet\Models\ScheduledTask; +use MailPoet\Models\ScheduledTaskSubscriber; use MailPoet\Settings\SettingsController; use MailPoet\Tasks\Sending as SendingTask; -use MailPoet\Models\ScheduledTaskSubscriber; class Newsletter { diff --git a/tests/DataFactories/UserFlags.php b/tests/DataFactories/UserFlags.php index 110bda624b..e8e5c6a527 100644 --- a/tests/DataFactories/UserFlags.php +++ b/tests/DataFactories/UserFlags.php @@ -2,9 +2,9 @@ namespace MailPoet\Test\DataFactories; -use MailPoet\Settings\UserFlagsRepository; use MailPoet\DI\ContainerWrapper; use MailPoet\Entities\UserFlagEntity; +use MailPoet\Settings\UserFlagsRepository; class UserFlags { /** @var int */ diff --git a/tests/acceptance/ReceivePostNotificationCest.php b/tests/acceptance/ReceivePostNotificationCest.php index 7f8cb754b4..1ff6eae2ea 100644 --- a/tests/acceptance/ReceivePostNotificationCest.php +++ b/tests/acceptance/ReceivePostNotificationCest.php @@ -7,8 +7,8 @@ use MailPoet\Models\ScheduledTask; use MailPoet\Models\SendingQueue; use MailPoet\Test\DataFactories\Newsletter; use MailPoet\Test\DataFactories\Segment; -use MailPoet\Test\DataFactories\Subscriber; use MailPoet\Test\DataFactories\Settings; +use MailPoet\Test\DataFactories\Subscriber; class ReceivePostNotificationCest { diff --git a/tests/integration/API/JSON/APITest.php b/tests/integration/API/JSON/APITest.php index 76bd397abf..901e60fc40 100644 --- a/tests/integration/API/JSON/APITest.php +++ b/tests/integration/API/JSON/APITest.php @@ -13,10 +13,10 @@ use MailPoet\API\JSON\v1\APITestNamespacedEndpointStubV1; use MailPoet\API\JSON\v2\APITestNamespacedEndpointStubV2; use MailPoet\Config\AccessControl; use MailPoet\DI\ContainerConfigurator; -use MailPoet\Settings\SettingsController; -use MailPoetVendor\Symfony\Component\DependencyInjection\Container; use MailPoet\DI\ContainerFactory; +use MailPoet\Settings\SettingsController; use MailPoet\WP\Functions as WPFunctions; +use MailPoetVendor\Symfony\Component\DependencyInjection\Container; // required to be able to use wp_delete_user() require_once(ABSPATH . 'wp-admin/includes/user.php'); diff --git a/tests/integration/API/JSON/v1/CustomFieldsTest.php b/tests/integration/API/JSON/v1/CustomFieldsTest.php index 0a5e08665f..cdc4adc2ff 100644 --- a/tests/integration/API/JSON/v1/CustomFieldsTest.php +++ b/tests/integration/API/JSON/v1/CustomFieldsTest.php @@ -2,8 +2,8 @@ namespace MailPoet\Test\API\JSON\v1; -use MailPoet\API\JSON\v1\CustomFields; use MailPoet\API\JSON\Response as APIResponse; +use MailPoet\API\JSON\v1\CustomFields; use MailPoet\Models\CustomField; class CustomFieldsTest extends \MailPoetTest { diff --git a/tests/integration/API/JSON/v1/FormsTest.php b/tests/integration/API/JSON/v1/FormsTest.php index 45fa5c2f7b..5cc2186432 100644 --- a/tests/integration/API/JSON/v1/FormsTest.php +++ b/tests/integration/API/JSON/v1/FormsTest.php @@ -2,8 +2,8 @@ namespace MailPoet\Test\API\JSON\v1; -use MailPoet\API\JSON\v1\Forms; use MailPoet\API\JSON\Response as APIResponse; +use MailPoet\API\JSON\v1\Forms; use MailPoet\DI\ContainerWrapper; use MailPoet\Models\Form; use MailPoet\Models\Segment; diff --git a/tests/integration/API/JSON/v1/MailerTest.php b/tests/integration/API/JSON/v1/MailerTest.php index ab5c330edf..cc81499f17 100644 --- a/tests/integration/API/JSON/v1/MailerTest.php +++ b/tests/integration/API/JSON/v1/MailerTest.php @@ -3,8 +3,8 @@ namespace MailPoet\Test\API\JSON\v1; use Codeception\Stub\Expected; -use MailPoet\API\JSON\v1\Mailer; use MailPoet\API\JSON\Response as APIResponse; +use MailPoet\API\JSON\v1\Mailer; use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MetaInfo; use MailPoet\Services\AuthorizedEmailsController; diff --git a/tests/integration/API/JSON/v1/SegmentsTest.php b/tests/integration/API/JSON/v1/SegmentsTest.php index b83abb743f..876f9437d7 100644 --- a/tests/integration/API/JSON/v1/SegmentsTest.php +++ b/tests/integration/API/JSON/v1/SegmentsTest.php @@ -2,8 +2,8 @@ namespace MailPoet\Test\API\JSON\v1; -use MailPoet\API\JSON\v1\Segments; use MailPoet\API\JSON\Response as APIResponse; +use MailPoet\API\JSON\v1\Segments; use MailPoet\DI\ContainerWrapper; use MailPoet\Models\Segment; use MailPoet\Models\Subscriber; diff --git a/tests/integration/API/JSON/v1/SendingTaskSubscribersTest.php b/tests/integration/API/JSON/v1/SendingTaskSubscribersTest.php index 1fb99d29e5..2dc04ce04f 100644 --- a/tests/integration/API/JSON/v1/SendingTaskSubscribersTest.php +++ b/tests/integration/API/JSON/v1/SendingTaskSubscribersTest.php @@ -3,14 +3,14 @@ namespace MailPoet\Test\API\JSON\v1; use Codeception\Util\Fixtures; -use MailPoet\Models\Newsletter; -use MailPoet\Models\Subscriber; -use MailPoet\DI\ContainerWrapper; -use MailPoet\Models\SendingQueue; -use MailPoet\Models\ScheduledTask; -use MailPoet\Models\ScheduledTaskSubscriber; use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\v1\SendingTaskSubscribers; +use MailPoet\DI\ContainerWrapper; +use MailPoet\Models\Newsletter; +use MailPoet\Models\ScheduledTask; +use MailPoet\Models\ScheduledTaskSubscriber; +use MailPoet\Models\SendingQueue; +use MailPoet\Models\Subscriber; class SendingTaskSubscribersTest extends \MailPoetTest { diff --git a/tests/integration/API/JSON/v1/ServicesTest.php b/tests/integration/API/JSON/v1/ServicesTest.php index 6a7521a764..6f72fa8b81 100644 --- a/tests/integration/API/JSON/v1/ServicesTest.php +++ b/tests/integration/API/JSON/v1/ServicesTest.php @@ -4,8 +4,8 @@ namespace MailPoet\Test\API\JSON\v1; use Codeception\Stub; use Codeception\Stub\Expected; -use MailPoet\API\JSON\v1\Services; use MailPoet\API\JSON\Response as APIResponse; +use MailPoet\API\JSON\v1\Services; use MailPoet\Config\Installer; use MailPoet\Services\Bridge; use MailPoet\Services\SPFCheck; diff --git a/tests/integration/API/JSON/v1/SettingsTest.php b/tests/integration/API/JSON/v1/SettingsTest.php index 2a1c70410d..aa525d3445 100644 --- a/tests/integration/API/JSON/v1/SettingsTest.php +++ b/tests/integration/API/JSON/v1/SettingsTest.php @@ -4,8 +4,8 @@ namespace MailPoet\Test\API\JSON\v1; use Carbon\Carbon; use Codeception\Stub\Expected; -use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\Error as APIError; +use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\v1\Settings; use MailPoet\Cron\Workers\InactiveSubscribers; use MailPoet\Models\ScheduledTask; diff --git a/tests/integration/API/JSON/v1/SetupTest.php b/tests/integration/API/JSON/v1/SetupTest.php index 57928c397d..4e02b8233f 100644 --- a/tests/integration/API/JSON/v1/SetupTest.php +++ b/tests/integration/API/JSON/v1/SetupTest.php @@ -3,18 +3,18 @@ namespace MailPoet\Test\API\JSON\v1; use Codeception\Stub; +use Helper\WordPressHooks as WPHooksHelper; +use MailPoet\API\JSON\Response as APIResponse; +use MailPoet\API\JSON\v1\Setup; use MailPoet\Config\Activator; use MailPoet\Config\Populator; use MailPoet\Features\FeaturesController; use MailPoet\Models\Setting; -use MailPoet\API\JSON\v1\Setup; use MailPoet\Referrals\ReferralDetector; -use MailPoet\WP\Functions as WPFunctions; -use Helper\WordPressHooks as WPHooksHelper; -use MailPoet\API\JSON\Response as APIResponse; use MailPoet\Settings\SettingsController; use MailPoet\Subscription\Captcha; use MailPoet\WooCommerce\TransactionalEmails; +use MailPoet\WP\Functions as WPFunctions; class SetupTest extends \MailPoetTest { function _before() { diff --git a/tests/integration/API/JSON/v1/SubscribersTest.php b/tests/integration/API/JSON/v1/SubscribersTest.php index 2a674430dc..4968639e14 100644 --- a/tests/integration/API/JSON/v1/SubscribersTest.php +++ b/tests/integration/API/JSON/v1/SubscribersTest.php @@ -4,8 +4,8 @@ namespace MailPoet\Test\API\JSON\v1; use Carbon\Carbon; use Codeception\Util\Fixtures; -use MailPoet\API\JSON\v1\Subscribers; use MailPoet\API\JSON\Response as APIResponse; +use MailPoet\API\JSON\v1\Subscribers; use MailPoet\DI\ContainerWrapper; use MailPoet\Form\Util\FieldNameObfuscator; use MailPoet\Listing\BulkActionController; @@ -15,11 +15,11 @@ use MailPoet\Models\Form; use MailPoet\Models\Newsletter; use MailPoet\Models\NewsletterOption; use MailPoet\Models\NewsletterOptionField; +use MailPoet\Models\Segment; use MailPoet\Models\SendingQueue; +use MailPoet\Models\Setting; use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberIP; -use MailPoet\Models\Segment; -use MailPoet\Models\Setting; use MailPoet\Models\SubscriberSegment; use MailPoet\Segments\SubscribersListings; use MailPoet\Settings\SettingsController; diff --git a/tests/integration/API/JSON/v1/UserFlagsTest.php b/tests/integration/API/JSON/v1/UserFlagsTest.php index 73c65fe2cb..5a7eab45c9 100644 --- a/tests/integration/API/JSON/v1/UserFlagsTest.php +++ b/tests/integration/API/JSON/v1/UserFlagsTest.php @@ -3,12 +3,12 @@ namespace MailPoet\Test\API\JSON\v1; use Codeception\Stub; -use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\Error as APIError; +use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\v1\UserFlags; use MailPoet\Entities\UserFlagEntity; -use MailPoet\Settings\UserFlagsRepository; use MailPoet\Settings\UserFlagsController; +use MailPoet\Settings\UserFlagsRepository; class UserFlagsTest extends \MailPoetTest { diff --git a/tests/integration/API/MP/APITest.php b/tests/integration/API/MP/APITest.php index df33ef89cb..92a9e911c8 100644 --- a/tests/integration/API/MP/APITest.php +++ b/tests/integration/API/MP/APITest.php @@ -2,9 +2,9 @@ namespace MailPoet\Test\API\MP; -use Codeception\Util\Fixtures; use Codeception\Stub; use Codeception\Stub\Expected; +use Codeception\Util\Fixtures; use MailPoet\CustomFields\ApiDataSanitizer; use MailPoet\Models\CustomField; use MailPoet\Models\ScheduledTask; diff --git a/tests/integration/Config/MP2MigratorTest.php b/tests/integration/Config/MP2MigratorTest.php index 697a748e2e..ecb59693f6 100644 --- a/tests/integration/Config/MP2MigratorTest.php +++ b/tests/integration/Config/MP2MigratorTest.php @@ -2,16 +2,16 @@ namespace MailPoet\Test\Config; +use Helper\Database; use MailPoet\Config\Activator; use MailPoet\Config\MP2Migrator; use MailPoet\DI\ContainerWrapper; use MailPoet\Models\CustomField; +use MailPoet\Models\Form; use MailPoet\Models\MappingToExternalEntities; use MailPoet\Models\Segment; use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberCustomField; -use MailPoet\Models\Form; -use Helper\Database; use MailPoet\Settings\SettingsController; class MP2MigratorTest extends \MailPoetTest { diff --git a/tests/integration/Cron/CronHelperTest.php b/tests/integration/Cron/CronHelperTest.php index accf626ced..ee43f9f86f 100644 --- a/tests/integration/Cron/CronHelperTest.php +++ b/tests/integration/Cron/CronHelperTest.php @@ -2,8 +2,8 @@ namespace MailPoet\Test\Cron; -use Codeception\Stub; use AspectMock\Test as Mock; +use Codeception\Stub; use MailPoet\Cron\CronHelper; use MailPoet\Cron\DaemonHttpRunner; use MailPoet\Models\Setting; diff --git a/tests/integration/Cron/Triggers/WordPressTest.php b/tests/integration/Cron/Triggers/WordPressTest.php index a0517acd39..1b64705640 100644 --- a/tests/integration/Cron/Triggers/WordPressTest.php +++ b/tests/integration/Cron/Triggers/WordPressTest.php @@ -6,6 +6,9 @@ use Carbon\Carbon; use MailPoet\API\JSON\Endpoints\Cron; use MailPoet\Cron\CronHelper; use MailPoet\Cron\Workers\AuthorizedSendingEmailsCheck; +use MailPoet\Cron\Workers\Beamer; +use MailPoet\Cron\Workers\Bounce as BounceWorker; +use MailPoet\Cron\Workers\SendingQueue\Migration as MigrationWorker; use MailPoet\Mailer\Mailer; use MailPoet\Mailer\MailerLog; use MailPoet\Models\ScheduledTask; @@ -13,9 +16,6 @@ use MailPoet\Models\SendingQueue; use MailPoet\Models\Setting; use MailPoet\Settings\SettingsController; use MailPoet\Tasks\Sending as SendingTask; -use MailPoet\Cron\Workers\SendingQueue\Migration as MigrationWorker; -use MailPoet\Cron\Workers\Bounce as BounceWorker; -use MailPoet\Cron\Workers\Beamer; use MailPoet\WP\Functions as WPFunctions; class WordPressTest extends \MailPoetTest { diff --git a/tests/integration/Cron/Workers/BounceTest.php b/tests/integration/Cron/Workers/BounceTest.php index 6789645ae7..37dc87bd27 100644 --- a/tests/integration/Cron/Workers/BounceTest.php +++ b/tests/integration/Cron/Workers/BounceTest.php @@ -4,16 +4,16 @@ namespace MailPoet\Test\Cron\Workers; use Carbon\Carbon; use MailPoet\Cron\Workers\Bounce; +use MailPoet\Cron\Workers\Bounce\BounceTestMockAPI as MockAPI; use MailPoet\Mailer\Mailer; use MailPoet\Models\ScheduledTask; use MailPoet\Models\ScheduledTaskSubscriber; use MailPoet\Models\Setting; use MailPoet\Models\Subscriber; use MailPoet\Services\Bridge\API; +use MailPoet\Settings\SettingsController; require_once('BounceTestMockAPI.php'); -use MailPoet\Cron\Workers\Bounce\BounceTestMockAPI as MockAPI; -use MailPoet\Settings\SettingsController; class BounceTest extends \MailPoetTest { function _before() { diff --git a/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php b/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php index 0e6554ced5..8a6e6ac493 100644 --- a/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php @@ -5,12 +5,12 @@ namespace MailPoet\Test\Cron\Workers\KeyCheck; use Carbon\Carbon; use Codeception\Stub; use Codeception\Stub\Expected; +use MailPoet\Cron\Workers\KeyCheck\KeyCheckWorkerMockImplementation as MockKeyCheckWorker; use MailPoet\Models\ScheduledTask; use MailPoet\Models\Setting; use MailPoet\Services\Bridge; require_once('KeyCheckWorkerMockImplementation.php'); -use MailPoet\Cron\Workers\KeyCheck\KeyCheckWorkerMockImplementation as MockKeyCheckWorker; class KeyCheckWorkerTest extends \MailPoetTest { function _before() { diff --git a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php index c88adb435c..67dfac5a62 100644 --- a/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php @@ -3,9 +3,9 @@ namespace MailPoet\Test\Cron\Workers\SendingQueue; use Carbon\Carbon; -use Codeception\Util\Fixtures; use Codeception\Stub; use Codeception\Stub\Expected; +use Codeception\Util\Fixtures; use MailPoet\Config\Populator; use MailPoet\Cron\Workers\SendingQueue\SendingErrorHandler; use MailPoet\Cron\Workers\SendingQueue\SendingQueue as SendingQueueWorker; diff --git a/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php b/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php index 58f40d96e8..af2ccb2196 100644 --- a/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php +++ b/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php @@ -2,8 +2,8 @@ namespace MailPoet\Test\Cron\Workers\SendingQueue\Tasks; -use Codeception\Stub; use AspectMock\Test as Mock; +use Codeception\Stub; use Codeception\Util\Fixtures; use Helper\WordPressHooks as WPHooksHelper; use MailPoet\Cron\Workers\SendingQueue\Tasks\Newsletter as NewsletterTask; diff --git a/tests/integration/Cron/Workers/SimpleWorkerTest.php b/tests/integration/Cron/Workers/SimpleWorkerTest.php index 72eeac9851..bc4eecd0f1 100644 --- a/tests/integration/Cron/Workers/SimpleWorkerTest.php +++ b/tests/integration/Cron/Workers/SimpleWorkerTest.php @@ -6,11 +6,11 @@ use Carbon\Carbon; use Codeception\Stub; use Codeception\Stub\Expected; use MailPoet\Cron\CronHelper; +use MailPoet\Cron\Workers\SimpleWorkerMockImplementation as MockSimpleWorker; use MailPoet\Models\ScheduledTask; use MailPoet\Models\Setting; require_once('SimpleWorkerMockImplementation.php'); -use MailPoet\Cron\Workers\SimpleWorkerMockImplementation as MockSimpleWorker; class SimpleWorkerTest extends \MailPoetTest { function _before() { diff --git a/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php b/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php index a0d1ff1f29..a448c4bdb8 100644 --- a/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php +++ b/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php @@ -8,8 +8,8 @@ use MailPoet\Mailer\MetaInfo; use MailPoet\Models\Newsletter; use MailPoet\Models\ScheduledTask; use MailPoet\Settings\SettingsController; -use PHPUnit\Framework\MockObject\MockObject; use MailPoet\WooCommerce\Helper as WCHelper; +use PHPUnit\Framework\MockObject\MockObject; class AutomatedEmailsTest extends \MailPoetTest { diff --git a/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php b/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php index 92a850e546..644cbfe118 100644 --- a/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php +++ b/tests/integration/Cron/Workers/StatsNotifications/WorkerTest.php @@ -14,8 +14,8 @@ use MailPoet\Models\StatisticsOpens; use MailPoet\Models\StatisticsUnsubscribes; use MailPoet\Models\StatsNotification; use MailPoet\Settings\SettingsController; -use PHPUnit\Framework\MockObject\MockObject; use MailPoet\WooCommerce\Helper as WCHelper; +use PHPUnit\Framework\MockObject\MockObject; class WorkerTest extends \MailPoetTest { diff --git a/tests/integration/Cron/Workers/UnsubscribeTokensTest.php b/tests/integration/Cron/Workers/UnsubscribeTokensTest.php index f7fdffe87e..9fa251228c 100644 --- a/tests/integration/Cron/Workers/UnsubscribeTokensTest.php +++ b/tests/integration/Cron/Workers/UnsubscribeTokensTest.php @@ -3,11 +3,11 @@ namespace MailPoet\Test\Cron\Workers; use Carbon\Carbon; -use MailPoet\Models\ScheduledTask; -use MailPoet\Cron\Workers\UnsubscribeTokens; -use MailPoet\Models\Subscriber; -use MailPoet\Models\Newsletter; use Codeception\Util\Fixtures; +use MailPoet\Cron\Workers\UnsubscribeTokens; +use MailPoet\Models\Newsletter; +use MailPoet\Models\ScheduledTask; +use MailPoet\Models\Subscriber; class UnsubscribeTokensTest extends \MailPoetTest { diff --git a/tests/integration/Helpscout/BeaconTest.php b/tests/integration/Helpscout/BeaconTest.php index 5c9bbb0f18..b141b2b2c2 100644 --- a/tests/integration/Helpscout/BeaconTest.php +++ b/tests/integration/Helpscout/BeaconTest.php @@ -5,8 +5,8 @@ namespace MailPoet\Test\Helpscout; use MailPoet\Helpscout\Beacon; use MailPoet\Models\Subscriber; use MailPoet\Services\Bridge; -use MailPoet\WP\Functions as WPFunctions; use MailPoet\Settings\SettingsController; +use MailPoet\WP\Functions as WPFunctions; class BeaconTest extends \MailPoetTest { function _before() { diff --git a/tests/integration/Mailer/Methods/AmazonSESTest.php b/tests/integration/Mailer/Methods/AmazonSESTest.php index 2326d39c73..a194fc78ea 100644 --- a/tests/integration/Mailer/Methods/AmazonSESTest.php +++ b/tests/integration/Mailer/Methods/AmazonSESTest.php @@ -5,8 +5,8 @@ namespace MailPoet\Test\Mailer\Methods; use Codeception\Stub; use MailPoet\Mailer\MailerError; use MailPoet\Mailer\Methods\AmazonSES; -use MailPoet\Mailer\Methods\ErrorMappers\AmazonSESMapper; use MailPoet\Mailer\Methods\Common\BlacklistCheck; +use MailPoet\Mailer\Methods\ErrorMappers\AmazonSESMapper; class AmazonSESTest extends \MailPoetTest { function _before() { diff --git a/tests/integration/Mailer/Methods/MailPoetAPITest.php b/tests/integration/Mailer/Methods/MailPoetAPITest.php index 1c7c6f5eed..f2d710776a 100644 --- a/tests/integration/Mailer/Methods/MailPoetAPITest.php +++ b/tests/integration/Mailer/Methods/MailPoetAPITest.php @@ -6,11 +6,11 @@ use Codeception\Stub\Expected; use Codeception\Util\Stub; use MailPoet\Config\ServicesChecker; use MailPoet\Mailer\MailerError; +use MailPoet\Mailer\Methods\Common\BlacklistCheck; use MailPoet\Mailer\Methods\ErrorMappers\MailPoetMapper; use MailPoet\Mailer\Methods\MailPoet; use MailPoet\Services\AuthorizedEmailsController; use MailPoet\Services\Bridge\API; -use MailPoet\Mailer\Methods\Common\BlacklistCheck; class MailPoetAPITest extends \MailPoetTest { function _before() { diff --git a/tests/integration/Mailer/Methods/PHPMailTest.php b/tests/integration/Mailer/Methods/PHPMailTest.php index 7a9674a7a7..171bd00d4d 100644 --- a/tests/integration/Mailer/Methods/PHPMailTest.php +++ b/tests/integration/Mailer/Methods/PHPMailTest.php @@ -4,9 +4,9 @@ namespace MailPoet\Test\Mailer\Methods; use Codeception\Stub; use MailPoet\Mailer\MailerError; +use MailPoet\Mailer\Methods\Common\BlacklistCheck; use MailPoet\Mailer\Methods\ErrorMappers\PHPMailMapper; use MailPoet\Mailer\Methods\PHPMail; -use MailPoet\Mailer\Methods\Common\BlacklistCheck; class PHPMailTest extends \MailPoetTest { function _before() { diff --git a/tests/integration/Mailer/Methods/SMTPTest.php b/tests/integration/Mailer/Methods/SMTPTest.php index cc02156514..90c766e085 100644 --- a/tests/integration/Mailer/Methods/SMTPTest.php +++ b/tests/integration/Mailer/Methods/SMTPTest.php @@ -4,9 +4,9 @@ namespace MailPoet\Test\Mailer\Methods; use Codeception\Stub; use MailPoet\Mailer\MailerError; +use MailPoet\Mailer\Methods\Common\BlacklistCheck; use MailPoet\Mailer\Methods\ErrorMappers\SMTPMapper; use MailPoet\Mailer\Methods\SMTP; -use MailPoet\Mailer\Methods\Common\BlacklistCheck; use MailPoet\WP\Functions as WPFunctions; class SMTPTest extends \MailPoetTest { diff --git a/tests/integration/Mailer/Methods/SendGridTest.php b/tests/integration/Mailer/Methods/SendGridTest.php index 6775fc0b47..6a1595e19e 100644 --- a/tests/integration/Mailer/Methods/SendGridTest.php +++ b/tests/integration/Mailer/Methods/SendGridTest.php @@ -4,9 +4,9 @@ namespace MailPoet\Test\Mailer\Methods; use Codeception\Stub; use MailPoet\Mailer\MailerError; +use MailPoet\Mailer\Methods\Common\BlacklistCheck; use MailPoet\Mailer\Methods\ErrorMappers\SendGridMapper; use MailPoet\Mailer\Methods\SendGrid; -use MailPoet\Mailer\Methods\Common\BlacklistCheck; class SendGridTest extends \MailPoetTest { function _before() { diff --git a/tests/integration/Models/NewsletterTest.php b/tests/integration/Models/NewsletterTest.php index f2ef110491..639e99eeaf 100644 --- a/tests/integration/Models/NewsletterTest.php +++ b/tests/integration/Models/NewsletterTest.php @@ -4,18 +4,18 @@ namespace MailPoet\Test\Models; use Carbon\Carbon; use MailPoet\Models\Newsletter; -use MailPoet\Models\Segment; -use MailPoet\Models\Subscriber; -use MailPoet\Models\ScheduledTask; -use MailPoet\Models\SendingQueue; -use MailPoet\Models\NewsletterSegment; -use MailPoet\Models\NewsletterOptionField; use MailPoet\Models\NewsletterOption; -use MailPoet\Models\StatisticsOpens; +use MailPoet\Models\NewsletterOptionField; +use MailPoet\Models\NewsletterSegment; +use MailPoet\Models\ScheduledTask; +use MailPoet\Models\Segment; +use MailPoet\Models\SendingQueue; use MailPoet\Models\StatisticsClicks; +use MailPoet\Models\StatisticsOpens; use MailPoet\Models\StatisticsUnsubscribes; -use MailPoet\Util\Security; +use MailPoet\Models\Subscriber; use MailPoet\Tasks\Sending as SendingTask; +use MailPoet\Util\Security; use MailPoet\WooCommerce\Helper as WCHelper; class NewsletterTest extends \MailPoetTest { diff --git a/tests/integration/Models/ScheduledTaskTest.php b/tests/integration/Models/ScheduledTaskTest.php index 128626ce59..0c1a1b927c 100644 --- a/tests/integration/Models/ScheduledTaskTest.php +++ b/tests/integration/Models/ScheduledTaskTest.php @@ -5,8 +5,8 @@ namespace MailPoet\Test\Models; use Carbon\Carbon; use MailPoet\Models\Newsletter; use MailPoet\Models\ScheduledTask; -use MailPoet\Models\SendingQueue; use MailPoet\Models\ScheduledTaskSubscriber; +use MailPoet\Models\SendingQueue; use MailPoet\Util\Helpers; class ScheduledTaskTest extends \MailPoetTest { diff --git a/tests/integration/Models/SubscriberSegmentTest.php b/tests/integration/Models/SubscriberSegmentTest.php index 3b2b74c682..cb6e7d6a9a 100644 --- a/tests/integration/Models/SubscriberSegmentTest.php +++ b/tests/integration/Models/SubscriberSegmentTest.php @@ -2,8 +2,8 @@ namespace MailPoet\Test\Models; -use MailPoet\Models\Subscriber; use MailPoet\Models\Segment; +use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberSegment; class SubscriberSegmentTest extends \MailPoetTest { diff --git a/tests/integration/Router/RouterTest.php b/tests/integration/Router/RouterTest.php index c973241923..34ace142d2 100644 --- a/tests/integration/Router/RouterTest.php +++ b/tests/integration/Router/RouterTest.php @@ -6,11 +6,11 @@ use Codeception\Stub; use Codeception\Stub\Expected; use MailPoet\Config\AccessControl; use MailPoet\DI\ContainerConfigurator; -use MailPoet\WP\Functions as WPFunctions; -use MailPoetVendor\Symfony\Component\DependencyInjection\Container; use MailPoet\DI\ContainerFactory; use MailPoet\Router\Endpoints\RouterTestMockEndpoint; use MailPoet\Router\Router; +use MailPoet\WP\Functions as WPFunctions; +use MailPoetVendor\Symfony\Component\DependencyInjection\Container; require_once('RouterTestMockEndpoint.php'); diff --git a/tests/integration/Settings/UserFlagsControllerTest.php b/tests/integration/Settings/UserFlagsControllerTest.php index a57d9fb7de..ca2bab987b 100644 --- a/tests/integration/Settings/UserFlagsControllerTest.php +++ b/tests/integration/Settings/UserFlagsControllerTest.php @@ -4,8 +4,8 @@ namespace MailPoet\Test\Settings; use Codeception\Stub; use MailPoet\Entities\UserFlagEntity; -use MailPoet\Settings\UserFlagsRepository; use MailPoet\Settings\UserFlagsController; +use MailPoet\Settings\UserFlagsRepository; use MailPoet\WP\Functions as WPFunctions; class UserFlagsControllerTest extends \MailPoetTest { diff --git a/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php b/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php index 9824b5e77b..369be3e90a 100644 --- a/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php +++ b/tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php @@ -2,12 +2,12 @@ namespace MailPoet\Test\Subscribers\ImportExport\Export; -use MailPoet\WP\Functions as WPFunctions; use MailPoet\Models\CustomField; use MailPoet\Models\Segment; use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberCustomField; use MailPoet\Subscribers\ImportExport\Export\DynamicSubscribersGetter; +use MailPoet\WP\Functions as WPFunctions; class DynamicSubscribersGetterTest extends \MailPoetTest { function _before() { diff --git a/tests/integration/Subscribers/ImportExport/Export/ExportTest.php b/tests/integration/Subscribers/ImportExport/Export/ExportTest.php index e010ecbad2..3d7fcef1d0 100644 --- a/tests/integration/Subscribers/ImportExport/Export/ExportTest.php +++ b/tests/integration/Subscribers/ImportExport/Export/ExportTest.php @@ -8,8 +8,8 @@ use MailPoet\Models\Segment; use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberCustomField; use MailPoet\Models\SubscriberSegment; -use MailPoet\Subscribers\ImportExport\Export\Export; use MailPoet\Subscribers\ImportExport\Export\DefaultSubscribersGetter; +use MailPoet\Subscribers\ImportExport\Export\Export; class ExportTest extends \MailPoetTest { function _before() { diff --git a/tests/integration/Subscription/UrlTest.php b/tests/integration/Subscription/UrlTest.php index 1c31d99e31..ada26d634d 100644 --- a/tests/integration/Subscription/UrlTest.php +++ b/tests/integration/Subscription/UrlTest.php @@ -3,16 +3,16 @@ namespace MailPoet\Test\Subscription; use Codeception\Util\Stub; +use MailPoet\Config\Populator; use MailPoet\Features\FeaturesController; +use MailPoet\Models\Setting; +use MailPoet\Models\Subscriber; use MailPoet\Referrals\ReferralDetector; use MailPoet\Router\Router; -use MailPoet\Subscribers\LinkTokens; -use MailPoet\Subscription\SubscriptionUrlFactory; -use MailPoet\Models\Subscriber; -use MailPoet\Models\Setting; -use MailPoet\Config\Populator; use MailPoet\Settings\SettingsController; +use MailPoet\Subscribers\LinkTokens; use MailPoet\Subscription\Captcha; +use MailPoet\Subscription\SubscriptionUrlFactory; use MailPoet\WooCommerce\TransactionalEmails; use MailPoet\WP\Functions as WPFunctions; diff --git a/tests/unit/DI/ContainerWrapperTest.php b/tests/unit/DI/ContainerWrapperTest.php index 9aa2d3ae8e..f18ae2fa95 100644 --- a/tests/unit/DI/ContainerWrapperTest.php +++ b/tests/unit/DI/ContainerWrapperTest.php @@ -4,9 +4,9 @@ namespace MailPoet\Test\DI; use Codeception\Stub; use MailPoet\DI\ContainerWrapper; +use MailPoetVendor\Psr\Container\ContainerInterface; use MailPoetVendor\Symfony\Component\DependencyInjection\Container; use MailPoetVendor\Symfony\Component\DependencyInjection\ContainerBuilder; -use MailPoetVendor\Psr\Container\ContainerInterface; use MailPoetVendor\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException; class ContainerWrapperTest extends \MailPoetUnitTest { diff --git a/tests/unit/Util/DOMTest.php b/tests/unit/Util/DOMTest.php index 9cf504a88d..72b932a5fe 100644 --- a/tests/unit/Util/DOMTest.php +++ b/tests/unit/Util/DOMTest.php @@ -2,8 +2,8 @@ namespace MailPoet\Test\Util; -use pQuery; use MailPoet\Util\DOM as DOMUtil; +use pQuery; class DOMTest extends \MailPoetUnitTest { diff --git a/tests/unit/WP/PostsTest.php b/tests/unit/WP/PostsTest.php index ae40eefd58..530a1a7bcf 100644 --- a/tests/unit/WP/PostsTest.php +++ b/tests/unit/WP/PostsTest.php @@ -2,9 +2,9 @@ namespace MailPoet\Test\WP; -use MailPoet\WP\Posts; use Codeception\Util\Stub; use MailPoet\WP\Functions as WPFunctions; +use MailPoet\WP\Posts; class PostsTest extends \MailPoetUnitTest {