magento · lenaorobei · May 28, 2020 · Mar 19, 2020 · Mar 31, 2020 · Apr 1, 2020
diff --git a/ReCaptchaAdminUi/Block/Adminhtml/System/Config/Form/Field/Notice.php b/ReCaptchaAdminUi/Block/Adminhtml/System/Config/Form/Field/Notice.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptchaAdminUi\Block\Adminhtml\System\Config\Form\Field;
+
+use Magento\Config\Block\System\Config\Form\Field;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+/**
+ * Class for Notice
+ */
+class Notice extends Field
+{
+
+    /**
+     * Render text
+     *
+     * @param AbstractElement $element
+     *
+     * @return string
+     */
+    public function render(AbstractElement $element)
+    {
+        $html = '<td colspan="4"><p class="' . $element->getId() . '_notice">' . '<strong>' . __('Important:')
+            . ' ' . '</strong>' . ' <span>' . __('Please note, for reCAPTCHA to be enabled,
+        the valid "Google API Website Key" and "Google API Secret Key" fields are required.') . '</span>' . '</p></td>';
+
+        return $this->_decorateRowHtml($element, $html);
+    }
+}
diff --git a/ReCaptchaAdminUi/composer.json b/ReCaptchaAdminUi/composer.json
@@ -2,8 +2,9 @@
     "name": "magento/module-re-captcha-admin-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
+        "magento/module-config": "*",
         "magento/module-re-captcha-ui": "*"
     },
     "type": "magento2-module",

diff --git a/ReCaptchaAdminUi/etc/adminhtml/system.xml b/ReCaptchaAdminUi/etc/adminhtml/system.xml
@@ -22,6 +22,10 @@
             <group id="type_for" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="0"
                    showInStore="0">
                 <label>Admin Panel</label>
+                <field id="recaptcha_backend_info_heading" translate="label" sortOrder="100" showInDefault="1"
+                       showInWebsite="0" showInStore="0" >
+                    <frontend_model>Magento\ReCaptchaAdminUi\Block\Adminhtml\System\Config\Form\Field\Notice</frontend_model>
+                </field>
             </group>
         </section>
 
@@ -35,6 +39,10 @@
             <group id="type_for" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="1"
                    showInStore="0">
                 <label>Storefront</label>
+                <field id="recaptcha_frontend_info_heading" translate="label" sortOrder="100" showInDefault="1"
+                       showInWebsite="1" showInStore="0">
+                    <frontend_model>Magento\ReCaptchaAdminUi\Block\Adminhtml\System\Config\Form\Field\Notice</frontend_model>
+                </field>
             </group>
         </section>
     </system>

diff --git a/ReCaptchaAdminUi/view/adminhtml/web/css/source/_module.less b/ReCaptchaAdminUi/view/adminhtml/web/css/source/_module.less
@@ -0,0 +1,10 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+.recaptcha_backend_type_for_recaptcha_backend_info_heading_notice,
+.recaptcha_frontend_type_for_recaptcha_frontend_info_heading_notice {
+    strong {
+        color: @grid-severity-critical-color;
+    }
+}
diff --git a/ReCaptchaCheckout/composer.json b/ReCaptchaCheckout/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-checkout",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
         "magento/module-re-captcha-ui": "*"

diff --git a/ReCaptchaContact/Test/Integration/ContactFormTest.php b/ReCaptchaContact/Test/Integration/ContactFormTest.php
@@ -178,8 +178,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
         self::assertNotEmpty($content);
 
         $shouldContainReCaptcha
-            ? self::assertContains('field-recaptcha', $content)
-            : self::assertNotContains('field-recaptcha', $content);
+            ? self::assertStringContainsString('field-recaptcha', $content)
+            : self::assertStringNotContainsString('field-recaptcha', $content);
 
         self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
     }
@@ -193,7 +193,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void
         $this->makePostRequest($postValues);
 
         $this->assertSessionMessages(
-            self::contains(
+            self::containsEqual(
                 "Thanks for contacting us with your comments and questions. We&#039;ll respond to you very soon."
             ),
             MessageInterface::TYPE_SUCCESS

diff --git a/ReCaptchaContact/composer.json b/ReCaptchaContact/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-contact",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*"
     },

diff --git a/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php b/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php
@@ -18,7 +18,7 @@
 use Magento\TestFramework\App\MutableScopeConfig;
 use Magento\TestFramework\TestCase\AbstractController;
 use PHPUnit\Framework\MockObject\MockObject;
-use Zend\Http\Headers;
+use Laminas\Http\Headers;
 
 /**
  * @magentoDataFixture Magento/Customer/_files/customer.php
@@ -188,8 +188,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
         self::assertNotEmpty($content);
 
         $shouldContainReCaptcha
-            ? $this->assertContains('recaptcha-popup-login', $content)
-            : $this->assertNotContains('recaptcha-popup-login', $content);
+            ? $this->assertStringContainsString('recaptcha-popup-login', $content)
+            : $this->assertStringNotContainsString('recaptcha-popup-login', $content);
 
         self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
     }

diff --git a/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php b/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php
@@ -25,6 +25,7 @@
 /**
  * @magentoAppArea frontend
  * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CreateCustomerFormTest extends AbstractController
 {
@@ -201,8 +202,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
         self::assertNotEmpty($content);
 
         $shouldContainReCaptcha
-            ? $this->assertContains('field-recaptcha', $content)
-            : $this->assertNotContains('field-recaptcha', $content);
+            ? $this->assertStringContainsString('field-recaptcha', $content)
+            : $this->assertStringNotContainsString('field-recaptcha', $content);
 
         self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
     }

diff --git a/ReCaptchaCustomer/Test/Integration/ForgotPasswordFormTest.php b/ReCaptchaCustomer/Test/Integration/ForgotPasswordFormTest.php
@@ -195,8 +195,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
         self::assertNotEmpty($content);
 
         $shouldContainReCaptcha
-            ? $this->assertContains('field-recaptcha', $content)
-            : $this->assertNotContains('field-recaptcha', $content);
+            ? $this->assertStringContainsString('field-recaptcha', $content)
+            : $this->assertStringNotContainsString('field-recaptcha', $content);
 
         self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
     }

diff --git a/ReCaptchaCustomer/Test/Integration/LoginFromTest.php b/ReCaptchaCustomer/Test/Integration/LoginFromTest.php
@@ -195,8 +195,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
         self::assertNotEmpty($content);
 
         $shouldContainReCaptcha
-            ? $this->assertContains('field-recaptcha', $content)
-            : $this->assertNotContains('field-recaptcha', $content);
+            ? $this->assertStringContainsString('field-recaptcha', $content)
+            : $this->assertStringNotContainsString('field-recaptcha', $content);
 
         self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
     }

diff --git a/ReCaptchaCustomer/composer.json b/ReCaptchaCustomer/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-customer",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-re-captcha-ui": "*",

diff --git a/ReCaptchaFrontendUi/composer.json b/ReCaptchaFrontendUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-frontend-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-re-captcha-ui": "*"

diff --git a/ReCaptchaMigration/composer.json b/ReCaptchaMigration/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-migration",
     "description": "Google reCAPTCHA config migration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-config": "*"
     },

diff --git a/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php b/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php
@@ -54,7 +54,7 @@ class NewsletterFormTest extends AbstractController
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->mutableScopeConfig = $this->_objectManager->get(MutableScopeConfig::class);
@@ -192,8 +192,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
         self::assertNotEmpty($content);
 
         $shouldContainReCaptcha
-            ? self::assertContains('field-recaptcha', $content)
-            : self::assertNotContains('field-recaptcha', $content);
+            ? self::assertStringContainsString('field-recaptcha', $content)
+            : self::assertStringNotContainsString('field-recaptcha', $content);
 
         self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
     }
@@ -207,7 +207,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void
         $this->makePostRequest($postValues);
 
         $this->assertSessionMessages(
-            self::contains(
+            self::containsEqual(
                 'Thank you for your subscription.'
             ),
             MessageInterface::TYPE_SUCCESS

diff --git a/ReCaptchaNewsletter/composer.json b/ReCaptchaNewsletter/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-newsletter",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*"
     },

diff --git a/ReCaptchaPaypal/composer.json b/ReCaptchaPaypal/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-paypal",
     "description": "Google reCaptcha integration for Magento2 PayPal PayflowPro payment form",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*",

diff --git a/ReCaptchaReview/Test/Integration/ReviewFormTest.php b/ReCaptchaReview/Test/Integration/ReviewFormTest.php
@@ -188,8 +188,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
         self::assertNotEmpty($content);
 
         $shouldContainReCaptcha
-            ? self::assertContains('field-recaptcha', $content)
-            : self::assertNotContains('field-recaptcha', $content);
+            ? self::assertStringContainsString('field-recaptcha', $content)
+            : self::assertStringNotContainsString('field-recaptcha', $content);
 
         self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
     }
@@ -203,7 +203,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void
         $this->makePostRequest($postValues);
 
         $this->assertSessionMessages(
-            self::contains(
+            self::containsEqual(
                 'You submitted your review for moderation.'
             ),
             MessageInterface::TYPE_SUCCESS

diff --git a/ReCaptchaReview/composer.json b/ReCaptchaReview/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-review",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*"
     },

diff --git a/ReCaptchaSendFriend/Test/Integration/SendFriendFormTest.php b/ReCaptchaSendFriend/Test/Integration/SendFriendFormTest.php
@@ -211,8 +211,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
         self::assertNotEmpty($content);
 
         $shouldContainReCaptcha
-            ? self::assertContains('field-recaptcha', $content)
-            : self::assertNotContains('field-recaptcha', $content);
+            ? self::assertStringContainsString('field-recaptcha', $content)
+            : self::assertStringNotContainsString('field-recaptcha', $content);
 
         self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
     }
@@ -226,7 +226,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void
         $this->makePostRequest($postValues);
 
         $this->assertSessionMessages(
-            self::contains(
+            self::containsEqual(
                 'The link to a friend was sent.'
             ),
             MessageInterface::TYPE_SUCCESS

diff --git a/ReCaptchaSendFriend/composer.json b/ReCaptchaSendFriend/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-send-friend",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*"
     },

diff --git a/ReCaptchaUi/composer.json b/ReCaptchaUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-validation-api": "*"
     },

diff --git a/ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php b/ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php
@@ -172,8 +172,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
         self::assertNotEmpty($content);
 
         $shouldContainReCaptcha
-            ? $this->assertContains('admin-recaptcha', $content)
-            : $this->assertNotContains('admin-recaptcha', $content);
+            ? $this->assertStringContainsString('admin-recaptcha', $content)
+            : $this->assertStringNotContainsString('admin-recaptcha', $content);
 
         self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
     }

diff --git a/ReCaptchaUser/Test/Integration/LoginFormTest.php b/ReCaptchaUser/Test/Integration/LoginFormTest.php
@@ -184,8 +184,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
         self::assertNotEmpty($content);
 
         $shouldContainReCaptcha
-            ? $this->assertContains('admin-recaptcha', $content)
-            : $this->assertNotContains('admin-recaptcha', $content);
+            ? $this->assertStringContainsString('admin-recaptcha', $content)
+            : $this->assertStringNotContainsString('admin-recaptcha', $content);
 
         self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
     }

diff --git a/ReCaptchaUser/composer.json b/ReCaptchaUser/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-user",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*"

diff --git a/ReCaptchaUser/etc/adminhtml/system.xml b/ReCaptchaUser/etc/adminhtml/system.xml
@@ -10,13 +10,13 @@
     <system>
         <section id="recaptcha_backend">
             <group id="type_for">
-                <field id="user_login" translate="label" type="select" sortOrder="100" showInDefault="1"
+                <field id="user_login" translate="label" type="select" sortOrder="110" showInDefault="1"
                        showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Enable for Login</label>
                     <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>
                 </field>
 
-                <field id="user_forgot_password" translate="label" type="select" sortOrder="110" showInDefault="1"
+                <field id="user_forgot_password" translate="label" type="select" sortOrder="120" showInDefault="1"
                        showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Enable for Forgot Password</label>
                     <source_model>Magento\ReCaptchaAdminUi\Model\OptionSource\Type</source_model>

diff --git a/ReCaptchaValidation/composer.json b/ReCaptchaValidation/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-validation",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-validation-api": "*",
         "google/recaptcha": "^1.2"

diff --git a/ReCaptchaValidationApi/composer.json b/ReCaptchaValidationApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-validation-api",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",

diff --git a/ReCaptchaVersion2Checkbox/composer.json b/ReCaptchaVersion2Checkbox/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-version-2-checkbox",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-re-captcha-ui": "*",