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,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;

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;
 

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;

mailpoet/lib/Captcha/CaptchaConstants.php

@@ -1,6 +1,6 @@
 <?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
-namespace MailPoet\Subscription\Captcha;
+namespace MailPoet\Captcha;
 
 class CaptchaConstants {
   const TYPE_BUILTIN = 'built-in';

mailpoet/lib/Captcha/CaptchaFormRenderer.php

@@ -7,8 +7,6 @@ use MailPoet\Entities\FormEntity;
 use MailPoet\Form\FormsRepository;
 use MailPoet\Form\Renderer as FormRenderer;
 use MailPoet\Form\Util\Styles;
-use MailPoet\Subscription\Captcha\CaptchaPhrase;
-use MailPoet\Subscription\Captcha\CaptchaSession;
 use MailPoet\Subscription\SubscriptionUrlFactory;
 use MailPoet\Util\Url as UrlHelper;
 

mailpoet/lib/Captcha/CaptchaPhrase.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\Subscription\Captcha;
+namespace MailPoet\Captcha;
 
 use MailPoetVendor\Gregwar\Captcha\PhraseBuilder;
 

mailpoet/lib/Captcha/CaptchaRenderer.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\Subscription\Captcha;
+namespace MailPoet\Captcha;
 
 use MailPoet\Config\Env;
 use MailPoet\Util\Headers;

mailpoet/lib/Captcha/CaptchaSession.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\Subscription\Captcha;
+namespace MailPoet\Captcha;
 
 use MailPoet\Util\Security;
 use MailPoet\WP\Functions as WPFunctions;

mailpoet/lib/Captcha/Validator/CaptchaValidator.php

@@ -1,10 +1,10 @@
 <?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
-namespace MailPoet\Subscription\Captcha\Validator;
+namespace MailPoet\Captcha\Validator;
 
+use MailPoet\Captcha\CaptchaPhrase;
 use MailPoet\Subscribers\SubscriberIPsRepository;
 use MailPoet\Subscribers\SubscribersRepository;
-use MailPoet\Subscription\Captcha\CaptchaPhrase;
 use MailPoet\Subscription\SubscriptionUrlFactory;
 use MailPoet\Util\Helpers;
 use MailPoet\WP\Functions as WPFunctions;

mailpoet/lib/Captcha/Validator/RecaptchaValidator.php

@@ -1,10 +1,10 @@
 <?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
-namespace MailPoet\Subscription\Captcha\Validator;
+namespace MailPoet\Captcha\Validator;
 
 use MailPoet\Captcha\ReCaptchaValidator as Validator;
 
-class RecaptchaValidator implements CaptchaValidator {
+class RecaptchaValidator {
 
   /** @var Validator */
   private $validator;

mailpoet/lib/Captcha/Validator/ValidationError.php

@@ -1,6 +1,6 @@
 <?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
-namespace MailPoet\Subscription\Captcha\Validator;
+namespace MailPoet\Captcha\Validator;
 
 class ValidationError extends \RuntimeException {
 

mailpoet/lib/Config/Populator.php

@@ -2,6 +2,8 @@
 
 namespace MailPoet\Config;
 
+use MailPoet\Captcha\CaptchaConstants;
+use MailPoet\Captcha\CaptchaRenderer;
 use MailPoet\Cron\CronTrigger;
 use MailPoet\Cron\Workers\AuthorizedSendingEmailsCheck;
 use MailPoet\Cron\Workers\BackfillEngagementData;
@@ -32,8 +34,6 @@ use MailPoet\Settings\SettingsController;
 use MailPoet\Settings\UserFlagsRepository;
 use MailPoet\Subscribers\NewSubscriberNotificationMailer;
 use MailPoet\Subscribers\Source;
-use MailPoet\Subscription\Captcha\CaptchaConstants;
-use MailPoet\Subscription\Captcha\CaptchaRenderer;
 use MailPoet\WP\Functions as WPFunctions;
 use MailPoetVendor\Carbon\Carbon;
 use MailPoetVendor\Doctrine\ORM\EntityManager;

mailpoet/lib/DI/ContainerConfigurator.php

@@ -546,12 +546,12 @@ class ContainerConfigurator implements IContainerConfigurator {
     $container->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);

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 {

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 */

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;

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;

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;

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;
 

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;

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;

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;

mailpoet/tests/acceptance/Settings/ConfirmConfirmationPageCest.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;
 

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 {

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;

mailpoet/tests/integration/Captcha/CaptchaFormRendererTest.php

@@ -1,11 +1,11 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\Test\Subscription;
+namespace MailPoet\Test\Captcha;
 
 use MailPoet\Captcha\CaptchaFormRenderer;
+use MailPoet\Captcha\CaptchaSession;
 use MailPoet\Entities\FormEntity;
 use MailPoet\Form\FormsRepository;
-use MailPoet\Subscription\Captcha\CaptchaSession;
 
 class CaptchaFormRendererTest extends \MailPoetTest {
   public function testCaptchaSubmitTextIsConfigurable() {

mailpoet/tests/integration/Captcha/CaptchaRendererTest.php

@@ -1,9 +1,9 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\Test\Subscription\Captcha;
+namespace MailPoet\Test\Captcha;
 
-use MailPoet\Subscription\Captcha\CaptchaRenderer;
-use MailPoet\Subscription\Captcha\CaptchaSession;
+use MailPoet\Captcha\CaptchaRenderer;
+use MailPoet\Captcha\CaptchaSession;
 
 class CaptchaRendererTest extends \MailPoetTest {
   private CaptchaRenderer $testee;

mailpoet/tests/integration/Captcha/CaptchaSessionTest.php

@@ -1,8 +1,8 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\Test\Subscription\Captcha;
+namespace MailPoet\Test\Captcha;
 
-use MailPoet\Subscription\Captcha\CaptchaSession;
+use MailPoet\Captcha\CaptchaSession;
 use MailPoet\WP\Functions as WPFunctions;
 
 class CaptchaSessionTest extends \MailPoetTest {

mailpoet/tests/integration/Captcha/Validator/BuiltInCaptchaValidatorTest.php

@@ -1,11 +1,11 @@
 <?php declare(strict_types = 1);
 
-namespace Mailpoet\Test\Subscription\Captcha\Validator;
+namespace Mailpoet\Test\Captcha\Validator;
 
+use MailPoet\Captcha\CaptchaSession;
+use MailPoet\Captcha\Validator\CaptchaValidator;
+use MailPoet\Captcha\Validator\ValidationError;
 use MailPoet\Entities\SubscriberIPEntity;
-use MailPoet\Subscription\Captcha\CaptchaSession;
-use MailPoet\Subscription\Captcha\Validator\CaptchaValidator;
-use MailPoet\Subscription\Captcha\Validator\ValidationError;
 use MailPoet\Test\DataFactories\Subscriber as SubscriberFactory;
 use MailPoet\WP\Functions as WPFunctions;
 use MailPoetVendor\Carbon\Carbon;

mailpoet/tests/integration/Router/Endpoints/SubscriptionTest.php

@@ -4,9 +4,9 @@ namespace MailPoet\Test\Router\Endpoints;
 
 use Codeception\Stub;
 use Codeception\Stub\Expected;
+use MailPoet\Captcha\CaptchaRenderer;
+use MailPoet\Captcha\CaptchaSession;
 use MailPoet\Router\Endpoints\Subscription;
-use MailPoet\Subscription\Captcha\CaptchaRenderer;
-use MailPoet\Subscription\Captcha\CaptchaSession;
 use MailPoet\Subscription\Pages;
 use MailPoet\Util\Request;
 use MailPoet\WP\Functions as WPFunctions;

mailpoet/tests/unit/Captcha/CaptchaPhraseTest.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\Subscription\Captcha;
+namespace MailPoet\Captcha;
 
 use Codeception\Stub;
 use MailPoetVendor\Gregwar\Captcha\PhraseBuilder;

mailpoet/tests/unit/Captcha/Validator/BuiltInCaptchaValidatorTest.php

@@ -1,12 +1,12 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\Subscription\Captcha\Validator;
+namespace MailPoet\Captcha\Validator;
 
 use Codeception\Stub;
+use MailPoet\Captcha\CaptchaPhrase;
+use MailPoet\Captcha\CaptchaSession;
 use MailPoet\Subscribers\SubscriberIPsRepository;
 use MailPoet\Subscribers\SubscribersRepository;
-use MailPoet\Subscription\Captcha\CaptchaPhrase;
-use MailPoet\Subscription\Captcha\CaptchaSession;
 use MailPoet\Subscription\SubscriptionUrlFactory;
 use MailPoet\WP\Functions as WPFunctions;
 

mailpoet/tests/unit/Captcha/Validator/RecaptchaValidatorTest.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace MailPoet\Subscription\Captcha\Validator;
+namespace MailPoet\Captcha\Validator;
 
 use Codeception\Stub;
 use MailPoet\Captcha\ReCaptchaValidator as Validator;

mailpoet/tests/unit/Form/RendererTest.php

@@ -3,12 +3,12 @@
 namespace MailPoet\Test\Form;
 
 use Codeception\Util\Fixtures;
+use MailPoet\Captcha\CaptchaConstants;
 use MailPoet\Form\BlocksRenderer;
 use MailPoet\Form\Renderer;
 use MailPoet\Form\Util\CustomFonts;
 use MailPoet\Form\Util\Styles;
 use MailPoet\Settings\SettingsController;
-use MailPoet\Subscription\Captcha\CaptchaConstants;
 use PHPUnit\Framework\MockObject\MockObject;
 
 require_once __DIR__ . '/HtmlParser.php';

mailpoet/tests/unit/Subscribers/SubscriberSubscribeControllerUnitTest.php

@@ -4,6 +4,11 @@ namespace MailPoet\Subscribers;
 
 use Codeception\Stub;
 use Codeception\Stub\Expected;
+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\Form\FormsRepository;
@@ -11,11 +16,6 @@ use MailPoet\Form\Util\FieldNameObfuscator;
 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;
 use MailPoet\Subscription\Throttling as SubscriptionThrottling;
 use MailPoet\Tags\TagRepository;