Move CAPTCHA classes under MailPoet\Captcha dir
CAPTCHA usage is no longer tied to MP's subscription form.
This commit is contained in:
committed by
David Remer
parent
8e608816a9
commit
3bda992f13
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
namespace MailPoet\API\JSON;
|
namespace MailPoet\API\JSON;
|
||||||
|
|
||||||
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
use MailPoet\Config\AccessControl;
|
use MailPoet\Config\AccessControl;
|
||||||
use MailPoet\Exception;
|
use MailPoet\Exception;
|
||||||
use MailPoet\Logging\LoggerFactory;
|
use MailPoet\Logging\LoggerFactory;
|
||||||
use MailPoet\Settings\SettingsController;
|
use MailPoet\Settings\SettingsController;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
|
||||||
use MailPoet\Tracy\ApiPanel\ApiPanel;
|
use MailPoet\Tracy\ApiPanel\ApiPanel;
|
||||||
use MailPoet\Tracy\DIPanel\DIPanel;
|
use MailPoet\Tracy\DIPanel\DIPanel;
|
||||||
use MailPoet\Util\Helpers;
|
use MailPoet\Util\Helpers;
|
||||||
|
@ -4,6 +4,7 @@ namespace MailPoet\AdminPages\Pages;
|
|||||||
|
|
||||||
use MailPoet\AdminPages\AssetsController;
|
use MailPoet\AdminPages\AssetsController;
|
||||||
use MailPoet\AdminPages\PageRenderer;
|
use MailPoet\AdminPages\PageRenderer;
|
||||||
|
use MailPoet\Captcha\CaptchaRenderer;
|
||||||
use MailPoet\Config\Installer;
|
use MailPoet\Config\Installer;
|
||||||
use MailPoet\Config\ServicesChecker;
|
use MailPoet\Config\ServicesChecker;
|
||||||
use MailPoet\Segments\SegmentsSimpleListRepository;
|
use MailPoet\Segments\SegmentsSimpleListRepository;
|
||||||
@ -13,7 +14,6 @@ use MailPoet\Services\Bridge;
|
|||||||
use MailPoet\Settings\Hosts;
|
use MailPoet\Settings\Hosts;
|
||||||
use MailPoet\Settings\Pages;
|
use MailPoet\Settings\Pages;
|
||||||
use MailPoet\Settings\SettingsController;
|
use MailPoet\Settings\SettingsController;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaRenderer;
|
|
||||||
use MailPoet\WP\Functions as WPFunctions;
|
use MailPoet\WP\Functions as WPFunctions;
|
||||||
use MailPoet\WP\Notice as WPNotice;
|
use MailPoet\WP\Notice as WPNotice;
|
||||||
|
|
||||||
|
@ -5,6 +5,7 @@ namespace MailPoet\Analytics;
|
|||||||
use MailPoet\Automation\Engine\Data\Automation;
|
use MailPoet\Automation\Engine\Data\Automation;
|
||||||
use MailPoet\Automation\Engine\Data\Step;
|
use MailPoet\Automation\Engine\Data\Step;
|
||||||
use MailPoet\Automation\Engine\Storage\AutomationStorage;
|
use MailPoet\Automation\Engine\Storage\AutomationStorage;
|
||||||
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
use MailPoet\Config\ServicesChecker;
|
use MailPoet\Config\ServicesChecker;
|
||||||
use MailPoet\Cron\CronTrigger;
|
use MailPoet\Cron\CronTrigger;
|
||||||
use MailPoet\Entities\DynamicSegmentFilterData;
|
use MailPoet\Entities\DynamicSegmentFilterData;
|
||||||
@ -51,7 +52,6 @@ use MailPoet\Settings\TrackingConfig;
|
|||||||
use MailPoet\Subscribers\ConfirmationEmailCustomizer;
|
use MailPoet\Subscribers\ConfirmationEmailCustomizer;
|
||||||
use MailPoet\Subscribers\NewSubscriberNotificationMailer;
|
use MailPoet\Subscribers\NewSubscriberNotificationMailer;
|
||||||
use MailPoet\Subscribers\SubscriberListingRepository;
|
use MailPoet\Subscribers\SubscriberListingRepository;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
|
||||||
use MailPoet\Tags\TagRepository;
|
use MailPoet\Tags\TagRepository;
|
||||||
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
|
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
|
||||||
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
|
use MailPoet\WooCommerce\Helper as WooCommerceHelper;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
|
<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
|
||||||
|
|
||||||
namespace MailPoet\Subscription\Captcha;
|
namespace MailPoet\Captcha;
|
||||||
|
|
||||||
class CaptchaConstants {
|
class CaptchaConstants {
|
||||||
const TYPE_BUILTIN = 'built-in';
|
const TYPE_BUILTIN = 'built-in';
|
@ -7,8 +7,6 @@ use MailPoet\Entities\FormEntity;
|
|||||||
use MailPoet\Form\FormsRepository;
|
use MailPoet\Form\FormsRepository;
|
||||||
use MailPoet\Form\Renderer as FormRenderer;
|
use MailPoet\Form\Renderer as FormRenderer;
|
||||||
use MailPoet\Form\Util\Styles;
|
use MailPoet\Form\Util\Styles;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaPhrase;
|
|
||||||
use MailPoet\Subscription\Captcha\CaptchaSession;
|
|
||||||
use MailPoet\Subscription\SubscriptionUrlFactory;
|
use MailPoet\Subscription\SubscriptionUrlFactory;
|
||||||
use MailPoet\Util\Url as UrlHelper;
|
use MailPoet\Util\Url as UrlHelper;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?php declare(strict_types = 1);
|
<?php declare(strict_types = 1);
|
||||||
|
|
||||||
namespace MailPoet\Subscription\Captcha;
|
namespace MailPoet\Captcha;
|
||||||
|
|
||||||
use MailPoetVendor\Gregwar\Captcha\PhraseBuilder;
|
use MailPoetVendor\Gregwar\Captcha\PhraseBuilder;
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
<?php declare(strict_types = 1);
|
<?php declare(strict_types = 1);
|
||||||
|
|
||||||
namespace MailPoet\Subscription\Captcha;
|
namespace MailPoet\Captcha;
|
||||||
|
|
||||||
use MailPoet\Config\Env;
|
use MailPoet\Config\Env;
|
||||||
use MailPoet\Util\Headers;
|
use MailPoet\Util\Headers;
|
@ -1,6 +1,6 @@
|
|||||||
<?php declare(strict_types = 1);
|
<?php declare(strict_types = 1);
|
||||||
|
|
||||||
namespace MailPoet\Subscription\Captcha;
|
namespace MailPoet\Captcha;
|
||||||
|
|
||||||
use MailPoet\Util\Security;
|
use MailPoet\Util\Security;
|
||||||
use MailPoet\WP\Functions as WPFunctions;
|
use MailPoet\WP\Functions as WPFunctions;
|
@ -1,10 +1,10 @@
|
|||||||
<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
|
<?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\SubscriberIPsRepository;
|
||||||
use MailPoet\Subscribers\SubscribersRepository;
|
use MailPoet\Subscribers\SubscribersRepository;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaPhrase;
|
|
||||||
use MailPoet\Subscription\SubscriptionUrlFactory;
|
use MailPoet\Subscription\SubscriptionUrlFactory;
|
||||||
use MailPoet\Util\Helpers;
|
use MailPoet\Util\Helpers;
|
||||||
use MailPoet\WP\Functions as WPFunctions;
|
use MailPoet\WP\Functions as WPFunctions;
|
@ -1,10 +1,10 @@
|
|||||||
<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
|
<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
|
||||||
|
|
||||||
namespace MailPoet\Subscription\Captcha\Validator;
|
namespace MailPoet\Captcha\Validator;
|
||||||
|
|
||||||
use MailPoet\Captcha\ReCaptchaValidator as Validator;
|
use MailPoet\Captcha\ReCaptchaValidator as Validator;
|
||||||
|
|
||||||
class RecaptchaValidator implements CaptchaValidator {
|
class RecaptchaValidator {
|
||||||
|
|
||||||
/** @var Validator */
|
/** @var Validator */
|
||||||
private $validator;
|
private $validator;
|
@ -1,6 +1,6 @@
|
|||||||
<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
|
<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
|
||||||
|
|
||||||
namespace MailPoet\Subscription\Captcha\Validator;
|
namespace MailPoet\Captcha\Validator;
|
||||||
|
|
||||||
class ValidationError extends \RuntimeException {
|
class ValidationError extends \RuntimeException {
|
||||||
|
|
@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
namespace MailPoet\Config;
|
namespace MailPoet\Config;
|
||||||
|
|
||||||
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
|
use MailPoet\Captcha\CaptchaRenderer;
|
||||||
use MailPoet\Cron\CronTrigger;
|
use MailPoet\Cron\CronTrigger;
|
||||||
use MailPoet\Cron\Workers\AuthorizedSendingEmailsCheck;
|
use MailPoet\Cron\Workers\AuthorizedSendingEmailsCheck;
|
||||||
use MailPoet\Cron\Workers\BackfillEngagementData;
|
use MailPoet\Cron\Workers\BackfillEngagementData;
|
||||||
@ -32,8 +34,6 @@ use MailPoet\Settings\SettingsController;
|
|||||||
use MailPoet\Settings\UserFlagsRepository;
|
use MailPoet\Settings\UserFlagsRepository;
|
||||||
use MailPoet\Subscribers\NewSubscriberNotificationMailer;
|
use MailPoet\Subscribers\NewSubscriberNotificationMailer;
|
||||||
use MailPoet\Subscribers\Source;
|
use MailPoet\Subscribers\Source;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
|
||||||
use MailPoet\Subscription\Captcha\CaptchaRenderer;
|
|
||||||
use MailPoet\WP\Functions as WPFunctions;
|
use MailPoet\WP\Functions as WPFunctions;
|
||||||
use MailPoetVendor\Carbon\Carbon;
|
use MailPoetVendor\Carbon\Carbon;
|
||||||
use MailPoetVendor\Doctrine\ORM\EntityManager;
|
use MailPoetVendor\Doctrine\ORM\EntityManager;
|
||||||
|
@ -546,12 +546,12 @@ class ContainerConfigurator implements IContainerConfigurator {
|
|||||||
$container->autowire(\MailPoet\Settings\UserFlagsController::class);
|
$container->autowire(\MailPoet\Settings\UserFlagsController::class);
|
||||||
$container->autowire(\MailPoet\Settings\UserFlagsRepository::class)->setPublic(true);
|
$container->autowire(\MailPoet\Settings\UserFlagsRepository::class)->setPublic(true);
|
||||||
// Subscription
|
// Subscription
|
||||||
$container->autowire(\MailPoet\Subscription\Captcha\CaptchaConstants::class)->setPublic(true);
|
$container->autowire(\MailPoet\Captcha\CaptchaConstants::class)->setPublic(true);
|
||||||
$container->autowire(\MailPoet\Subscription\Captcha\CaptchaSession::class)->setPublic(true);
|
$container->autowire(\MailPoet\Captcha\CaptchaSession::class)->setPublic(true);
|
||||||
$container->autowire(\MailPoet\Subscription\Captcha\CaptchaRenderer::class)->setPublic(true);
|
$container->autowire(\MailPoet\Captcha\CaptchaRenderer::class)->setPublic(true);
|
||||||
$container->autowire(\MailPoet\Subscription\Captcha\CaptchaPhrase::class);
|
$container->autowire(\MailPoet\Captcha\CaptchaPhrase::class);
|
||||||
$container->autowire(\MailPoet\Subscription\Captcha\Validator\CaptchaValidator::class)->setPublic(true);
|
$container->autowire(\MailPoet\Captcha\Validator\CaptchaValidator::class)->setPublic(true);
|
||||||
$container->autowire(\MailPoet\Subscription\Captcha\Validator\RecaptchaValidator::class)->setPublic(true);
|
$container->autowire(\MailPoet\Captcha\Validator\RecaptchaValidator::class)->setPublic(true);
|
||||||
$container->autowire(\MailPoet\Subscription\Comment::class)->setPublic(true);
|
$container->autowire(\MailPoet\Subscription\Comment::class)->setPublic(true);
|
||||||
$container->autowire(\MailPoet\Subscription\Form::class)->setPublic(true);
|
$container->autowire(\MailPoet\Subscription\Form::class)->setPublic(true);
|
||||||
$container->autowire(\MailPoet\Subscription\Manage::class)->setPublic(true);
|
$container->autowire(\MailPoet\Subscription\Manage::class)->setPublic(true);
|
||||||
|
@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
namespace MailPoet\Form;
|
namespace MailPoet\Form;
|
||||||
|
|
||||||
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
use MailPoet\Config\Env;
|
use MailPoet\Config\Env;
|
||||||
use MailPoet\Config\Renderer as BasicRenderer;
|
use MailPoet\Config\Renderer as BasicRenderer;
|
||||||
use MailPoet\Settings\SettingsController;
|
use MailPoet\Settings\SettingsController;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
|
||||||
use MailPoet\WP\Functions as WPFunctions;
|
use MailPoet\WP\Functions as WPFunctions;
|
||||||
|
|
||||||
class AssetsController {
|
class AssetsController {
|
||||||
|
@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
namespace MailPoet\Form;
|
namespace MailPoet\Form;
|
||||||
|
|
||||||
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
use MailPoet\Entities\FormEntity;
|
use MailPoet\Entities\FormEntity;
|
||||||
use MailPoet\Form\Templates\FormTemplate;
|
use MailPoet\Form\Templates\FormTemplate;
|
||||||
use MailPoet\Form\Util\CustomFonts;
|
use MailPoet\Form\Util\CustomFonts;
|
||||||
use MailPoet\Form\Util\Styles;
|
use MailPoet\Form\Util\Styles;
|
||||||
use MailPoet\Settings\SettingsController;
|
use MailPoet\Settings\SettingsController;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
|
||||||
|
|
||||||
class Renderer {
|
class Renderer {
|
||||||
/** @var Styles */
|
/** @var Styles */
|
||||||
|
@ -42,7 +42,7 @@ class Subscription {
|
|||||||
/** @var WPFunctions */
|
/** @var WPFunctions */
|
||||||
private $wp;
|
private $wp;
|
||||||
|
|
||||||
/** @var UserSubscription\Captcha\CaptchaRenderer */
|
/** @var \MailPoet\Captcha\CaptchaRenderer */
|
||||||
private $captchaRenderer;
|
private $captchaRenderer;
|
||||||
|
|
||||||
/*** @var Request */
|
/*** @var Request */
|
||||||
@ -51,7 +51,7 @@ class Subscription {
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
UserSubscription\Pages $subscriptionPages,
|
UserSubscription\Pages $subscriptionPages,
|
||||||
WPFunctions $wp,
|
WPFunctions $wp,
|
||||||
UserSubscription\Captcha\CaptchaRenderer $captchaRenderer,
|
\MailPoet\Captcha\CaptchaRenderer $captchaRenderer,
|
||||||
Request $request
|
Request $request
|
||||||
) {
|
) {
|
||||||
$this->subscriptionPages = $subscriptionPages;
|
$this->subscriptionPages = $subscriptionPages;
|
||||||
|
@ -2,6 +2,11 @@
|
|||||||
|
|
||||||
namespace MailPoet\Subscribers;
|
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\FormEntity;
|
||||||
use MailPoet\Entities\SubscriberEntity;
|
use MailPoet\Entities\SubscriberEntity;
|
||||||
use MailPoet\Entities\SubscriberTagEntity;
|
use MailPoet\Entities\SubscriberTagEntity;
|
||||||
@ -11,11 +16,6 @@ use MailPoet\NotFoundException;
|
|||||||
use MailPoet\Segments\SubscribersFinder;
|
use MailPoet\Segments\SubscribersFinder;
|
||||||
use MailPoet\Settings\SettingsController;
|
use MailPoet\Settings\SettingsController;
|
||||||
use MailPoet\Statistics\StatisticsFormsRepository;
|
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\Subscription\Throttling as SubscriptionThrottling;
|
||||||
use MailPoet\Tags\TagRepository;
|
use MailPoet\Tags\TagRepository;
|
||||||
use MailPoet\UnexpectedValueException;
|
use MailPoet\UnexpectedValueException;
|
||||||
|
@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
namespace MailPoet\Util\Notices;
|
namespace MailPoet\Util\Notices;
|
||||||
|
|
||||||
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
use MailPoet\Settings\SettingsController;
|
use MailPoet\Settings\SettingsController;
|
||||||
use MailPoet\Settings\TrackingConfig;
|
use MailPoet\Settings\TrackingConfig;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
|
||||||
use MailPoet\Util\Helpers;
|
use MailPoet\Util\Helpers;
|
||||||
use MailPoet\WP\Functions as WPFunctions;
|
use MailPoet\WP\Functions as WPFunctions;
|
||||||
use MailPoet\WP\Notice;
|
use MailPoet\WP\Notice;
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
namespace MailPoet\Test\Acceptance;
|
namespace MailPoet\Test\Acceptance;
|
||||||
|
|
||||||
use Codeception\Util\Locator;
|
use Codeception\Util\Locator;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
use MailPoet\Test\DataFactories\Form;
|
use MailPoet\Test\DataFactories\Form;
|
||||||
use MailPoet\Test\DataFactories\Settings;
|
use MailPoet\Test\DataFactories\Settings;
|
||||||
|
|
||||||
|
@ -3,9 +3,9 @@
|
|||||||
namespace MailPoet\Test\Acceptance;
|
namespace MailPoet\Test\Acceptance;
|
||||||
|
|
||||||
use Codeception\Util\Locator;
|
use Codeception\Util\Locator;
|
||||||
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
use MailPoet\DI\ContainerWrapper;
|
use MailPoet\DI\ContainerWrapper;
|
||||||
use MailPoet\Form\FormMessageController;
|
use MailPoet\Form\FormMessageController;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
|
||||||
use MailPoet\Test\DataFactories\Form;
|
use MailPoet\Test\DataFactories\Form;
|
||||||
use MailPoet\Test\DataFactories\Segment;
|
use MailPoet\Test\DataFactories\Segment;
|
||||||
use MailPoet\Test\DataFactories\Settings;
|
use MailPoet\Test\DataFactories\Settings;
|
||||||
@ -50,7 +50,7 @@ class SubscribeToMultipleListsCest {
|
|||||||
',
|
',
|
||||||
'post_status' => 'publish',
|
'post_status' => 'publish',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$i->wantTo('Subscribe to the form with multiple lists attached');
|
$i->wantTo('Subscribe to the form with multiple lists attached');
|
||||||
$i->amOnPage('/form-test');
|
$i->amOnPage('/form-test');
|
||||||
$i->waitForElement('[data-automation-id="form_email"]');
|
$i->waitForElement('[data-automation-id="form_email"]');
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
namespace MailPoet\Test\Acceptance;
|
namespace MailPoet\Test\Acceptance;
|
||||||
|
|
||||||
use Codeception\Util\Locator;
|
use Codeception\Util\Locator;
|
||||||
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
use MailPoet\Entities\CustomFieldEntity;
|
use MailPoet\Entities\CustomFieldEntity;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
|
||||||
use MailPoet\Test\DataFactories\CustomField;
|
use MailPoet\Test\DataFactories\CustomField;
|
||||||
use MailPoet\Test\DataFactories\Form;
|
use MailPoet\Test\DataFactories\Form;
|
||||||
use MailPoet\Test\DataFactories\Settings;
|
use MailPoet\Test\DataFactories\Settings;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
namespace MailPoet\Test\Acceptance;
|
namespace MailPoet\Test\Acceptance;
|
||||||
|
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
use MailPoet\Test\DataFactories\Form;
|
use MailPoet\Test\DataFactories\Form;
|
||||||
use MailPoet\Test\DataFactories\Settings;
|
use MailPoet\Test\DataFactories\Settings;
|
||||||
use MailPoet\Test\DataFactories\Subscriber;
|
use MailPoet\Test\DataFactories\Subscriber;
|
||||||
|
@ -3,15 +3,15 @@
|
|||||||
namespace MailPoet\Test\Acceptance;
|
namespace MailPoet\Test\Acceptance;
|
||||||
|
|
||||||
use Codeception\Util\Locator;
|
use Codeception\Util\Locator;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
use MailPoet\Test\DataFactories\Form;
|
use MailPoet\Test\DataFactories\Form;
|
||||||
use MailPoet\Test\DataFactories\Settings;
|
use MailPoet\Test\DataFactories\Settings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @group frontend
|
* @group frontend
|
||||||
*/
|
*/
|
||||||
class ConfirmConfirmationPageCest {
|
class ConfirmConfirmationPageCest {
|
||||||
|
|
||||||
const CONFIRMATION_MESSAGE_TIMEOUT = 20;
|
const CONFIRMATION_MESSAGE_TIMEOUT = 20;
|
||||||
const FORM_NAME = 'Subscription Acceptance Test Form';
|
const FORM_NAME = 'Subscription Acceptance Test Form';
|
||||||
|
|
||||||
|
@ -6,14 +6,14 @@ use Codeception\Stub;
|
|||||||
use Helper\WordPressHooks as WPHooksHelper;
|
use Helper\WordPressHooks as WPHooksHelper;
|
||||||
use MailPoet\API\JSON\Response as APIResponse;
|
use MailPoet\API\JSON\Response as APIResponse;
|
||||||
use MailPoet\API\JSON\v1\Setup;
|
use MailPoet\API\JSON\v1\Setup;
|
||||||
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
|
use MailPoet\Captcha\CaptchaRenderer;
|
||||||
use MailPoet\Config\Activator;
|
use MailPoet\Config\Activator;
|
||||||
use MailPoet\Config\Populator;
|
use MailPoet\Config\Populator;
|
||||||
use MailPoet\Cron\ActionScheduler\ActionScheduler;
|
use MailPoet\Cron\ActionScheduler\ActionScheduler;
|
||||||
use MailPoet\Migrator\Migrator;
|
use MailPoet\Migrator\Migrator;
|
||||||
use MailPoet\Referrals\ReferralDetector;
|
use MailPoet\Referrals\ReferralDetector;
|
||||||
use MailPoet\Settings\SettingsController;
|
use MailPoet\Settings\SettingsController;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
|
||||||
use MailPoet\Subscription\Captcha\CaptchaRenderer;
|
|
||||||
use MailPoet\WP\Functions as WPFunctions;
|
use MailPoet\WP\Functions as WPFunctions;
|
||||||
|
|
||||||
class SetupTest extends \MailPoetTest {
|
class SetupTest extends \MailPoetTest {
|
||||||
|
@ -9,6 +9,8 @@ use MailPoet\API\JSON\Response as APIResponse;
|
|||||||
use MailPoet\API\JSON\ResponseBuilders\SubscribersResponseBuilder;
|
use MailPoet\API\JSON\ResponseBuilders\SubscribersResponseBuilder;
|
||||||
use MailPoet\API\JSON\SuccessResponse;
|
use MailPoet\API\JSON\SuccessResponse;
|
||||||
use MailPoet\API\JSON\v1\Subscribers;
|
use MailPoet\API\JSON\v1\Subscribers;
|
||||||
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
|
use MailPoet\Captcha\CaptchaSession;
|
||||||
use MailPoet\DI\ContainerWrapper;
|
use MailPoet\DI\ContainerWrapper;
|
||||||
use MailPoet\Entities\CustomFieldEntity;
|
use MailPoet\Entities\CustomFieldEntity;
|
||||||
use MailPoet\Entities\FormEntity;
|
use MailPoet\Entities\FormEntity;
|
||||||
@ -28,8 +30,6 @@ use MailPoet\Subscribers\SubscriberSaveController;
|
|||||||
use MailPoet\Subscribers\SubscribersRepository;
|
use MailPoet\Subscribers\SubscribersRepository;
|
||||||
use MailPoet\Subscribers\SubscriberSubscribeController;
|
use MailPoet\Subscribers\SubscriberSubscribeController;
|
||||||
use MailPoet\Subscribers\SubscriberTagRepository;
|
use MailPoet\Subscribers\SubscriberTagRepository;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
|
||||||
use MailPoet\Subscription\Captcha\CaptchaSession;
|
|
||||||
use MailPoet\Tags\TagRepository;
|
use MailPoet\Tags\TagRepository;
|
||||||
use MailPoet\Test\DataFactories\CustomField as CustomFieldFactory;
|
use MailPoet\Test\DataFactories\CustomField as CustomFieldFactory;
|
||||||
use MailPoet\Test\DataFactories\DynamicSegment;
|
use MailPoet\Test\DataFactories\DynamicSegment;
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
<?php declare(strict_types = 1);
|
<?php declare(strict_types = 1);
|
||||||
|
|
||||||
namespace MailPoet\Test\Subscription;
|
namespace MailPoet\Test\Captcha;
|
||||||
|
|
||||||
use MailPoet\Captcha\CaptchaFormRenderer;
|
use MailPoet\Captcha\CaptchaFormRenderer;
|
||||||
|
use MailPoet\Captcha\CaptchaSession;
|
||||||
use MailPoet\Entities\FormEntity;
|
use MailPoet\Entities\FormEntity;
|
||||||
use MailPoet\Form\FormsRepository;
|
use MailPoet\Form\FormsRepository;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaSession;
|
|
||||||
|
|
||||||
class CaptchaFormRendererTest extends \MailPoetTest {
|
class CaptchaFormRendererTest extends \MailPoetTest {
|
||||||
public function testCaptchaSubmitTextIsConfigurable() {
|
public function testCaptchaSubmitTextIsConfigurable() {
|
@ -1,9 +1,9 @@
|
|||||||
<?php declare(strict_types = 1);
|
<?php declare(strict_types = 1);
|
||||||
|
|
||||||
namespace MailPoet\Test\Subscription\Captcha;
|
namespace MailPoet\Test\Captcha;
|
||||||
|
|
||||||
use MailPoet\Subscription\Captcha\CaptchaRenderer;
|
use MailPoet\Captcha\CaptchaRenderer;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaSession;
|
use MailPoet\Captcha\CaptchaSession;
|
||||||
|
|
||||||
class CaptchaRendererTest extends \MailPoetTest {
|
class CaptchaRendererTest extends \MailPoetTest {
|
||||||
private CaptchaRenderer $testee;
|
private CaptchaRenderer $testee;
|
@ -1,8 +1,8 @@
|
|||||||
<?php declare(strict_types = 1);
|
<?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;
|
use MailPoet\WP\Functions as WPFunctions;
|
||||||
|
|
||||||
class CaptchaSessionTest extends \MailPoetTest {
|
class CaptchaSessionTest extends \MailPoetTest {
|
@ -1,11 +1,11 @@
|
|||||||
<?php declare(strict_types = 1);
|
<?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\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\Test\DataFactories\Subscriber as SubscriberFactory;
|
||||||
use MailPoet\WP\Functions as WPFunctions;
|
use MailPoet\WP\Functions as WPFunctions;
|
||||||
use MailPoetVendor\Carbon\Carbon;
|
use MailPoetVendor\Carbon\Carbon;
|
@ -4,9 +4,9 @@ namespace MailPoet\Test\Router\Endpoints;
|
|||||||
|
|
||||||
use Codeception\Stub;
|
use Codeception\Stub;
|
||||||
use Codeception\Stub\Expected;
|
use Codeception\Stub\Expected;
|
||||||
|
use MailPoet\Captcha\CaptchaRenderer;
|
||||||
|
use MailPoet\Captcha\CaptchaSession;
|
||||||
use MailPoet\Router\Endpoints\Subscription;
|
use MailPoet\Router\Endpoints\Subscription;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaRenderer;
|
|
||||||
use MailPoet\Subscription\Captcha\CaptchaSession;
|
|
||||||
use MailPoet\Subscription\Pages;
|
use MailPoet\Subscription\Pages;
|
||||||
use MailPoet\Util\Request;
|
use MailPoet\Util\Request;
|
||||||
use MailPoet\WP\Functions as WPFunctions;
|
use MailPoet\WP\Functions as WPFunctions;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<?php declare(strict_types = 1);
|
<?php declare(strict_types = 1);
|
||||||
|
|
||||||
namespace MailPoet\Subscription\Captcha;
|
namespace MailPoet\Captcha;
|
||||||
|
|
||||||
use Codeception\Stub;
|
use Codeception\Stub;
|
||||||
use MailPoetVendor\Gregwar\Captcha\PhraseBuilder;
|
use MailPoetVendor\Gregwar\Captcha\PhraseBuilder;
|
@ -1,12 +1,12 @@
|
|||||||
<?php declare(strict_types = 1);
|
<?php declare(strict_types = 1);
|
||||||
|
|
||||||
namespace MailPoet\Subscription\Captcha\Validator;
|
namespace MailPoet\Captcha\Validator;
|
||||||
|
|
||||||
use Codeception\Stub;
|
use Codeception\Stub;
|
||||||
|
use MailPoet\Captcha\CaptchaPhrase;
|
||||||
|
use MailPoet\Captcha\CaptchaSession;
|
||||||
use MailPoet\Subscribers\SubscriberIPsRepository;
|
use MailPoet\Subscribers\SubscriberIPsRepository;
|
||||||
use MailPoet\Subscribers\SubscribersRepository;
|
use MailPoet\Subscribers\SubscribersRepository;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaPhrase;
|
|
||||||
use MailPoet\Subscription\Captcha\CaptchaSession;
|
|
||||||
use MailPoet\Subscription\SubscriptionUrlFactory;
|
use MailPoet\Subscription\SubscriptionUrlFactory;
|
||||||
use MailPoet\WP\Functions as WPFunctions;
|
use MailPoet\WP\Functions as WPFunctions;
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
<?php declare(strict_types = 1);
|
<?php declare(strict_types = 1);
|
||||||
|
|
||||||
namespace MailPoet\Subscription\Captcha\Validator;
|
namespace MailPoet\Captcha\Validator;
|
||||||
|
|
||||||
use Codeception\Stub;
|
use Codeception\Stub;
|
||||||
use MailPoet\Captcha\ReCaptchaValidator as Validator;
|
use MailPoet\Captcha\ReCaptchaValidator as Validator;
|
@ -3,12 +3,12 @@
|
|||||||
namespace MailPoet\Test\Form;
|
namespace MailPoet\Test\Form;
|
||||||
|
|
||||||
use Codeception\Util\Fixtures;
|
use Codeception\Util\Fixtures;
|
||||||
|
use MailPoet\Captcha\CaptchaConstants;
|
||||||
use MailPoet\Form\BlocksRenderer;
|
use MailPoet\Form\BlocksRenderer;
|
||||||
use MailPoet\Form\Renderer;
|
use MailPoet\Form\Renderer;
|
||||||
use MailPoet\Form\Util\CustomFonts;
|
use MailPoet\Form\Util\CustomFonts;
|
||||||
use MailPoet\Form\Util\Styles;
|
use MailPoet\Form\Util\Styles;
|
||||||
use MailPoet\Settings\SettingsController;
|
use MailPoet\Settings\SettingsController;
|
||||||
use MailPoet\Subscription\Captcha\CaptchaConstants;
|
|
||||||
use PHPUnit\Framework\MockObject\MockObject;
|
use PHPUnit\Framework\MockObject\MockObject;
|
||||||
|
|
||||||
require_once __DIR__ . '/HtmlParser.php';
|
require_once __DIR__ . '/HtmlParser.php';
|
||||||
|
@ -4,6 +4,11 @@ namespace MailPoet\Subscribers;
|
|||||||
|
|
||||||
use Codeception\Stub;
|
use Codeception\Stub;
|
||||||
use Codeception\Stub\Expected;
|
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\FormEntity;
|
||||||
use MailPoet\Entities\SubscriberEntity;
|
use MailPoet\Entities\SubscriberEntity;
|
||||||
use MailPoet\Form\FormsRepository;
|
use MailPoet\Form\FormsRepository;
|
||||||
@ -11,11 +16,6 @@ use MailPoet\Form\Util\FieldNameObfuscator;
|
|||||||
use MailPoet\Segments\SubscribersFinder;
|
use MailPoet\Segments\SubscribersFinder;
|
||||||
use MailPoet\Settings\SettingsController;
|
use MailPoet\Settings\SettingsController;
|
||||||
use MailPoet\Statistics\StatisticsFormsRepository;
|
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;
|
||||||
use MailPoet\Subscription\Throttling as SubscriptionThrottling;
|
use MailPoet\Subscription\Throttling as SubscriptionThrottling;
|
||||||
use MailPoet\Tags\TagRepository;
|
use MailPoet\Tags\TagRepository;
|
||||||
|
Reference in New Issue
Block a user