Skip to content

Commit cbfb7e1

Browse files
pawan-adobe-securitypawan-adobe-security
authored
Merge pull request #184 from magento-cia/cia-2.4.8-beta2-develop-2.4-develop-sync-11232024
Cia 2.4.8 beta2 develop 2.4 develop sync 11232024
2 parents 442bb83 + 7c74783 commit cbfb7e1

File tree

70 files changed

+182
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+182
-122
lines changed

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ disclosure practices.
1111

1212
- Complete documentation located on the project [wiki pages](https://github.com/magento/security-package/wiki):
1313
- How to start local development described in the [installation guide](https://github.com/magento/security-package/wiki/Metapackage-Installation-Guide)
14-
- 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/).
15-
- 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).
16-
- 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).
14+
- 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/).
15+
- 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).
16+
- 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).
1717

1818
## Community Engineering Slack
1919

‎ReCaptchaAdminUi/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
44

55
This module provides the reCAPTCHA UI files related to views in the admin panel.
66

7-
For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
7+
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-re-captcha-admin-ui",
33
"description": "Google reCAPTCHA integration for Magento2",
44
"require": {
5-
"php": "~8.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0",
66
"magento/framework": "*",
77
"magento/module-config": "*",
88
"magento/module-re-captcha-ui": "*",

‎ReCaptchaCheckout/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
44

55
This module provides the reCAPTCHA implementations related to checkout.
66

7-
For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
7+
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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);
@@ -119,7 +120,7 @@ public function testProcess(array $mocks, array $expected): void
119120
$this->assertSame($expected, $actual);
120121
}
121122

122-
public function processDataProvider(): array
123+
public static function processDataProvider(): array
123124
{
124125
return [
125126
[

‎ReCaptchaCheckout/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-re-captcha-checkout",
33
"description": "Google reCAPTCHA integration for Magento2",
44
"require": {
5-
"php": "~8.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0",
66
"magento/framework": "*",
77
"magento/module-checkout": "*",
88
"magento/module-re-captcha-ui": "*",

‎ReCaptchaCheckoutSalesRule/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-re-captcha-checkout-sales-rule",
33
"description": "Google ReCaptcha integration for Magento2 coupons",
44
"require": {
5-
"php": "~8.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0",
66
"magento/framework": "*",
77
"magento/module-checkout": "*",
88
"magento/module-sales-rule": "*",

‎ReCaptchaContact/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
44

55
This module provides the reCAPTCHA implementations related to the contact page.
66

7-
For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
7+
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-re-captcha-contact",
33
"description": "Google reCAPTCHA integration for Magento2",
44
"require": {
5-
"php": "~8.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0",
66
"magento/framework": "*",
77
"magento/module-re-captcha-ui": "*"
88
},

‎ReCaptchaCustomer/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
44

55
This module provides the reCAPTCHA implementations related to customer actions.
66

7-
For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
7+
For more information please visit the [reCAPTCHA documentation](https://experienceleague.adobe.com/en/docs/commerce-admin/systems/security/captcha/security-google-recaptcha).

‎ReCaptchaCustomer/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-re-captcha-customer",
33
"description": "Google reCAPTCHA integration for Magento2",
44
"require": {
5-
"php": "~8.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0",
66
"magento/framework": "*",
77
"magento/module-customer": "*",
88
"magento/module-re-captcha-ui": "*",

‎ReCaptchaFrontendUi/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
44

55
This module provides the UI related to customer-facing reCAPTCHA views.
66

7-
For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
7+
For more information please visit the [reCAPTCHA documentation](https://experienceleague.adobe.com/en/docs/commerce-admin/systems/security/captcha/security-google-recaptcha).

‎ReCaptchaFrontendUi/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-re-captcha-frontend-ui",
33
"description": "Google reCAPTCHA integration for Magento2",
44
"require": {
5-
"php": "~8.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0",
66
"magento/framework": "*",
77
"magento/module-store": "*",
88
"magento/module-re-captcha-ui": "*"

‎ReCaptchaMigration/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Magento reCAPTCHA
22

3-
Google reCAPTCHA ensures that a human being, rather than a computer (or “bot”), is interacting with your website. Unlike the standard Magento CAPTCHA, Google reCAPTCHA provides enhanced security with a selection of different display options and methods. Additional website traffic information is available in the dashboard of your Google reCAPTCHA account.
3+
Google reCAPTCHA ensures that a human being, rather than a computer (or "bot"), is interacting with your website. Unlike the standard Magento CAPTCHA, Google reCAPTCHA provides enhanced security with a selection of different display options and methods. Additional website traffic information is available in the dashboard of your Google reCAPTCHA account.
44

55
This module helps migrate data from the old reCAPTCHA implementation to the new one.
66

7-
For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
7+
For more information please visit the [reCAPTCHA documentation](https://experienceleague.adobe.com/en/docs/commerce-admin/systems/security/captcha/security-google-recaptcha).

‎ReCaptchaMigration/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-re-captcha-migration",
33
"description": "Google reCAPTCHA config migration for Magento2",
44
"require": {
5-
"php": "~8.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0",
66
"magento/framework": "*",
77
"magento/module-config": "*"
88
},

‎ReCaptchaNewsletter/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
44

55
This module provides the reCAPTCHA implementations related to newsletter subscriptions.
66

7-
For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
7+
For more information please visit the [reCAPTCHA documentation](https://experienceleague.adobe.com/en/docs/commerce-admin/systems/security/captcha/security-google-recaptcha).

‎ReCaptchaNewsletter/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-re-captcha-newsletter",
33
"description": "Google reCAPTCHA integration for Magento2",
44
"require": {
5-
"php": "~8.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0",
66
"magento/framework": "*",
77
"magento/module-re-captcha-ui": "*",
88
"magento/module-re-captcha-validation-api": "*",

‎ReCaptchaPaypal/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Google reCAPTCHA ensures that a human being, rather than a computer (or “bot
44

55
This module provides the reCAPTCHA implementations related to PayPal payments.
66

7-
For more information please visit the [Magento document for reCAPTCHA](https://docs.magento.com/user-guide/stores/security-google-recaptcha.html).
7+
For more information please visit the [reCAPTCHA documentation](https://experienceleague.adobe.com/en/docs/commerce-admin/systems/security/captcha/security-google-recaptcha).

‎ReCaptchaPaypal/Test/Unit/Block/LayoutProcessor/Checkout/OnepageTest.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);
@@ -107,7 +108,7 @@ public function testProcess(array $mocks, array $expected): void
107108
/**
108109
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
109110
*/
110-
public function processDataProvider(): array
111+
public static function processDataProvider(): array
111112
{
112113
return [
113114
[

‎ReCaptchaPaypal/Test/Unit/Observer/PayPalObserverTest.php

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);
@@ -114,7 +115,7 @@ public function testExecute(array $mocks): void
114115
$this->model->execute($this->observer);
115116
}
116117

117-
public function executeDataProvider(): array
118+
public static function executeDataProvider(): array
118119
{
119120
return [
120121
[
@@ -131,7 +132,7 @@ public function executeDataProvider(): array
131132
'reCaptchaSession' => [
132133
[
133134
'method' => 'save',
134-
'expects' => $this->never(),
135+
'expects' => self::never(),
135136
]
136137
]
137138
]
@@ -150,20 +151,20 @@ public function executeDataProvider(): array
150151
'reCaptchaSession' => [
151152
[
152153
'method' => 'save',
153-
'expects' => $this->never(),
154+
'expects' => self::never(),
154155
]
155156
],
156157
'captchaValidator' => [
157158
[
158159
'method' => 'isValid',
159-
'expects' => $this->once(),
160+
'expects' => self::once(),
160161
'willReturnProperty' => 'validationResult'
161162
]
162163
],
163164
'validationResult' => [
164165
[
165166
'method' => 'isValid',
166-
'expects' => $this->once(),
167+
'expects' => self::once(),
167168
'willReturn' => true,
168169
]
169170
]
@@ -183,20 +184,20 @@ public function executeDataProvider(): array
183184
'reCaptchaSession' => [
184185
[
185186
'method' => 'save',
186-
'expects' => $this->once(),
187+
'expects' => self::once(),
187188
]
188189
],
189190
'captchaValidator' => [
190191
[
191192
'method' => 'isValid',
192-
'expects' => $this->once(),
193+
'expects' => self::once(),
193194
'willReturnProperty' => 'validationResult'
194195
]
195196
],
196197
'validationResult' => [
197198
[
198199
'method' => 'isValid',
199-
'expects' => $this->once(),
200+
'expects' => self::once(),
200201
'willReturn' => true,
201202
]
202203
]

0 commit comments

Comments
 (0)