Release 4.2.0

These queries failed when ANSI_QUOTES mode is enabled
[MAILPOET-4887]

.circleci/config.yml

@@ -312,6 +312,7 @@ jobs:
     working_directory: /home/circleci/mailpoet/mailpoet
     machine:
       image: ubuntu-2204:2022.10.2
+      docker_layer_caching: false
     parameters:
       multisite:
         type: integer
@@ -411,6 +412,12 @@ jobs:
               circleci tests glob "tests/acceptance/**/*Cest.php" | circleci tests split --split-by=timings > tests/acceptance/_groups/circleci_split_group
             fi
             cat tests/acceptance/_groups/circleci_split_group
+      - run:
+          name: Create docker containers for test
+          # We experienced some failures when creating containers so we do it explicitly with one retry
+          command: |
+            cd tests/docker
+            docker-compose create || docker-compose create
       - run:
           name: Run acceptance tests
           command: |
@@ -477,6 +484,7 @@ jobs:
     working_directory: /home/circleci/mailpoet/mailpoet
     machine:
       image: ubuntu-2204:2022.10.2
+      docker_layer_caching: false
     environment:
       CODECEPTION_IMAGE_VERSION: << parameters.codeception_image_version >>
     parameters:
@@ -618,7 +626,7 @@ workflows:
             - build
       - acceptance_tests:
           <<: *slack-fail-post-step
-          name: acceptance_tests
+          name: acceptance_tests_base_and_woo_cot_off
           requires:
             - unit_tests
             - static_analysis_php8
@@ -646,28 +654,10 @@ workflows:
             - static_analysis_php8
             - qa_js
             - qa_php
-      - acceptance_tests:
-          <<: *slack-fail-post-step
-          name: acceptance_tests_woo_cot_off
-          group: woo
-          requires:
-            - unit_tests
-            - static_analysis_php8
-            - qa_js
-            - qa_php
       - js_tests:
           <<: *slack-fail-post-step
           requires:
             - build
-      - integration_tests:
-          <<: *slack-fail-post-step
-          group: woo
-          name: integration_test_woocommerce
-          requires:
-            - unit_tests
-            - static_analysis_php8
-            - qa_js
-            - qa_php
       - integration_tests:
           <<: *slack-fail-post-step
           group: woo
@@ -728,15 +718,13 @@ workflows:
           <<: *slack-fail-post-step
           requires:
             - build
-            - acceptance_tests
+            - acceptance_tests_base_and_woo_cot_off
             - js_tests
-            - integration_test_woocommerce
             - integration_test_base
             - integration_test_woo_cot_no_sync
             - integration_test_woo_cot_off
             - integration_test_woo_cot_sync
             - acceptance_tests_woo_cot_sync
-            - acceptance_tests_woo_cot_off
             - acceptance_tests_woo_cot_no_sync
 
   nightly:

README.md

@@ -126,23 +126,24 @@ You can access this help in your command line running `./do` without parameters.
 
 [Read the article.](https://mailpoet.atlassian.net/wiki/spaces/MAILPOET/pages/629374977/Adding+new+templates+to+the+plugin)
 
-## 🚥 Testing with PHP 7.4 or PHP 8.0
+## 🚥 Testing with different PHP versions
 
-To switch the environment to PHP 7.4/8.0:
+To switch the environment to a different PHP version:
 
-1. Configure the `wordpress` service in `docker-compose.override.yml` to build from the php74 Dockerfile:
+1. Check https://github.com/mailpoet/mailpoet/tree/trunk/dev for a list of available PHP versions. Each directory starting with `php` corresponds to a available version.
+2. Configure the `wordpress` service in `docker-compose.override.yml` to build from the desired PHP version Dockerfile (replace {PHP_VERSION} with the name of the directory that corresponds to the version that you want to use):
 
    ```yaml
    wordpress:
      build:
        context: .
-       dockerfile: dev/php74/Dockerfile # OR dev/php80/Dockerfile
+       dockerfile: dev/{PHP_VERSION}/Dockerfile
    ```
 
-2. Run `docker-compose build wordpress`.
-3. Start the stack with `./do start`.
+3. Run `docker-compose build wordpress`.
+4. Start the stack with `./do start`.
 
-To switch back to PHP 8.1 remove what was added in 1) and, run `docker-compose build wordpress` for application container and `docker-compose build test_wordpress` for tests container,
+To switch back to the default PHP version remove what was added in 2) and, run `docker-compose build wordpress` for application container and `docker-compose build test_wordpress` for tests container,
 and start the stack using `./do start`.
 
 ## ✅ TODO

dev/php82/Dockerfile

@@ -0,0 +1,46 @@
+FROM php:8.2.0RC6-apache
+
+ARG UID=1000
+ARG GID=1000
+
+# additinal extensions
+RUN apt-get update \
+	&& apt-get install -y git zlib1g-dev libzip-dev zip wget gnupg msmtp libpng-dev gettext subversion \
+	&& \
+    # Install NodeJS, enable Corepack
+    curl -sL https://deb.nodesource.com/setup_17.x | bash - && \
+    apt-get install -y nodejs build-essential && \
+    corepack enable && \
+	\
+	# Install WP-CLI
+	curl -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && \
+	chmod +x /usr/local/bin/wp && \
+	\
+  # Clean up
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY dev/php.ini /usr/local/etc/php/conf.d/php_user.ini
+
+# msmtp config
+RUN printf "account default\nhost smtp\nport 1025" > /etc/msmtprc
+
+# xdebug build an config
+ENV XDEBUGINI_PATH=/usr/local/etc/php/conf.d/xdebug.ini
+RUN git clone -b "3.2.0RC2" --depth 1 https://github.com/xdebug/xdebug.git /usr/src/php/ext/xdebug \
+    && docker-php-ext-configure xdebug --enable-xdebug-dev \
+    && docker-php-ext-install xdebug \
+    && mkdir /tmp/debug
+COPY dev/xdebug.ini /tmp/xdebug.ini
+RUN cat /tmp/xdebug.ini >> $XDEBUGINI_PATH
+
+# php extensions
+RUN docker-php-ext-install pdo_mysql
+RUN docker-php-ext-install mysqli
+
+# allow .htaccess files (between <Directory /var/www/> and </Directory>, which is WordPress installation)
+RUN sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
+
+# ensure existing content in /var/www/html respects UID and GID, give Node permissions for Corepack
+RUN chown -R ${UID}:${GID} /var/www/html && \
+  mkdir -p /.node && chown -R ${UID}:${GID} /.node

docker-compose.yml

@@ -15,6 +15,7 @@ services:
     volumes:
       - my-datavolume:/var/lib/mysql
       - ./dev/database/create_test_db.sh:/docker-entrypoint-initdb.d/10-create_test_db.sh
+    command: --sql_mode=STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION,ANSI,ONLY_FULL_GROUP_BY
     environment:
       MYSQL_ROOT_PASSWORD: somewordpress
       MYSQL_DATABASE: wordpress

mailpoet/RoboFile.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 // phpcs:disable PSR1.Classes.ClassDeclaration
 // phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
@@ -425,6 +425,9 @@ class RoboFile extends \Robo\Tasks {
     $collection->addCode(function() {
       return $this->qaCodeSniffer([]);
     });
+    $collection->addCode(function() {
+      return $this->qaMinimalPluginStandard([]);
+    });
     return $collection->run();
   }
 
@@ -536,6 +539,55 @@ class RoboFile extends \Robo\Tasks {
 
     $stringFilesToCheck = !empty($filesToCheck) ? implode(' ', $filesToCheck) : '.';
 
+    return $this->taskExec($task)
+      ->arg('--ignore=' . implode(',', $ignorePatterns))
+      ->rawArg($stringFilesToCheck)
+      ->run();
+  }
+
+  public function qaMinimalPluginStandard(array $filesToCheck, $opts = ['severity' => 'all']) {
+    $severityFlag = $opts['severity'] === 'all' ? '-w' : '-n';
+
+    $task = implode(' ', [
+      'php -d memory_limit=-1',
+      './tasks/code_sniffer/vendor/bin/phpcs',
+      '--extensions=php',
+      $severityFlag,
+      '--standard=tasks/code_sniffer/vendor/wporg/plugin-directory/MinimalPluginStandard',
+      '-s',
+    ]);
+
+    $ignorePaths = [
+      '.mp_svn',
+      'assets',
+      'doc',
+      'generated',
+      'lib/Config/PopulatorData/Templates',
+      'lib-3rd-party',
+      'node_modules',
+      'plugin_repository',
+      'prefixer/build',
+      'prefixer/vendor',
+      'tasks/code_sniffer/vendor',
+      'tasks/phpstan/vendor',
+      'tasks/makepot',
+      'tools/vendor',
+      'temp',
+      'tests/_data',
+      'tests/_output',
+      'tests/_support/_generated',
+      'vendor',
+      'vendor-prefixed',
+      'views',
+    ];
+
+    // the "--ignore" arg takes a list of regexes, we need to anchor and escape them
+    $ignorePatterns = array_map(function (string $path): string {
+      return '^' . preg_quote(__DIR__ . DIRECTORY_SEPARATOR . $path);
+    }, $ignorePaths);
+
+    $stringFilesToCheck = !empty($filesToCheck) ? implode(' ', $filesToCheck) : '.';
+
     return $this
       ->taskExec($task)
       ->arg('--ignore=' . implode(',', $ignorePatterns))

mailpoet/assets/css/src/components-editor/components/_forms.scss

@@ -51,4 +51,8 @@
   .mailpoet_form_field_block {
     display: block;
   }
+
+  .mailpoet_form_field_input_nowrap {
+    white-space: nowrap;
+  }
 }

mailpoet/assets/css/src/components-plugin/_welcome-wizard.scss

@@ -22,6 +22,12 @@
   }
 }
 
+#mailpoet-wizard-container {
+  .mailpoet-top-bar {
+    left: 0;
+  }
+}
+
 .mailpoet-wizard-logo {
   margin-bottom: 100px;
   text-align: center;
@@ -35,6 +41,7 @@
   align-items: center;
   display: flex;
   justify-content: center;
+  margin-top: 8px;
 
   @include respond-to(medium-screen) {
     flex-direction: column;
@@ -42,7 +49,7 @@
 }
 
 .mailpoet-wizard-step-illustration {
-  margin-right: $grid-gap;
+  margin-right: $grid-gap-xl;
   max-width: $grid-column;
   text-align: center;
   width: 100%;
@@ -63,12 +70,16 @@
 }
 
 .mailpoet-wizard-step-content {
-  max-width: $grid-column-small + $grid-gap + $grid-column;
+  max-width: 480px;
   width: 100%;
 
   @include respond-to(medium-screen) {
     max-width: $grid-column;
   }
+
+  .mailpoet-button {
+    height: 36px;
+  }
 }
 
 .mailpoet-wizard-label {

mailpoet/assets/css/src/components-public/captcha.scss

@@ -0,0 +1,12 @@
+.mailpoet_captcha_form {
+  .mailpoet_icon_button {
+    background: transparent;
+    border: 0;
+    cursor: pointer;
+
+    img {
+      height: 20px;
+      width: 20px;
+    }
+  }
+}

mailpoet/assets/css/src/components/_modal.scss

@@ -112,3 +112,11 @@
   max-width: 100%;
   width: 100%;
 }
+
+.authorize-sender-email-and-domain-modal {
+  z-index: 30; // overlay other modals
+}
+
+.authorize-sender-email-and-domain-modal-overlay {
+  z-index: $modal-screen-overlay-z-index + 4; // overlay other modals
+}

mailpoet/assets/css/src/components/_top_bar.scss

@@ -29,7 +29,6 @@ $beamer-dot-size: 8px;
   }
 
   .mailpoet-top-bar-logo {
-    cursor: pointer;
     position: relative;
     top: 2px;
     z-index: 1;
@@ -39,6 +38,10 @@ $beamer-dot-size: 8px;
       max-width: 100%;
     }
   }
+
+  a.mailpoet-top-bar-logo {
+    cursor: pointer;
+  }
 }
 
 .mailpoet-top-bar-logo-desktop {

mailpoet/assets/css/src/mailpoet-public.scss

@@ -19,3 +19,4 @@
 @import 'components-public/public';
 @import 'components-public/animation';
 @import 'components-public/form_colors';
+@import 'components-public/captcha';

mailpoet/assets/img/icons/controls-volumeon.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><rect x="0" fill="none" width="20" height="20"/><g><path d="M2 7h4l5-4v14l-5-4H2V7zm12.69-2.46C14.82 4.59 18 5.92 18 10s-3.18 5.41-3.31 5.46c-.06.03-.13.04-.19.04-.2 0-.39-.12-.46-.31-.11-.26.02-.55.27-.65.11-.05 2.69-1.15 2.69-4.54 0-3.41-2.66-4.53-2.69-4.54-.25-.1-.38-.39-.27-.65.1-.25.39-.38.65-.27zM16 10c0 2.57-2.23 3.43-2.32 3.47-.06.02-.12.03-.18.03-.2 0-.39-.12-.47-.32-.1-.26.04-.55.29-.65.07-.02 1.68-.67 1.68-2.53s-1.61-2.51-1.68-2.53c-.25-.1-.38-.39-.29-.65.1-.25.39-.39.65-.29.09.04 2.32.9 2.32 3.47z"/></g></svg>

mailpoet/assets/img/icons/image-rotate.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><rect x="0" fill="none" width="20" height="20"/><g><path d="M10.25 1.02c5.1 0 8.75 4.04 8.75 9s-3.65 9-8.75 9c-3.2 0-6.02-1.59-7.68-3.99l2.59-1.52c1.1 1.5 2.86 2.51 4.84 2.51 3.3 0 6-2.79 6-6s-2.7-6-6-6c-1.97 0-3.72 1-4.82 2.49L7 8.02l-6 2v-7L2.89 4.6c1.69-2.17 4.36-3.58 7.36-3.58z"/></g></svg>

mailpoet/assets/js/src/automation/editor/components/automation/step-more-menu.tsx

@@ -1,12 +1,10 @@
 import { useState, Fragment } from 'react';
 import { DropdownMenu } from '@wordpress/components';
-import { useSelect } from '@wordpress/data';
 import { moreVertical, trash } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 import { Hooks } from 'wp-js-hooks';
 import { PremiumModal } from 'common/premium_modal';
 import { Step as StepData } from './types';
-import { storeName } from '../../store';
 import { StepMoreControlsType } from '../../../types/filters';
 
 type Props = {
@@ -14,12 +12,6 @@ type Props = {
 };
 
 export function StepMoreMenu({ step }: Props): JSX.Element {
-  const { stepType } = useSelect(
-    (select) => ({
-      stepType: select(storeName).getStepType(step.key),
-    }),
-    [step],
-  );
   const [showModal, setShowModal] = useState(false);
 
   const moreControls: StepMoreControlsType = Hooks.applyFilters(
@@ -53,7 +45,6 @@ export function StepMoreMenu({ step }: Props): JSX.Element {
       },
     },
     step,
-    stepType,
   );
 
   const slots = Object.values(moreControls).filter(

mailpoet/assets/js/src/automation/integrations/mailpoet/step-controls/index.tsx

@@ -2,7 +2,6 @@ import { __ } from '@wordpress/i18n';
 import { chartBar } from '@wordpress/icons';
 import { Hooks } from 'wp-js-hooks';
 import { MoreControlType, StepMoreControlsType } from '../../../types/filters';
-import { StepType } from '../../../editor/store';
 import { Step } from '../../../editor/components/automation/types';
 
 const emailStatisticsControl = (step: Step): MoreControlType => {
@@ -30,12 +29,8 @@ export function registerStepControls() {
   Hooks.addFilter(
     'mailpoet.automation.step.more-controls',
     'mailpoet',
-    (
-      controls: StepMoreControlsType,
-      step: Step,
-      stepType: StepType,
-    ): StepMoreControlsType => {
-      if (stepType.key === 'mailpoet:send-email') {
+    (controls: StepMoreControlsType, step: Step): StepMoreControlsType => {
+      if (step.key === 'mailpoet:send-email') {
         return {
           statistics: emailStatisticsControl(step),
           ...controls,

mailpoet/assets/js/src/common/authorize_sender_email_and_domain_modal.tsx

@@ -92,6 +92,7 @@ function AuthorizeSenderEmailAndDomainModal({
     <Modal
       onRequestClose={onRequestClose}
       contentClassName="authorize-sender-email-and-domain-modal"
+      overlayClassName="authorize-sender-email-and-domain-modal-overlay"
     >
       <Tabs activeKey={initialTab}>
         <Tab

mailpoet/assets/js/src/common/tag/_stories/tags.tsx

@@ -1,5 +1,5 @@
 import { Heading } from 'common/typography/heading/heading';
-import { Tags } from '../tags';
+import { SegmentTags, StringTags } from '../tags';
 
 export default {
   title: 'Tags',
@@ -18,15 +18,20 @@ export function Segments() {
     <>
       <Heading level={1}>Tags</Heading>
       <Heading level={2}>Segments</Heading>
-      <Tags segments={segments} dimension="large" />
+      <SegmentTags segments={segments} dimension="large" />
       <div className="mailpoet-gap" />
-      <Tags segments={segments}>
+      <SegmentTags segments={segments}>
         <span>Prefix: </span>
-      </Tags>
+      </SegmentTags>
       <Heading level={2}>Strings</Heading>
-      <Tags strings={strings} dimension="large" variant="good" />
+      <StringTags strings={strings} dimension="large" variant="good" />
       <div className="mailpoet-gap" />
-      <Tags strings={strings} dimension="large" variant="good" isInverted />
+      <StringTags
+        strings={strings}
+        dimension="large"
+        variant="good"
+        isInverted
+      />
     </>
   );
 }

mailpoet/assets/js/src/common/tag/tags.tsx

@@ -3,11 +3,36 @@ import { Tag, TagVariant } from './tag';
 import { Tooltip } from '../tooltip/tooltip';
 import { MailPoet } from '../../mailpoet';
 
+type SharedTagProps = {
+  children?: ReactNode;
+  dimension?: 'large';
+  variant?: TagVariant;
+  isInverted?: boolean;
+};
+
+type TagData = {
+  name: string;
+  target?: string;
+  tooltip?: string;
+};
+
+type TagProps = SharedTagProps & {
+  tags: TagData[];
+};
+
+type StringTagsProps = SharedTagProps & {
+  strings: string[];
+};
+
 type Segment = {
   name: string;
   id?: string;
 };
 
+type SegmentTagsProps = SharedTagProps & {
+  segments: Segment[];
+};
+
 type SubscriberTag = {
   id: string;
   name: string;
@@ -15,99 +40,89 @@ type SubscriberTag = {
   tag_id: string;
 };
 
-type Props = {
-  children?: ReactNode;
-  dimension?: 'large';
-  segments?: Segment[];
-  subscriberTags?: SubscriberTag[];
-  strings?: string[];
-  variant?: TagVariant;
-  isInverted?: boolean;
+type SubscriberTagsProps = SharedTagProps & {
+  subscribers: SubscriberTag[];
 };
 
-function Tags({
-  children,
-  dimension,
-  segments,
-  subscriberTags,
-  strings,
-  variant,
-  isInverted,
-}: Props) {
+function Tags({ children, tags, dimension, variant, isInverted }: TagProps) {
   return (
     <div className="mailpoet-tags">
       {children}
-      {segments &&
-        segments.map((segment) => {
-          const tag = (
-            <Tag key={segment.name} dimension={dimension} variant="list">
-              {segment.name}
-            </Tag>
-          );
-          if (!segment.id) {
-            return tag;
-          }
-          const randomId = Math.random().toString(36).substring(2, 15);
-          const tooltipId = `segment-tooltip-${randomId}`;
-
-          return (
-            <div key={randomId}>
-              <Tooltip id={tooltipId} place="top">
-                {MailPoet.I18n.t('viewFilteredSubscribersMessage')}
-              </Tooltip>
-              <a
-                data-tip=""
-                data-for={tooltipId}
-                href={`admin.php?page=mailpoet-subscribers#/filter[segment=${segment.id}]`}
-              >
-                {tag}
-              </a>
-            </div>
-          );
-        })}
-      {subscriberTags &&
-        subscriberTags.map((subscriberTag) => {
-          const randomId = Math.random().toString(36).substring(2, 15);
-          const tooltipId = `tag-tooltip-${randomId}`;
-          const tag = (
-            <Tag
-              key={subscriberTag.name}
-              dimension={dimension}
-              variant={variant || 'list'}
-              isInverted={isInverted}
-            >
-              {subscriberTag.name}
-            </Tag>
-          );
-
-          return (
-            <div key={randomId}>
-              <Tooltip id={tooltipId} place="top">
-                {MailPoet.I18n.t('viewFilteredSubscribersMessage')}
-              </Tooltip>
-              <a
-                data-tip=""
-                data-for={tooltipId}
-                href={`admin.php?page=mailpoet-subscribers#/filter[tag=${subscriberTag.tag_id}]`}
-              >
-                {tag}
-              </a>
-            </div>
-          );
-        })}
-      {strings &&
-        strings.map((string) => (
+      {tags.map((item) => {
+        const tag = (
           <Tag
-            key={string}
+            key={item.name}
             dimension={dimension}
-            variant={variant || 'list'} // due to backward compatibility we use `list` as the default value
+            variant={variant || 'list'}
             isInverted={isInverted}
           >
-            {string}
+            {item.name}
           </Tag>
-        ))}
+        );
+        if (!item.target) {
+          return tag;
+        }
+
+        const randomId = Math.random().toString(36).substring(2, 15);
+        const tooltipId = `segment-tooltip-${randomId}`;
+        return (
+          <div key={randomId}>
+            {item.tooltip && (
+              <Tooltip id={tooltipId} place="top">
+                {MailPoet.I18n.t('viewFilteredSubscribersMessage')}
+              </Tooltip>
+            )}
+            <a data-tip="" data-for={tooltipId} href={item.target}>
+              {tag}
+            </a>
+          </div>
+        );
+      })}
     </div>
   );
 }
 
-export { Tags };
+function StringTags({ children, strings, ...props }: StringTagsProps) {
+  const tags: TagData[] = strings.map((item) => ({
+    name: item,
+  }));
+  return (
+    <Tags tags={tags} {...props}>
+      {children}
+    </Tags>
+  );
+}
+
+function SegmentTags({ children, segments, ...props }: SegmentTagsProps) {
+  const tags: TagData[] = segments.map((segment) => ({
+    name: segment.name,
+    target: segment.id
+      ? `admin.php?page=mailpoet-subscribers#/filter[segment=${segment.id}]`
+      : undefined,
+    tooltip: MailPoet.I18n.t('viewFilteredSubscribersMessage'),
+  }));
+  return (
+    <Tags tags={tags} {...props}>
+      {children}
+    </Tags>
+  );
+}
+
+function SubscriberTags({
+  children,
+  subscribers,
+  ...props
+}: SubscriberTagsProps) {
+  const tags: TagData[] = subscribers.map((item) => ({
+    name: item.name,
+    target: `admin.php?page=mailpoet-subscribers#/filter[tag=${item.tag_id}]`,
+    tooltip: MailPoet.I18n.t('viewFilteredSubscribersMessage'),
+  }));
+  return (
+    <Tags tags={tags} {...props}>
+      {children}
+    </Tags>
+  );
+}
+
+export { SegmentTags, StringTags, SubscriberTags };

mailpoet/assets/js/src/common/top_bar/mailpoet_logo_responsive.tsx

@@ -5,36 +5,54 @@ import { MailPoetLogoMobile } from './mailpoet_logo_mobile';
 
 type Props = {
   onClick?: () => void;
+  withLink?: boolean;
 };
-export function MailPoetLogoResponsive({ onClick }: Props) {
+export function MailPoetLogoResponsive({ onClick, withLink = true }: Props) {
   const history = useHistory();
+  let logo;
   let onLogoClick = onClick;
   if (!onClick) {
     onLogoClick = () => history.push('/');
   }
-  return (
-    <a
-      role="button"
-      className="mailpoet-top-bar-logo"
-      title={t('topBarLogoTitle')}
-      onClick={onLogoClick}
-      tabIndex={0}
-      onKeyDown={(event) => {
-        if (
-          ['keydown', 'keypress'].includes(event.type) &&
-          ['Enter', ' '].includes(event.key)
-        ) {
-          event.preventDefault();
-          onLogoClick();
-        }
-      }}
-    >
-      <div className="mailpoet-top-bar-logo-desktop">
-        <MailPoetLogo />
+
+  if (withLink) {
+    logo = (
+      <a
+        role="button"
+        className="mailpoet-top-bar-logo"
+        title={t('topBarLogoTitle')}
+        onClick={onLogoClick}
+        tabIndex={0}
+        onKeyDown={(event) => {
+          if (
+            ['keydown', 'keypress'].includes(event.type) &&
+            ['Enter', ' '].includes(event.key)
+          ) {
+            event.preventDefault();
+            onLogoClick();
+          }
+        }}
+      >
+        <div className="mailpoet-top-bar-logo-desktop">
+          <MailPoetLogo />
+        </div>
+        <div className="mailpoet-top-bar-logo-mobile">
+          <MailPoetLogoMobile />
+        </div>
+      </a>
+    );
+  } else {
+    logo = (
+      <div className="mailpoet-top-bar-logo">
+        <div className="mailpoet-top-bar-logo-desktop">
+          <MailPoetLogo />
+        </div>
+        <div className="mailpoet-top-bar-logo-mobile">
+          <MailPoetLogoMobile />
+        </div>
       </div>
-      <div className="mailpoet-top-bar-logo-mobile">
-        <MailPoetLogoMobile />
-      </div>
-    </a>
-  );
+    );
+  }
+
+  return logo;
 }

mailpoet/assets/js/src/common/top_bar/top_bar.tsx

@@ -10,16 +10,22 @@ type Props = {
   children?: ReactNode;
   hasNews?: boolean;
   onBeamerClick?: () => void;
+  logoWithLink?: boolean;
 };
 
-export function TopBar({ children, hasNews, onBeamerClick }: Props) {
+export function TopBar({
+  children,
+  hasNews,
+  onBeamerClick,
+  logoWithLink = true,
+}: Props) {
   const buttonClasses = classnames(
     'mailpoet-top-bar-beamer',
     hasNews ? 'mailpoet-top-bar-beamer-dot' : '',
   );
   return (
     <div className="mailpoet-top-bar">
-      <MailPoetLogoResponsive />
+      <MailPoetLogoResponsive withLink={logoWithLink} />
       <div className="mailpoet-top-bar-children">{children}</div>
       <div className="mailpoet-flex-grow" />
       {onBeamerClick && (

mailpoet/assets/js/src/forms/list.jsx

@@ -7,7 +7,7 @@ import { Button } from 'common';
 import { Listing } from 'listing/listing.jsx';
 import { MailPoet } from 'mailpoet';
 import { plusIcon } from 'common/button/icon/plus';
-import { Tags } from 'common/tag/tags';
+import { SegmentTags } from 'common/tag/tags';
 import { Toggle } from 'common/form/toggle/toggle';
 import { withNpsPoll } from 'nps_poll.jsx';
 import { FormsHeading, onAddNewForm } from './heading';
@@ -248,13 +248,13 @@ class FormListComponent extends Component {
           {actions}
         </td>
         <td className="column" data-colname={MailPoet.I18n.t('segments')}>
-          <Tags segments={segments} dimension="large">
+          <SegmentTags segments={segments} dimension="large">
             {form.settings.segments_selected_by === 'user' && (
               <span className="mailpoet-tags-prefix">
                 {MailPoet.I18n.t('userChoice')}
               </span>
             )}
-          </Tags>
+          </SegmentTags>
         </td>
         <td className="column" data-colname={MailPoet.I18n.t('type')}>
           {placement}

mailpoet/assets/js/src/global.d.ts

@@ -124,6 +124,7 @@ interface Window {
   mailpoet_current_date_time?: string;
   mailpoet_urls: Record<string, string>;
   recaptcha?: unknown;
+  grecaptcha?: any;
   MailPoetForm?: {
     ajax_url: string;
   };
@@ -142,4 +143,5 @@ interface Window {
     name: string;
   }[];
   mailpoet_cdn_url: string;
+  mailpoet_main_page_slug: string;
 }

mailpoet/assets/js/src/mailpoet.ts

@@ -65,6 +65,7 @@ export const MailPoet = {
     window.mailpoet_deactivate_subscriber_after_inactive_days,
   tags: window.mailpoet_tags,
   cdnUrl: window.mailpoet_cdn_url,
+  mainPageSlug: window.mailpoet_main_page_slug,
 } as const;
 
 declare global {

mailpoet/assets/js/src/newsletter_editor/initializer.jsx

@@ -15,7 +15,7 @@ const renderHeading = (newsletterType, newsletterOptions) => {
 
     let buttons = null;
     let onLogoClick = () => {
-      window.location = `admin.php?page=mailpoet-newsletters`;
+      window.location = `admin.php?page=${MailPoet.mainPageSlug}`;
     };
     if (newsletterType === 'automation') {
       const automationId = newsletterOptions.automationId;

mailpoet/assets/js/src/newsletters/automatic_emails/listings.jsx

@@ -13,7 +13,7 @@ import {
 import { Listing } from 'listing/listing.jsx';
 import { MailPoet } from 'mailpoet';
 import { NewsletterTypes } from 'newsletters/types';
-import { ScheduledIcon, Tags, Toggle } from 'common';
+import { ScheduledIcon, StringTags, Toggle } from 'common';
 import { Statistics } from 'newsletters/listings/statistics.jsx';
 
 const mailpoetTrackingEnabled = MailPoet.trackingConfig.emailTrackingEnabled;
@@ -269,13 +269,13 @@ class ListingsComponent extends Component {
       displayText = ReactStringReplace(
         event.listingScheduleDisplayTextPlural,
         '%s',
-        (match, i) => <Tags strings={metaOptionValues} key={i} />,
+        (match, i) => <StringTags strings={metaOptionValues} key={i} />,
       );
     } else {
       displayText = ReactStringReplace(
         event.listingScheduleDisplayText,
         '%s',
-        (match, i) => <Tags strings={metaOptionValues} key={i} />,
+        (match, i) => <StringTags strings={metaOptionValues} key={i} />,
       );
     }
 

mailpoet/assets/js/src/newsletters/campaign_stats/newsletter_stats_info.tsx

@@ -1,7 +1,7 @@
 import { MailPoet } from 'mailpoet';
 import { Heading } from 'common/typography/heading/heading';
 import { Grid } from 'common/grid';
-import { Button, Tags } from 'common';
+import { Button, SegmentTags } from 'common';
 import { NewsletterType } from './newsletter_type';
 
 type Props = {
@@ -28,7 +28,7 @@ export function NewsletterStatsInfo({ newsletter }: Props) {
               {MailPoet.I18n.t('statsToSegments')}
             </span>
             {': '}
-            <Tags dimension="large" segments={newsletter.segments} />
+            <SegmentTags dimension="large" segments={newsletter.segments} />
           </div>
         )}
       </div>

mailpoet/assets/js/src/newsletters/listings/notification.jsx

@@ -15,7 +15,7 @@ import {
   monthDayValues,
   nthWeekDayValues,
 } from 'newsletters/scheduling/common.jsx';
-import { Tags } from 'common/tag/tags';
+import { SegmentTags } from 'common/tag/tags';
 import { Toggle } from 'common/form/toggle/toggle';
 
 import {
@@ -227,7 +227,7 @@ class NewsletterListNotificationComponent extends Component {
     const sendingToSegments = ReactStringReplace(
       MailPoet.I18n.t('sendTo'),
       '%1$s',
-      (match, i) => <Tags segments={newsletter.segments} key={i} />,
+      (match, i) => <SegmentTags segments={newsletter.segments} key={i} />,
     );
 
     // set sending frequency

mailpoet/assets/js/src/newsletters/listings/notification_history.jsx

@@ -11,7 +11,7 @@ import {
   checkCronStatus,
   checkMailerStatus,
 } from 'newsletters/listings/utils.jsx';
-import { Tags } from 'common/tag/tags';
+import { SegmentTags } from 'common/tag/tags';
 
 const mailpoetTrackingEnabled = MailPoet.trackingConfig.emailTrackingEnabled;
 
@@ -147,7 +147,7 @@ const renderItem = (newsletter, actions, meta) => {
         className="column mailpoet-hide-on-mobile"
         data-colname={MailPoet.I18n.t('lists')}
       >
-        <Tags segments={newsletter.segments} dimension="large" />
+        <SegmentTags segments={newsletter.segments} dimension="large" />
       </td>
       {mailpoetTrackingEnabled === true ? (
         <td

mailpoet/assets/js/src/newsletters/listings/re_engagement.jsx

@@ -5,7 +5,7 @@ import { Link, withRouter } from 'react-router-dom';
 import ReactStringReplace from 'react-string-replace';
 
 import { Toggle } from 'common/form/toggle/toggle';
-import { Tags } from 'common/tag/tags';
+import { SegmentTags } from 'common/tag/tags';
 import { ScheduledIcon } from 'common/listings/newsletter_status';
 import { Listing } from 'listing/listing.jsx';
 import { MailPoet } from 'mailpoet';
@@ -238,7 +238,7 @@ class NewsletterListReEngagementComponent extends Component {
     const sendingToSegments = ReactStringReplace(
       MailPoet.I18n.t('sendTo'),
       '%1$s',
-      (match, i) => <Tags segments={newsletter.segments} key={i} />,
+      (match, i) => <SegmentTags segments={newsletter.segments} key={i} />,
     );
 
     let frequencyKey = 'reEngagementFrequencyMonth';

mailpoet/assets/js/src/newsletters/listings/standard.jsx

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import { withRouter } from 'react-router-dom';
 
 import { confirmAlert } from 'common/confirm_alert.jsx';
-import { Tags } from 'common/tag/tags';
+import { SegmentTags } from 'common/tag/tags';
 import { Listing } from 'listing/listing.jsx';
 import { QueueStatus } from 'newsletters/listings/queue_status.jsx';
 import { Statistics } from 'newsletters/listings/statistics.jsx';
@@ -218,7 +218,7 @@ class NewsletterListStandardComponent extends Component {
           className="column mailpoet-hide-on-mobile"
           data-colname={MailPoet.I18n.t('lists')}
         >
-          <Tags segments={newsletter.segments} dimension="large" />
+          <SegmentTags segments={newsletter.segments} dimension="large" />
         </td>
         {mailpoetTrackingEnabled === true ? (
           <td

mailpoet/assets/js/src/newsletters/send/congratulate/congratulate.jsx

@@ -18,7 +18,7 @@ function successPageClosed() {
     action: 'set',
     data: { show_congratulate_after_first_newsletter: false },
   }).always(() => {
-    window.location = window.mailpoet_main_page;
+    window.location = window.mailpoet_emails_page;
   });
 }
 
@@ -60,7 +60,7 @@ function renderFail() {
   return (
     <Fail
       failClicked={() => {
-        window.location = window.mailpoet_main_page;
+        window.location = window.mailpoet_emails_page;
       }}
     />
   );

mailpoet/assets/js/src/public.tsx

@@ -53,13 +53,40 @@ jQuery(($) => {
     Cookies.set(formCookieName, '1', { expires: 182, path: '/' });
   }
 
+  function playCaptcha(e?: Event) {
+    e.preventDefault();
+    const audioSelector = '.mailpoet_captcha_player';
+    const audio = document.querySelector<HTMLAudioElement>(audioSelector);
+    if (!audio) {
+      return;
+    }
+    audio.play().catch(() => {});
+  }
+
   function updateCaptcha(e?: Event) {
-    const captcha = $('img.mailpoet_captcha');
-    if (!captcha.length) return false;
-    const captchaSrc = captcha.attr('src');
-    const hashPos = captchaSrc.indexOf('#');
-    const newSrc = hashPos > 0 ? captchaSrc.substring(0, hashPos) : captchaSrc;
-    captcha.attr('src', `${newSrc}#${new Date().getTime()}`);
+    const imgSelector = 'img.mailpoet_captcha';
+    const audioSelector = '.mailpoet_captcha_player';
+    const captcha = document.querySelector(imgSelector);
+    const audioCaptcha =
+      document.querySelector<HTMLAudioElement>(audioSelector);
+    if (!captcha || !audioCaptcha) {
+      return false;
+    }
+    const audioCaptchaSource = audioCaptcha.querySelector('source');
+    let captchaSrc = captcha.getAttribute('src');
+    let hashPos = captchaSrc.indexOf('#');
+    let newSrc = hashPos > 0 ? captchaSrc.substring(0, hashPos) : captchaSrc;
+    captcha.setAttribute('src', `${newSrc}#${new Date().getTime()}`);
+
+    captchaSrc = audioCaptchaSource.getAttribute('src');
+    hashPos = captchaSrc.indexOf('&cachebust=');
+    newSrc = hashPos > 0 ? captchaSrc.substring(0, hashPos) : captchaSrc;
+    audioCaptchaSource.setAttribute(
+      'src',
+      `${newSrc}&cachebust=${new Date().getTime()}`,
+    );
+    audioCaptcha.load();
+
     if (e) e.preventDefault();
     return true;
   }
@@ -198,7 +225,7 @@ jQuery(($) => {
       }
 
       const widgetId = window.grecaptcha.render(container, params);
-      field.val(widgetId);
+      field.val(widgetId as string);
     }
   }
 
@@ -448,6 +475,7 @@ jQuery(($) => {
     });
 
     $('.mailpoet_captcha_update').on('click', updateCaptcha);
+    $('.mailpoet_captcha_audio').on('click', playCaptcha);
 
     // Manage subscription form
     $('.mailpoet-manage-subscription').on('submit', (event) => {

mailpoet/assets/js/src/settings/pages/advanced/reinstall.tsx

@@ -1,5 +1,6 @@
 import { useContext } from 'react';
 
+import { MailPoet } from 'mailpoet';
 import { Button } from 'common/button/button';
 import { t } from 'common/functions';
 import { GlobalContext } from 'context';
@@ -24,7 +25,7 @@ export function Reinstall() {
           { scroll: true },
         );
       } else {
-        window.location.href = 'admin.php?page=mailpoet-newsletters';
+        window.location.href = `admin.php?page=${MailPoet.mainPageSlug}`;
       }
     }
   };

mailpoet/assets/js/src/settings/pages/key_activation/key_activation.tsx

@@ -1,5 +1,7 @@
 import { useContext } from 'react';
 import { MailPoet } from 'mailpoet';
+import { STORE_NAME } from 'settings/store/store_name';
+import { select } from '@wordpress/data';
 import { useAction, useSelector, useSetting } from 'settings/store/hooks';
 import { GlobalContext } from 'context';
 import { Button } from 'common/button/button';
@@ -8,6 +10,7 @@ import { Input } from 'common/form/input/input';
 import { KeyActivationState, MssStatus } from 'settings/store/types';
 import { Inputs, Label } from 'settings/components';
 import { SetFromAddressModal } from 'common/set_from_address_modal';
+import ReactStringReplace from 'react-string-replace';
 import {
   KeyMessages,
   MssMessages,
@@ -79,7 +82,39 @@ function Messages(
   );
 }
 
-export function KeyActivation() {
+type Props = {
+  subscribersCount: number;
+};
+
+const premiumTabDescription = ReactStringReplace(
+  t('premiumTabDescription'),
+  /\[link\](.*?)\[\/link\]/g,
+  (text) => (
+    <a
+      href="https://account.mailpoet.com/account?utm_source=plugin&utm_medium=settings&utm_campaign=activate-existing-plan&ref=settings-key-activation"
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      {text}
+    </a>
+  ),
+);
+
+const premiumTabGetKey = ReactStringReplace(
+  t('premiumTabGetKey'),
+  /\[link\](.*?)\[\/link\]/g,
+  (text) => (
+    <a
+      href="https://account.mailpoet.com/account?utm_source=plugin&utm_medium=settings&utm_campaign=activate-existing-plan&ref=settings-key-activation"
+      target="_blank"
+      rel="noopener noreferrer"
+    >
+      {text}
+    </a>
+  ),
+);
+
+export function KeyActivation({ subscribersCount }: Props) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const { notices } = useContext<any>(GlobalContext);
   const state = useSelector('getKeyActivationState')();
@@ -123,7 +158,11 @@ export function KeyActivation() {
     MailPoet.Modal.loading(true);
     setState({ inProgress: true });
     await verifyMssKey(state.key);
-    await sendCongratulatoryMssEmail();
+    const currentMssStatus =
+      select(STORE_NAME).getKeyActivationState().mssStatus;
+    if (currentMssStatus === MssStatus.VALID_MSS_ACTIVE) {
+      await sendCongratulatoryMssEmail();
+    }
     await verifyPremiumKey(state.key);
     setState({ inProgress: false });
     MailPoet.Modal.loading(false);
@@ -141,7 +180,29 @@ export function KeyActivation() {
       <Label
         htmlFor="mailpoet_premium_key"
         title={t('premiumTabActivationKeyLabel')}
-        description={t('premiumTabDescription')}
+        description={
+          <>
+            {premiumTabDescription}
+            <br />
+            <br />
+            {premiumTabGetKey}
+            <br />
+            <br />
+            {ReactStringReplace(
+              t('premiumTabGetPlan'),
+              /\[link\](.*?)\[\/link\]/g,
+              (text) => (
+                <a
+                  href={`https://account.mailpoet.com/?s=${subscribersCount}&utm_source=plugin&utm_medium=settings&utm_campaign=create-new-plan&ref=settings-key-activation`}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  {text}
+                </a>
+              ),
+            )}
+          </>
+        }
       />
       <Inputs>
         <Input

mailpoet/assets/js/src/settings/settings.tsx

@@ -78,7 +78,7 @@ export function Settings() {
           title={t('keyActivationTab')}
           automationId="activation_settings_tab"
         >
-          <KeyActivation />
+          <KeyActivation subscribersCount={window.mailpoet_subscribers_count} />
         </Tab>
       </RoutedTabs>
     </>

mailpoet/assets/js/src/settings/store/actions/mss_and_premium.ts

@@ -9,7 +9,7 @@ import {
   PremiumStatus,
 } from 'settings/store/types';
 import { updateKeyActivationState } from './key_activation';
-import { setSettings, setSetting } from './settings';
+import { setSetting, setSettings } from './settings';
 import { getMssStatus } from '../make_default_state';
 
 export function* verifyMssKey(key: string) {
@@ -29,6 +29,11 @@ export function* verifyMssKey(key: string) {
     mssMessage: res.data.message || null,
   };
 
+  if (res.data.state === 'valid_underprivileged') {
+    fields.mssStatus = MssStatus.VALID_UNDERPRIVILEGED;
+    return updateKeyActivationState(fields);
+  }
+
   const data = select(STORE_NAME).getSettings();
   data.mta_group = 'mailpoet';
   data.mta = { ...data.mta, method: 'MailPoet', mailpoet_api_key: key };

mailpoet/assets/js/src/subscribers/list.jsx

@@ -3,7 +3,7 @@ import jQuery from 'jquery';
 import { Link, useLocation } from 'react-router-dom';
 import PropTypes from 'prop-types';
 
-import { Button, Tags } from 'common';
+import { Button, SegmentTags, SubscriberTags } from 'common';
 import { Listing } from 'listing/listing.jsx';
 import { MailPoet } from 'mailpoet';
 import { Modal } from 'common/modal/modal.tsx';
@@ -439,11 +439,11 @@ function SubscriberList({ match }) {
           {status}
         </td>
         <td className="column" data-colname={MailPoet.I18n.t('lists')}>
-          <Tags segments={subscribedSegments} dimension="large" />
+          <SegmentTags segments={subscribedSegments} dimension="large" />
         </td>
         <td className="column" data-colname={MailPoet.I18n.t('tags')}>
-          <Tags
-            subscriberTags={subscriber.tags}
+          <SubscriberTags
+            subscribers={subscriber.tags}
             variant="wordpress"
             isInverted
           />

mailpoet/assets/js/src/wizard/layout/step_layout.jsx

@@ -4,19 +4,9 @@ import { WelcomeWizardStepLayoutBody } from './step_layout_body.jsx';
 
 function WelcomeWizardStepLayout(props) {
   return (
-    <>
-      <div className="mailpoet-wizard-logo">
-        <img
-          src={window.mailpoet_logo_url}
-          width="160"
-          height="50"
-          alt="MailPoet logo"
-        />
-      </div>
-      <WelcomeWizardStepLayoutBody illustrationUrl={props.illustrationUrl}>
-        {props.children}
-      </WelcomeWizardStepLayoutBody>
-    </>
+    <WelcomeWizardStepLayoutBody illustrationUrl={props.illustrationUrl}>
+      {props.children}
+    </WelcomeWizardStepLayoutBody>
   );
 }
 

mailpoet/assets/js/src/wizard/welcome_wizard_controller.jsx

@@ -17,6 +17,7 @@ import {
 } from './steps_numbers.jsx';
 import { Steps } from '../common/steps/steps';
 import { StepsContent } from '../common/steps/steps_content';
+import { TopBar } from '../common/top_bar/top_bar';
 
 function WelcomeWizardStepsController(props) {
   const stepsCount = getStepsCount();
@@ -101,7 +102,9 @@ function WelcomeWizardStepsController(props) {
 
   return (
     <>
-      <Steps count={stepsCount} current={step} />
+      <TopBar logoWithLink={false}>
+        <Steps count={stepsCount} current={step} />
+      </TopBar>
       <StepsContent>
         {stepName === 'WelcomeWizardSenderStep' ? (
           <WelcomeWizardStepLayout

mailpoet/composer.json

@@ -20,7 +20,7 @@
     "ext-pdo_mysql": "*",
     "ext-xml": "*",
     "ext-zip": "*",
-    "codeception/codeception": "4.1.31",
+    "codeception/codeception": "4.2.2",
     "codeception/module-asserts": "^1.3",
     "codeception/module-cli": "^1.0",
     "codeception/module-db": "^1.1",
@@ -31,7 +31,7 @@
     "consolidation/robo": "3.0.10",
     "guzzlehttp/guzzle": "6.5.8",
     "hoa/console": "^3.17",
-    "lucatume/wp-browser": "3.1.5",
+    "lucatume/wp-browser": "3.1.6",
     "phpunit/phpunit": "8.5.25",
     "totten/lurkerlite": "^1.3",
     "vlucas/phpdotenv": "5.4.1",

mailpoet/composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b59c2173fe3197f3e5227f4038218033",
+    "content-hash": "9af8d15a6fc384da198a0fa3c1fad408",
     "packages": [
         {
             "name": "mtdowling/cron-expression",
@@ -320,16 +320,16 @@
         },
         {
             "name": "codeception/codeception",
-            "version": "4.1.31",
+            "version": "4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "15524571ae0686a7facc2eb1f40f600e5bbce9e5"
+                "reference": "b88014f3348c93f3df99dc6d0967b0dbfa804474"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/15524571ae0686a7facc2eb1f40f600e5bbce9e5",
-                "reference": "15524571ae0686a7facc2eb1f40f600e5bbce9e5",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/b88014f3348c93f3df99dc6d0967b0dbfa804474",
+                "reference": "b88014f3348c93f3df99dc6d0967b0dbfa804474",
                 "shasum": ""
             },
             "require": {
@@ -392,11 +392,11 @@
                 {
                     "name": "Michael Bodnarchuk",
                     "email": "davert@mail.ua",
-                    "homepage": "http://codegyre.com"
+                    "homepage": "https://codegyre.com"
                 }
             ],
             "description": "BDD-style testing framework",
-            "homepage": "http://codeception.com/",
+            "homepage": "https://codeception.com/",
             "keywords": [
                 "BDD",
                 "TDD",
@@ -406,7 +406,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/Codeception/issues",
-                "source": "https://github.com/Codeception/Codeception/tree/4.1.31"
+                "source": "https://github.com/Codeception/Codeception/tree/4.2.2"
             },
             "funding": [
                 {
@@ -414,7 +414,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2022-03-13T17:07:08+00:00"
+            "time": "2022-08-13T13:28:25+00:00"
         },
         {
             "name": "codeception/lib-asserts",
@@ -628,16 +628,16 @@
         },
         {
             "name": "codeception/module-webdriver",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/module-webdriver.git",
-                "reference": "baa18b7bf70aa024012f967b5ce5021e1faa9151"
+                "reference": "e22ac7da756df659df6dd4fac2dff9c859e30131"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/baa18b7bf70aa024012f967b5ce5021e1faa9151",
-                "reference": "baa18b7bf70aa024012f967b5ce5021e1faa9151",
+                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/e22ac7da756df659df6dd4fac2dff9c859e30131",
+                "reference": "e22ac7da756df659df6dd4fac2dff9c859e30131",
                 "shasum": ""
             },
             "require": {
@@ -678,9 +678,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Codeception/module-webdriver/issues",
-                "source": "https://github.com/Codeception/module-webdriver/tree/1.4.0"
+                "source": "https://github.com/Codeception/module-webdriver/tree/1.4.1"
             },
-            "time": "2021-09-02T12:01:02+00:00"
+            "time": "2022-09-12T05:09:51+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
@@ -3548,16 +3548,16 @@
         },
         {
             "name": "lucatume/wp-browser",
-            "version": "3.1.5",
+            "version": "3.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lucatume/wp-browser.git",
-                "reference": "d797924151167eac745ea57768df0da4f9ed2502"
+                "reference": "5cefdab50d16f69447c48e5a8668d67d4892d6ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lucatume/wp-browser/zipball/d797924151167eac745ea57768df0da4f9ed2502",
-                "reference": "d797924151167eac745ea57768df0da4f9ed2502",
+                "url": "https://api.github.com/repos/lucatume/wp-browser/zipball/5cefdab50d16f69447c48e5a8668d67d4892d6ef",
+                "reference": "5cefdab50d16f69447c48e5a8668d67d4892d6ef",
                 "shasum": ""
             },
             "require": {
@@ -3641,7 +3641,7 @@
             ],
             "support": {
                 "issues": "https://github.com/lucatume/wp-browser/issues",
-                "source": "https://github.com/lucatume/wp-browser/tree/3.1.5"
+                "source": "https://github.com/lucatume/wp-browser/tree/3.1.6"
             },
             "funding": [
                 {
@@ -3649,7 +3649,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-16T08:39:22+00:00"
+            "time": "2022-04-28T06:45:08+00:00"
         },
         {
             "name": "mck89/peast",

mailpoet/index.php

@@ -1,3 +1,3 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 // Silence is golden

mailpoet/lib-3rd-party/CSS.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 namespace MailPoetVendor;
 
 use MailPoet\Util\pQuery\DomNode;

mailpoet/lib-3rd-party/Idiorm/idiorm.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoetVendor\Idiorm;
 

mailpoet/lib-3rd-party/Paris/paris.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoetVendor\Paris;
 

mailpoet/lib-3rd-party/Sudzy/Engine.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoetVendor\Sudzy;
 

mailpoet/lib-3rd-party/Sudzy/ValidModel.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 namespace MailPoetVendor\Sudzy;
 
 use MailPoetVendor\Paris\Model;

mailpoet/lib-3rd-party/Sudzy/ValidationException.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoetVendor\Sudzy;
 

mailpoet/lib-3rd-party/XLSXWriter.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoetVendor;
 

mailpoet/lib-3rd-party/pquery/IQuery.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoetVendor\pQuery;
 

mailpoet/lib-3rd-party/pquery/gan_formatter.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 /**
  * @author Niels A.D.
  * @author Todd Burry <todd@vanillaforums.com>

mailpoet/lib-3rd-party/pquery/gan_node_html.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 /**
  * @author Niels A.D.
  * @author Todd Burry <todd@vanillaforums.com>

mailpoet/lib-3rd-party/pquery/gan_parser_html.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 /**
  * @author Niels A.D.
  * @author Todd Burry <todd@vanillaforums.com>

mailpoet/lib-3rd-party/pquery/gan_selector_html.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 /**
  * @author Niels A.D.
  * @author Todd Burry <todd@vanillaforums.com>

mailpoet/lib-3rd-party/pquery/gan_tokenizer.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 /**
  * @author Niels A.D.
  * @author Todd Burry <todd@vanillaforums.com>

mailpoet/lib-3rd-party/pquery/gan_xml2array.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 /**
  * @author Niels A.D.
  * @author Todd Burry <todd@vanillaforums.com>

mailpoet/lib-3rd-party/pquery/ganon.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 /**
  * @author Niels A.D.
  * @author Todd Burry <todd@vanillaforums.com>

mailpoet/lib-3rd-party/pquery/pQuery.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 /**
  * @author Niels A.D.
  * @author Todd Burry <todd@vanillaforums.com>

mailpoet/lib-3rd-party/pquery/third_party/jsminplus.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoetVendor\pQuery;
 

mailpoet/lib/API/API.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoet\API;
 

mailpoet/lib/API/JSON/API.php

@@ -1,11 +1,11 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoet\API\JSON;
 
 use MailPoet\Config\AccessControl;
 use MailPoet\Exception;
 use MailPoet\Settings\SettingsController;
-use MailPoet\Subscription\Captcha;
+use MailPoet\Subscription\Captcha\CaptchaConstants;
 use MailPoet\Tracy\ApiPanel\ApiPanel;
 use MailPoet\Tracy\DIPanel\DIPanel;
 use MailPoet\Util\Helpers;
@@ -100,7 +100,7 @@ class API {
     }
 
     $ignoreToken = (
-      $this->settings->get('captcha.type') != Captcha::TYPE_DISABLED &&
+      $this->settings->get('captcha.type') != CaptchaConstants::TYPE_DISABLED &&
       $this->requestEndpoint === 'subscribers' &&
       $this->requestMethod === 'subscribe'
     );

mailpoet/lib/API/JSON/Endpoint.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoet\API\JSON;
 

mailpoet/lib/API/JSON/Error.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoet\API\JSON;
 

mailpoet/lib/API/JSON/ErrorResponse.php

@@ -1,4 +1,4 @@
-<?php
+<?php // phpcs:ignore SlevomatCodingStandard.TypeHints.DeclareStrictTypes.DeclareStrictTypesMissing
 
 namespace MailPoet\API\JSON;