From 3bda992f139d96d034a2e4557d0acdc942d70903 Mon Sep 17 00:00:00 2001 From: Mustapha Hadid Date: Tue, 12 Nov 2024 19:01:04 +0300 Subject: [PATCH] Move CAPTCHA classes under MailPoet\Captcha dir CAPTCHA usage is no longer tied to MP's subscription form. --- mailpoet/lib/API/JSON/API.php | 2 +- mailpoet/lib/AdminPages/Pages/Settings.php | 2 +- mailpoet/lib/Analytics/Reporter.php | 2 +- .../{Subscription => }/Captcha/CaptchaConstants.php | 2 +- mailpoet/lib/Captcha/CaptchaFormRenderer.php | 2 -- .../lib/{Subscription => }/Captcha/CaptchaPhrase.php | 2 +- .../{Subscription => }/Captcha/CaptchaRenderer.php | 2 +- .../{Subscription => }/Captcha/CaptchaSession.php | 2 +- .../Captcha/Validator/CaptchaValidator.php | 4 ++-- .../Captcha/Validator/RecaptchaValidator.php | 4 ++-- .../Captcha/Validator/ValidationError.php | 2 +- mailpoet/lib/Config/Populator.php | 4 ++-- mailpoet/lib/DI/ContainerConfigurator.php | 12 ++++++------ mailpoet/lib/Form/AssetsController.php | 2 +- mailpoet/lib/Form/Renderer.php | 2 +- mailpoet/lib/Router/Endpoints/Subscription.php | 4 ++-- .../Subscribers/SubscriberSubscribeController.php | 10 +++++----- .../lib/Util/Notices/HeadersAlreadySentNotice.php | 2 +- .../acceptance/Forms/GutenbergFormBlockCest.php | 2 +- .../Forms/SubscribeToMultipleListsCest.php | 4 ++-- .../tests/acceptance/Forms/SubscriptionFormCest.php | 2 +- .../Settings/BuiltInCaptchaSubscriptionCest.php | 2 +- .../Settings/ConfirmConfirmationPageCest.php | 6 +++--- mailpoet/tests/integration/API/JSON/v1/SetupTest.php | 4 ++-- .../integration/API/JSON/v1/SubscribersTest.php | 4 ++-- .../CaptchaFormRendererTest.php | 4 ++-- .../Captcha/CaptchaRendererTest.php | 6 +++--- .../Captcha/CaptchaSessionTest.php | 4 ++-- .../Validator/BuiltInCaptchaValidatorTest.php | 8 ++++---- .../Router/Endpoints/SubscriptionTest.php | 4 ++-- .../{Subscription => }/Captcha/CaptchaPhraseTest.php | 2 +- .../Validator/BuiltInCaptchaValidatorTest.php | 6 +++--- .../Captcha/Validator/RecaptchaValidatorTest.php | 2 +- mailpoet/tests/unit/Form/RendererTest.php | 2 +- .../SubscriberSubscribeControllerUnitTest.php | 10 +++++----- 35 files changed, 66 insertions(+), 68 deletions(-) rename mailpoet/lib/{Subscription => }/Captcha/CaptchaConstants.php (92%) rename mailpoet/lib/{Subscription => }/Captcha/CaptchaPhrase.php (95%) rename mailpoet/lib/{Subscription => }/Captcha/CaptchaRenderer.php (98%) rename mailpoet/lib/{Subscription => }/Captcha/CaptchaSession.php (97%) rename mailpoet/lib/{Subscription => }/Captcha/Validator/CaptchaValidator.php (97%) rename mailpoet/lib/{Subscription => }/Captcha/Validator/RecaptchaValidator.php (84%) rename mailpoet/lib/{Subscription => }/Captcha/Validator/ValidationError.php (90%) rename mailpoet/tests/integration/{Subscription => Captcha}/CaptchaFormRendererTest.php (96%) rename mailpoet/tests/integration/{Subscription => }/Captcha/CaptchaRendererTest.php (96%) rename mailpoet/tests/integration/{Subscription => }/Captcha/CaptchaSessionTest.php (92%) rename mailpoet/tests/integration/{Subscription => }/Captcha/Validator/BuiltInCaptchaValidatorTest.php (94%) rename mailpoet/tests/unit/{Subscription => }/Captcha/CaptchaPhraseTest.php (97%) rename mailpoet/tests/unit/{Subscription => }/Captcha/Validator/BuiltInCaptchaValidatorTest.php (98%) rename mailpoet/tests/unit/{Subscription => }/Captcha/Validator/RecaptchaValidatorTest.php (96%) diff --git a/mailpoet/lib/API/JSON/API.php b/mailpoet/lib/API/JSON/API.php index aa5484bb6d..ae1e21c223 100644 --- a/mailpoet/lib/API/JSON/API.php +++ b/mailpoet/lib/API/JSON/API.php @@ -2,11 +2,11 @@ namespace MailPoet\API\JSON; +use MailPoet\Captcha\CaptchaConstants; use MailPoet\Config\AccessControl; use MailPoet\Exception; use MailPoet\Logging\LoggerFactory; use MailPoet\Settings\SettingsController; -use MailPoet\Subscription\Captcha\CaptchaConstants; use MailPoet\Tracy\ApiPanel\ApiPanel; use MailPoet\Tracy\DIPanel\DIPanel; use MailPoet\Util\Helpers; diff --git a/mailpoet/lib/AdminPages/Pages/Settings.php b/mailpoet/lib/AdminPages/Pages/Settings.php index da41d08561..98cd66df0a 100644 --- a/mailpoet/lib/AdminPages/Pages/Settings.php +++ b/mailpoet/lib/AdminPages/Pages/Settings.php @@ -4,6 +4,7 @@ namespace MailPoet\AdminPages\Pages; use MailPoet\AdminPages\AssetsController; use MailPoet\AdminPages\PageRenderer; +use MailPoet\Captcha\CaptchaRenderer; use MailPoet\Config\Installer; use MailPoet\Config\ServicesChecker; use MailPoet\Segments\SegmentsSimpleListRepository; @@ -13,7 +14,6 @@ use MailPoet\Services\Bridge; use MailPoet\Settings\Hosts; use MailPoet\Settings\Pages; use MailPoet\Settings\SettingsController; -use MailPoet\Subscription\Captcha\CaptchaRenderer; use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Notice as WPNotice; diff --git a/mailpoet/lib/Analytics/Reporter.php b/mailpoet/lib/Analytics/Reporter.php index eb347808f6..e0cd66f2da 100644 --- a/mailpoet/lib/Analytics/Reporter.php +++ b/mailpoet/lib/Analytics/Reporter.php @@ -5,6 +5,7 @@ namespace MailPoet\Analytics; use MailPoet\Automation\Engine\Data\Automation; use MailPoet\Automation\Engine\Data\Step; use MailPoet\Automation\Engine\Storage\AutomationStorage; +use MailPoet\Captcha\CaptchaConstants; use MailPoet\Config\ServicesChecker; use MailPoet\Cron\CronTrigger; use MailPoet\Entities\DynamicSegmentFilterData; @@ -51,7 +52,6 @@ use MailPoet\Settings\TrackingConfig; use MailPoet\Subscribers\ConfirmationEmailCustomizer; use MailPoet\Subscribers\NewSubscriberNotificationMailer; use MailPoet\Subscribers\SubscriberListingRepository; -use MailPoet\Subscription\Captcha\CaptchaConstants; use MailPoet\Tags\TagRepository; use MailPoet\Util\License\Features\Subscribers as SubscribersFeature; use MailPoet\WooCommerce\Helper as WooCommerceHelper; diff --git a/mailpoet/lib/Subscription/Captcha/CaptchaConstants.php b/mailpoet/lib/Captcha/CaptchaConstants.php similarity index 92% rename from mailpoet/lib/Subscription/Captcha/CaptchaConstants.php rename to mailpoet/lib/Captcha/CaptchaConstants.php index 435063fc88..5f6abb272c 100644 --- a/mailpoet/lib/Subscription/Captcha/CaptchaConstants.php +++ b/mailpoet/lib/Captcha/CaptchaConstants.php @@ -1,6 +1,6 @@ autowire(\MailPoet\Settings\UserFlagsController::class); $container->autowire(\MailPoet\Settings\UserFlagsRepository::class)->setPublic(true); // Subscription - $container->autowire(\MailPoet\Subscription\Captcha\CaptchaConstants::class)->setPublic(true); - $container->autowire(\MailPoet\Subscription\Captcha\CaptchaSession::class)->setPublic(true); - $container->autowire(\MailPoet\Subscription\Captcha\CaptchaRenderer::class)->setPublic(true); - $container->autowire(\MailPoet\Subscription\Captcha\CaptchaPhrase::class); - $container->autowire(\MailPoet\Subscription\Captcha\Validator\CaptchaValidator::class)->setPublic(true); - $container->autowire(\MailPoet\Subscription\Captcha\Validator\RecaptchaValidator::class)->setPublic(true); + $container->autowire(\MailPoet\Captcha\CaptchaConstants::class)->setPublic(true); + $container->autowire(\MailPoet\Captcha\CaptchaSession::class)->setPublic(true); + $container->autowire(\MailPoet\Captcha\CaptchaRenderer::class)->setPublic(true); + $container->autowire(\MailPoet\Captcha\CaptchaPhrase::class); + $container->autowire(\MailPoet\Captcha\Validator\CaptchaValidator::class)->setPublic(true); + $container->autowire(\MailPoet\Captcha\Validator\RecaptchaValidator::class)->setPublic(true); $container->autowire(\MailPoet\Subscription\Comment::class)->setPublic(true); $container->autowire(\MailPoet\Subscription\Form::class)->setPublic(true); $container->autowire(\MailPoet\Subscription\Manage::class)->setPublic(true); diff --git a/mailpoet/lib/Form/AssetsController.php b/mailpoet/lib/Form/AssetsController.php index 60bbe23b6d..780262c1e4 100644 --- a/mailpoet/lib/Form/AssetsController.php +++ b/mailpoet/lib/Form/AssetsController.php @@ -2,10 +2,10 @@ namespace MailPoet\Form; +use MailPoet\Captcha\CaptchaConstants; use MailPoet\Config\Env; use MailPoet\Config\Renderer as BasicRenderer; use MailPoet\Settings\SettingsController; -use MailPoet\Subscription\Captcha\CaptchaConstants; use MailPoet\WP\Functions as WPFunctions; class AssetsController { diff --git a/mailpoet/lib/Form/Renderer.php b/mailpoet/lib/Form/Renderer.php index b6bc1eb5f6..2cea3028ad 100644 --- a/mailpoet/lib/Form/Renderer.php +++ b/mailpoet/lib/Form/Renderer.php @@ -2,12 +2,12 @@ namespace MailPoet\Form; +use MailPoet\Captcha\CaptchaConstants; use MailPoet\Entities\FormEntity; use MailPoet\Form\Templates\FormTemplate; use MailPoet\Form\Util\CustomFonts; use MailPoet\Form\Util\Styles; use MailPoet\Settings\SettingsController; -use MailPoet\Subscription\Captcha\CaptchaConstants; class Renderer { /** @var Styles */ diff --git a/mailpoet/lib/Router/Endpoints/Subscription.php b/mailpoet/lib/Router/Endpoints/Subscription.php index e8bd87c8d0..2277754ced 100644 --- a/mailpoet/lib/Router/Endpoints/Subscription.php +++ b/mailpoet/lib/Router/Endpoints/Subscription.php @@ -42,7 +42,7 @@ class Subscription { /** @var WPFunctions */ private $wp; - /** @var UserSubscription\Captcha\CaptchaRenderer */ + /** @var \MailPoet\Captcha\CaptchaRenderer */ private $captchaRenderer; /*** @var Request */ @@ -51,7 +51,7 @@ class Subscription { public function __construct( UserSubscription\Pages $subscriptionPages, WPFunctions $wp, - UserSubscription\Captcha\CaptchaRenderer $captchaRenderer, + \MailPoet\Captcha\CaptchaRenderer $captchaRenderer, Request $request ) { $this->subscriptionPages = $subscriptionPages; diff --git a/mailpoet/lib/Subscribers/SubscriberSubscribeController.php b/mailpoet/lib/Subscribers/SubscriberSubscribeController.php index df02fb541a..431ce3cf03 100644 --- a/mailpoet/lib/Subscribers/SubscriberSubscribeController.php +++ b/mailpoet/lib/Subscribers/SubscriberSubscribeController.php @@ -2,6 +2,11 @@ namespace MailPoet\Subscribers; +use MailPoet\Captcha\CaptchaConstants; +use MailPoet\Captcha\CaptchaSession; +use MailPoet\Captcha\Validator\CaptchaValidator; +use MailPoet\Captcha\Validator\RecaptchaValidator; +use MailPoet\Captcha\Validator\ValidationError; use MailPoet\Entities\FormEntity; use MailPoet\Entities\SubscriberEntity; use MailPoet\Entities\SubscriberTagEntity; @@ -11,11 +16,6 @@ use MailPoet\NotFoundException; use MailPoet\Segments\SubscribersFinder; use MailPoet\Settings\SettingsController; use MailPoet\Statistics\StatisticsFormsRepository; -use MailPoet\Subscription\Captcha\CaptchaConstants; -use MailPoet\Subscription\Captcha\CaptchaSession; -use MailPoet\Subscription\Captcha\Validator\CaptchaValidator; -use MailPoet\Subscription\Captcha\Validator\RecaptchaValidator; -use MailPoet\Subscription\Captcha\Validator\ValidationError; use MailPoet\Subscription\Throttling as SubscriptionThrottling; use MailPoet\Tags\TagRepository; use MailPoet\UnexpectedValueException; diff --git a/mailpoet/lib/Util/Notices/HeadersAlreadySentNotice.php b/mailpoet/lib/Util/Notices/HeadersAlreadySentNotice.php index b9a5306ae4..ff36c04ae2 100644 --- a/mailpoet/lib/Util/Notices/HeadersAlreadySentNotice.php +++ b/mailpoet/lib/Util/Notices/HeadersAlreadySentNotice.php @@ -2,9 +2,9 @@ namespace MailPoet\Util\Notices; +use MailPoet\Captcha\CaptchaConstants; use MailPoet\Settings\SettingsController; use MailPoet\Settings\TrackingConfig; -use MailPoet\Subscription\Captcha\CaptchaConstants; use MailPoet\Util\Helpers; use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Notice; diff --git a/mailpoet/tests/acceptance/Forms/GutenbergFormBlockCest.php b/mailpoet/tests/acceptance/Forms/GutenbergFormBlockCest.php index 35e26e783a..2951c690c8 100644 --- a/mailpoet/tests/acceptance/Forms/GutenbergFormBlockCest.php +++ b/mailpoet/tests/acceptance/Forms/GutenbergFormBlockCest.php @@ -3,7 +3,7 @@ namespace MailPoet\Test\Acceptance; use Codeception\Util\Locator; -use MailPoet\Subscription\Captcha\CaptchaConstants; +use MailPoet\Captcha\CaptchaConstants; use MailPoet\Test\DataFactories\Form; use MailPoet\Test\DataFactories\Settings; diff --git a/mailpoet/tests/acceptance/Forms/SubscribeToMultipleListsCest.php b/mailpoet/tests/acceptance/Forms/SubscribeToMultipleListsCest.php index 9beded1353..7d28d6a705 100644 --- a/mailpoet/tests/acceptance/Forms/SubscribeToMultipleListsCest.php +++ b/mailpoet/tests/acceptance/Forms/SubscribeToMultipleListsCest.php @@ -3,9 +3,9 @@ namespace MailPoet\Test\Acceptance; use Codeception\Util\Locator; +use MailPoet\Captcha\CaptchaConstants; use MailPoet\DI\ContainerWrapper; use MailPoet\Form\FormMessageController; -use MailPoet\Subscription\Captcha\CaptchaConstants; use MailPoet\Test\DataFactories\Form; use MailPoet\Test\DataFactories\Segment; use MailPoet\Test\DataFactories\Settings; @@ -50,7 +50,7 @@ class SubscribeToMultipleListsCest { ', 'post_status' => 'publish', ]); - + $i->wantTo('Subscribe to the form with multiple lists attached'); $i->amOnPage('/form-test'); $i->waitForElement('[data-automation-id="form_email"]'); diff --git a/mailpoet/tests/acceptance/Forms/SubscriptionFormCest.php b/mailpoet/tests/acceptance/Forms/SubscriptionFormCest.php index 4dee9af748..dc779bbf91 100644 --- a/mailpoet/tests/acceptance/Forms/SubscriptionFormCest.php +++ b/mailpoet/tests/acceptance/Forms/SubscriptionFormCest.php @@ -3,8 +3,8 @@ namespace MailPoet\Test\Acceptance; use Codeception\Util\Locator; +use MailPoet\Captcha\CaptchaConstants; use MailPoet\Entities\CustomFieldEntity; -use MailPoet\Subscription\Captcha\CaptchaConstants; use MailPoet\Test\DataFactories\CustomField; use MailPoet\Test\DataFactories\Form; use MailPoet\Test\DataFactories\Settings; diff --git a/mailpoet/tests/acceptance/Settings/BuiltInCaptchaSubscriptionCest.php b/mailpoet/tests/acceptance/Settings/BuiltInCaptchaSubscriptionCest.php index db20bbe629..3b2a5c35a8 100644 --- a/mailpoet/tests/acceptance/Settings/BuiltInCaptchaSubscriptionCest.php +++ b/mailpoet/tests/acceptance/Settings/BuiltInCaptchaSubscriptionCest.php @@ -2,7 +2,7 @@ namespace MailPoet\Test\Acceptance; -use MailPoet\Subscription\Captcha\CaptchaConstants; +use MailPoet\Captcha\CaptchaConstants; use MailPoet\Test\DataFactories\Form; use MailPoet\Test\DataFactories\Settings; use MailPoet\Test\DataFactories\Subscriber; diff --git a/mailpoet/tests/acceptance/Settings/ConfirmConfirmationPageCest.php b/mailpoet/tests/acceptance/Settings/ConfirmConfirmationPageCest.php index 3ddd0bb6ae..41d6910303 100644 --- a/mailpoet/tests/acceptance/Settings/ConfirmConfirmationPageCest.php +++ b/mailpoet/tests/acceptance/Settings/ConfirmConfirmationPageCest.php @@ -3,15 +3,15 @@ namespace MailPoet\Test\Acceptance; use Codeception\Util\Locator; - use MailPoet\Subscription\Captcha\CaptchaConstants; + use MailPoet\Captcha\CaptchaConstants; use MailPoet\Test\DataFactories\Form; use MailPoet\Test\DataFactories\Settings; -/** + /** * @group frontend */ class ConfirmConfirmationPageCest { - + const CONFIRMATION_MESSAGE_TIMEOUT = 20; const FORM_NAME = 'Subscription Acceptance Test Form'; diff --git a/mailpoet/tests/integration/API/JSON/v1/SetupTest.php b/mailpoet/tests/integration/API/JSON/v1/SetupTest.php index 26a7c5fa53..bcd725abab 100644 --- a/mailpoet/tests/integration/API/JSON/v1/SetupTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/SetupTest.php @@ -6,14 +6,14 @@ use Codeception\Stub; use Helper\WordPressHooks as WPHooksHelper; use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\v1\Setup; +use MailPoet\Captcha\CaptchaConstants; +use MailPoet\Captcha\CaptchaRenderer; use MailPoet\Config\Activator; use MailPoet\Config\Populator; use MailPoet\Cron\ActionScheduler\ActionScheduler; use MailPoet\Migrator\Migrator; use MailPoet\Referrals\ReferralDetector; use MailPoet\Settings\SettingsController; -use MailPoet\Subscription\Captcha\CaptchaConstants; -use MailPoet\Subscription\Captcha\CaptchaRenderer; use MailPoet\WP\Functions as WPFunctions; class SetupTest extends \MailPoetTest { diff --git a/mailpoet/tests/integration/API/JSON/v1/SubscribersTest.php b/mailpoet/tests/integration/API/JSON/v1/SubscribersTest.php index 9656ea5ec4..fb2a995018 100644 --- a/mailpoet/tests/integration/API/JSON/v1/SubscribersTest.php +++ b/mailpoet/tests/integration/API/JSON/v1/SubscribersTest.php @@ -9,6 +9,8 @@ use MailPoet\API\JSON\Response as APIResponse; use MailPoet\API\JSON\ResponseBuilders\SubscribersResponseBuilder; use MailPoet\API\JSON\SuccessResponse; use MailPoet\API\JSON\v1\Subscribers; +use MailPoet\Captcha\CaptchaConstants; +use MailPoet\Captcha\CaptchaSession; use MailPoet\DI\ContainerWrapper; use MailPoet\Entities\CustomFieldEntity; use MailPoet\Entities\FormEntity; @@ -28,8 +30,6 @@ use MailPoet\Subscribers\SubscriberSaveController; use MailPoet\Subscribers\SubscribersRepository; use MailPoet\Subscribers\SubscriberSubscribeController; use MailPoet\Subscribers\SubscriberTagRepository; -use MailPoet\Subscription\Captcha\CaptchaConstants; -use MailPoet\Subscription\Captcha\CaptchaSession; use MailPoet\Tags\TagRepository; use MailPoet\Test\DataFactories\CustomField as CustomFieldFactory; use MailPoet\Test\DataFactories\DynamicSegment; diff --git a/mailpoet/tests/integration/Subscription/CaptchaFormRendererTest.php b/mailpoet/tests/integration/Captcha/CaptchaFormRendererTest.php similarity index 96% rename from mailpoet/tests/integration/Subscription/CaptchaFormRendererTest.php rename to mailpoet/tests/integration/Captcha/CaptchaFormRendererTest.php index f5b3e8cae8..d07cd17bb5 100644 --- a/mailpoet/tests/integration/Subscription/CaptchaFormRendererTest.php +++ b/mailpoet/tests/integration/Captcha/CaptchaFormRendererTest.php @@ -1,11 +1,11 @@