Merge branch 'develop' into cia-2.4.8-beta2-develop-2.4-develop-sync-11232024

Author: pawan-adobe-security

README.md

@@ -11,9 +11,9 @@ disclosure practices.
 
 - Complete documentation located on the project [wiki pages](https://github.com/magento/security-package/wiki):
     - How to start local development described in the [installation guide](https://github.com/magento/security-package/wiki/Metapackage-Installation-Guide)
-    - Two-factor authentication [user guide](https://docs.magento.com/user-guide/stores/security-two-factor-authentication.html) and [technical guide](https://developer.adobe.com/commerce/testing/functional-testing-framework/two-factor-authentication/).
-    - Google ReCAPTCHA [user guide](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html) and [technical guide](https://experienceleague.adobe.com/docs/commerce-admin/systems/security/captcha/security-google-recaptcha.html).
-    - Security.txt [user guide](https://docs.magento.com/user-guide/configuration/security/security-txt.html) and [technical guide](https://experienceleague.adobe.com/docs/commerce-operations/configuration-guide/security/security-txt.html).
+    - Two-factor authentication [user guide](https://experienceleague.adobe.com/en/docs/commerce-admin/systems/security/2fa/security-two-factor-authentication) and [technical guide](https://developer.adobe.com/commerce/testing/functional-testing-framework/two-factor-authentication/).
+    - Google ReCAPTCHA [user guide](https://experienceleague.adobe.com/en/docs/commerce-admin/systems/security/captcha/security-google-recaptcha) and [technical guide](https://experienceleague.adobe.com/docs/commerce-admin/systems/security/captcha/security-google-recaptcha.html).
+    - Security.txt [user guide](https://experienceleague.adobe.com/en/docs/commerce-admin/config/security/security-txt) and [technical guide](https://experienceleague.adobe.com/docs/commerce-operations/configuration-guide/security/security-txt.html).
 
 ## Community Engineering Slack
 

ReCaptchaAdminUi/README.md

@@ -4,4 +4,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
 
 This module provides the reCAPTCHA UI files related to views in the admin panel.
 
-For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
+For more information please visit the [reCAPTCHA documentation](https://experienceleague.adobe.com/en/docs/commerce-admin/systems/security/captcha/security-google-recaptcha).

ReCaptchaAdminUi/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-admin-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-config": "*",
         "magento/module-re-captcha-ui": "*",

ReCaptchaCheckout/README.md

@@ -4,4 +4,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
 
 This module provides the reCAPTCHA implementations related to checkout.
 
-For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
+For more information please visit the [reCAPTCHA documentation](https://experienceleague.adobe.com/en/docs/commerce-admin/systems/security/captcha/security-google-recaptcha).

ReCaptchaCheckout/Test/Unit/Block/LayoutProcessor/Checkout/OnepageTest.php

@@ -119,7 +119,7 @@ public function testProcess(array $mocks, array $expected): void
         $this->assertSame($expected, $actual);
     }
 
-    public function processDataProvider(): array
+    public static function processDataProvider(): array
     {
         return [
             [

ReCaptchaCheckout/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-checkout",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
         "magento/module-re-captcha-ui": "*",

ReCaptchaCheckoutSalesRule/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-checkout-sales-rule",
     "description": "Google ReCaptcha integration for Magento2 coupons",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
         "magento/module-sales-rule": "*",

ReCaptchaContact/README.md

@@ -4,4 +4,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
 
 This module provides the reCAPTCHA implementations related to the contact page.
 
-For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
+For more information please visit the [reCAPTCHA documentation](https://experienceleague.adobe.com/en/docs/commerce-admin/systems/security/captcha/security-google-recaptcha).

ReCaptchaContact/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-contact",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*"
     },

ReCaptchaCustomer/README.md

@@ -4,4 +4,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
 
 This module provides the reCAPTCHA implementations related to customer actions.
 
-For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
+For more information please visit the [reCAPTCHA documentation](https://experienceleague.adobe.com/en/docs/commerce-admin/systems/security/captcha/security-google-recaptcha).