Skip to content

Commit 78c8882

Browse files
pawan-adobe-securitypawan-adobe-security
committed
Merge branch 'develop' into cia-2.4.8-beta2-develop-2.4-develop-sync-11232024
2 parents 442bb83 + 6507dfd commit 78c8882

File tree

70 files changed

+147
-104
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

+147
-104
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function testProcess(array $mocks, array $expected): void
119119
$this->assertSame($expected, $actual);
120120
}
121121

122-
public function processDataProvider(): array
122+
public static function processDataProvider(): array
123123
{
124124
return [
125125
[

‎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

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function testProcess(array $mocks, array $expected): void
107107
/**
108108
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
109109
*/
110-
public function processDataProvider(): array
110+
public static function processDataProvider(): array
111111
{
112112
return [
113113
[

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function testExecute(array $mocks): void
114114
$this->model->execute($this->observer);
115115
}
116116

117-
public function executeDataProvider(): array
117+
public static function executeDataProvider(): array
118118
{
119119
return [
120120
[
@@ -131,7 +131,7 @@ public function executeDataProvider(): array
131131
'reCaptchaSession' => [
132132
[
133133
'method' => 'save',
134-
'expects' => $this->never(),
134+
'expects' => self::never(),
135135
]
136136
]
137137
]
@@ -150,20 +150,20 @@ public function executeDataProvider(): array
150150
'reCaptchaSession' => [
151151
[
152152
'method' => 'save',
153-
'expects' => $this->never(),
153+
'expects' => self::never(),
154154
]
155155
],
156156
'captchaValidator' => [
157157
[
158158
'method' => 'isValid',
159-
'expects' => $this->once(),
159+
'expects' => self::once(),
160160
'willReturnProperty' => 'validationResult'
161161
]
162162
],
163163
'validationResult' => [
164164
[
165165
'method' => 'isValid',
166-
'expects' => $this->once(),
166+
'expects' => self::once(),
167167
'willReturn' => true,
168168
]
169169
]
@@ -183,20 +183,20 @@ public function executeDataProvider(): array
183183
'reCaptchaSession' => [
184184
[
185185
'method' => 'save',
186-
'expects' => $this->once(),
186+
'expects' => self::once(),
187187
]
188188
],
189189
'captchaValidator' => [
190190
[
191191
'method' => 'isValid',
192-
'expects' => $this->once(),
192+
'expects' => self::once(),
193193
'willReturnProperty' => 'validationResult'
194194
]
195195
],
196196
'validationResult' => [
197197
[
198198
'method' => 'isValid',
199-
'expects' => $this->once(),
199+
'expects' => self::once(),
200200
'willReturn' => true,
201201
]
202202
]

‎ReCaptchaPaypal/Test/Unit/Plugin/ReplayPayflowReCaptchaForPlaceOrderTest.php

+18-18
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ public function testAfterGetConfigFor(array $mocks, bool $isResultNull, bool $is
9696
/**
9797
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
9898
*/
99-
public function afterGetConfigForDataProvider(): array
99+
public static function afterGetConfigForDataProvider(): array
100100
{
101101
return [
102102
[
103103
[
104104
'reCaptchaSession' => [
105-
['method' => 'isValid', 'expects' => $this->never()]
105+
['method' => 'isValid', 'expects' => self::never()]
106106
]
107107
],
108108
true,
@@ -114,7 +114,7 @@ public function afterGetConfigForDataProvider(): array
114114
['method' => 'isCaptchaEnabledFor', 'with' => 'paypal_payflowpro', 'willReturn' => false]
115115
],
116116
'reCaptchaSession' => [
117-
['method' => 'isValid', 'expects' => $this->never(),]
117+
['method' => 'isValid', 'expects' => self::never(),]
118118
]
119119
],
120120
false,
@@ -126,10 +126,10 @@ public function afterGetConfigForDataProvider(): array
126126
['method' => 'isCaptchaEnabledFor', 'with' => 'paypal_payflowpro', 'willReturn' => true]
127127
],
128128
'request' => [
129-
['method' => 'getBodyParams', 'expects' => $this->once(), 'willReturn' => []]
129+
['method' => 'getBodyParams', 'expects' => self::once(), 'willReturn' => []]
130130
],
131131
'reCaptchaSession' => [
132-
['method' => 'isValid', 'expects' => $this->never(),]
132+
['method' => 'isValid', 'expects' => self::never(),]
133133
]
134134
],
135135
false,
@@ -143,12 +143,12 @@ public function afterGetConfigForDataProvider(): array
143143
'request' => [
144144
[
145145
'method' => 'getBodyParams',
146-
'expects' => $this->once(),
146+
'expects' => self::once(),
147147
'willReturn' => ['cartId' => 1, 'paymentMethod' => ['method' => 'checkmo']]
148148
]
149149
],
150150
'reCaptchaSession' => [
151-
['method' => 'isValid', 'expects' => $this->never(), 'willReturn' => false]
151+
['method' => 'isValid', 'expects' => self::never(), 'willReturn' => false]
152152
]
153153
],
154154
false,
@@ -162,12 +162,12 @@ public function afterGetConfigForDataProvider(): array
162162
'request' => [
163163
[
164164
'method' => 'getBodyParams',
165-
'expects' => $this->once(),
165+
'expects' => self::once(),
166166
'willReturn' => ['cartId' => 1, 'paymentMethod' => ['method' => Config::METHOD_PAYFLOWPRO]]
167167
]
168168
],
169169
'reCaptchaSession' => [
170-
['method' => 'isValid', 'expects' => $this->once(), 'with' => 1, 'willReturn' => false]
170+
['method' => 'isValid', 'expects' => self::once(), 'with' => 1, 'willReturn' => false]
171171
]
172172
],
173173
false,
@@ -181,12 +181,12 @@ public function afterGetConfigForDataProvider(): array
181181
'request' => [
182182
[
183183
'method' => 'getBodyParams',
184-
'expects' => $this->once(),
184+
'expects' => self::once(),
185185
'willReturn' => ['cartId' => 1, 'paymentMethod' => ['method' => Config::METHOD_PAYFLOWPRO]]
186186
]
187187
],
188188
'reCaptchaSession' => [
189-
['method' => 'isValid', 'expects' => $this->once(), 'with' => 1, 'willReturn' => true]
189+
['method' => 'isValid', 'expects' => self::once(), 'with' => 1, 'willReturn' => true]
190190
]
191191
],
192192
false,
@@ -200,15 +200,15 @@ public function afterGetConfigForDataProvider(): array
200200
'request' => [
201201
[
202202
'method' => 'getBodyParams',
203-
'expects' => $this->once(),
203+
'expects' => self::once(),
204204
'willReturn' => [
205205
'cart_id' => 1,
206206
'payment_method' => ['method' => Config::METHOD_PAYFLOWPRO]
207207
]
208208
]
209209
],
210210
'reCaptchaSession' => [
211-
['method' => 'isValid', 'expects' => $this->once(), 'with' => 1, 'willReturn' => true]
211+
['method' => 'isValid', 'expects' => self::once(), 'with' => 1, 'willReturn' => true]
212212
]
213213
],
214214
false,
@@ -222,7 +222,7 @@ public function afterGetConfigForDataProvider(): array
222222
'request' => [
223223
[
224224
'method' => 'getBodyParams',
225-
'expects' => $this->once(),
225+
'expects' => self::once(),
226226
'willReturn' => [
227227
'cartId' => '17uc43rge98nc92',
228228
'paymentMethod' => ['method' => Config::METHOD_PAYFLOWPRO]
@@ -232,24 +232,24 @@ public function afterGetConfigForDataProvider(): array
232232
'quoteIdMaskFactory' => [
233233
[
234234
'method' => 'create',
235-
'expects' => $this->once(),
235+
'expects' => self::once(),
236236
'willReturnProperty' => 'quoteIdMask'
237237
]
238238
],
239239
'quoteIdMask' => [
240240
[
241241
'method' => 'load',
242-
'expects' => $this->once(),
242+
'expects' => self::once(),
243243
'willReturnSelf' => null
244244
],
245245
[
246246
'method' => 'getQuoteId',
247-
'expects' => $this->once(),
247+
'expects' => self::once(),
248248
'willReturn' => 2
249249
]
250250
],
251251
'reCaptchaSession' => [
252-
['method' => 'isValid', 'expects' => $this->once(), 'with' => 2, 'willReturn' => true]
252+
['method' => 'isValid', 'expects' => self::once(), 'with' => 2, 'willReturn' => true]
253253
]
254254
],
255255
false,

‎ReCaptchaPaypal/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-re-captcha-paypal",
33
"description": "Google reCaptcha integration for Magento2 PayPal PayflowPro payment form",
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": "*",

0 commit comments

Comments
 (0)