Skip to content

Commit 53d2d07

Browse files
pawan-adobe-securitypawan-adobe-security
authored
Merge pull request #189 from magento-cia/cia-2.4.8-beta2-develop-2.4-develop-sync-01132025
Cia 2.4.8 beta2 develop 2.4 develop sync 01132025
2 parents cbfb7e1 + 59001c8 commit 53d2d07

File tree

68 files changed

+885
-1240
lines changed

Some content is hidden

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

68 files changed

+885
-1240
lines changed

‎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.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-config": "*",
88
"magento/module-re-captcha-ui": "*",

‎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.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.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.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-checkout": "*",
88
"magento/module-sales-rule": "*",

‎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.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-re-captcha-ui": "*"
88
},

‎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.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-customer": "*",
88
"magento/module-re-captcha-ui": "*",

‎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.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-store": "*",
88
"magento/module-re-captcha-ui": "*"

‎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.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-config": "*"
88
},

‎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.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-re-captcha-ui": "*",
88
"magento/module-re-captcha-validation-api": "*",

‎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.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-re-captcha-ui": "*",
88
"magento/module-re-captcha-validation-api": "*",

‎ReCaptchaResendConfirmationEmail/composer.json

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

‎ReCaptchaReview/composer.json

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

‎ReCaptchaSendFriend/composer.json

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

‎ReCaptchaStorePickup/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-re-captcha-store-pickup",
33
"description": "Google reCaptcha integration for Magento2 Inventory Store Pickup shipping form",
44
"require": {
5-
"php": "~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-checkout": "*",
88
"magento/module-re-captcha-ui": "*"

‎ReCaptchaUi/composer.json

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

‎ReCaptchaUser/composer.json

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

‎ReCaptchaValidation/Model/ValidationConfig.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2020 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -45,7 +45,7 @@ public function __construct(
4545
string $privateKey,
4646
string $remoteIp,
4747
string $validationFailureMessage,
48-
ValidationConfigExtensionInterface $extensionAttributes = null
48+
?ValidationConfigExtensionInterface $extensionAttributes = null
4949
) {
5050
$this->privateKey = $privateKey;
5151
$this->remoteIp = $remoteIp;

‎ReCaptchaValidation/composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
"name": "magento/module-re-captcha-validation",
33
"description": "Google reCAPTCHA integration for Magento2",
44
"require": {
5-
"php": "~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-re-captcha-validation-api": "*",
8-
"google/recaptcha": "^1.2"
8+
"phpfui/recaptcha": "^2.0.0"
99
},
1010
"type": "magento2-module",
1111
"license": "OSL-3.0",

‎ReCaptchaValidationApi/composer.json

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

‎ReCaptchaVersion2Checkbox/composer.json

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

‎ReCaptchaVersion2Invisible/composer.json

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

‎ReCaptchaVersion3Invisible/composer.json

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

‎ReCaptchaWebapiApi/composer.json

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

‎ReCaptchaWebapiGraphQl/Model/Resolver/ReCaptchaFormConfig.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public function resolve(
6161
Field $field,
6262
$context,
6363
ResolveInfo $info,
64-
array $value = null,
65-
array $args = null,
64+
?array $value = null,
65+
?array $args = null,
6666
) {
6767
try {
6868
$captchaType = $this->captchaTypeResolver->getCaptchaTypeFor($this->formTypes[$args['formType']]);

‎ReCaptchaWebapiGraphQl/Model/Resolver/ReCaptchaV3.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?php
22
/**
3-
* Copyright 2024 Adobe
4-
* All rights reserved.
5-
* See COPYING.txt for license details.
3+
* Copyright 2023 Adobe
4+
* All Rights Reserved.
65
*/
76
declare(strict_types=1);
87

@@ -73,8 +72,8 @@ public function resolve(
7372
Field $field,
7473
$context,
7574
ResolveInfo $info,
76-
array $value = null,
77-
array $args = null
75+
?array $value = null,
76+
?array $args = null
7877
) {
7978
return [
8079
'is_enabled' => $this->isEnabled(),

‎ReCaptchaWebapiGraphQl/composer.json

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

‎ReCaptchaWebapiRest/composer.json

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

‎ReCaptchaWebapiUi/composer.json

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

‎ReCaptchaWishlist/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"type": "magento2-module",
55
"license": "OSL-3.0",
66
"require": {
7-
"php": "~8.1.0||~8.2.0||~8.3.0",
7+
"php": "~8.2.0||~8.3.0||~8.4.0",
88
"magento/framework": "*",
99
"magento/module-re-captcha-ui": "*"
1010
},

‎Securitytxt/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Security.txt file for Magento 2 websites",
44
"type": "magento2-module",
55
"require": {
6-
"php": "~8.2.0||~8.3.0",
6+
"php": "~8.2.0||~8.3.0||~8.4.0",
77
"magento/framework": "*",
88
"magento/module-config": "*",
99
"magento/module-store": "*"

‎TwoFactorAuth/Api/Data/DuoDataInterface.php

+29-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2020 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -12,62 +12,82 @@
1212
/**
1313
* Represents the data needed to use duo
1414
*
15+
* @deprecated This interface is no longer used.
16+
* @see none
1517
* @api
1618
*/
1719
interface DuoDataInterface extends ExtensibleDataInterface
1820
{
1921
/**
2022
* Signature field name
23+
*
24+
* @deprecated
25+
* @see none
2126
*/
2227
public const SIGNATURE = 'signature';
2328

2429
/**
2530
* Api host field name
31+
*
32+
* @deprecated
33+
* @see none
2634
*/
2735
public const API_HOSTNAME = 'api_hostname';
2836

2937
/**
3038
* Get the signature
3139
*
40+
* @deprecated
41+
* @see none
3242
* @return string
3343
*/
3444
public function getSignature(): string;
3545

3646
/**
3747
* Set the signature
3848
*
49+
* @deprecated
50+
* @see none
3951
* @param string $value
4052
* @return void
4153
*/
4254
public function setSignature(string $value): void;
4355

44-
/**
45-
* Get the api hostname
46-
*
47-
* @return string
48-
*/
49-
public function getApiHostname(): string;
50-
5156
/**
5257
* Set the api hostname
5358
*
59+
* @deprecated
60+
* @see none
5461
* @param string $value
5562
* @return void
5663
*/
5764
public function setApiHostname(string $value): void;
5865

66+
/**
67+
* Get the api hostname
68+
*
69+
* @deprecated
70+
* @see none
71+
* @return string
72+
*/
73+
public function getApiHostname(): string;
74+
5975
/**
6076
* Retrieve existing extension attributes object or create a new one
6177
*
6278
* Used fully qualified namespaces in annotations for proper work of extension interface/class code generation
6379
*
80+
* @deprecated
81+
* @see none
6482
* @return \Magento\TwoFactorAuth\Api\Data\DuoDataExtensionInterface|null
6583
*/
6684
public function getExtensionAttributes(): ?DuoDataExtensionInterface;
6785

6886
/**
6987
* Set an extension attributes object
7088
*
89+
* @deprecated
90+
* @see none
7191
* @param \Magento\TwoFactorAuth\Api\Data\DuoDataExtensionInterface $extensionAttributes
7292
* @return void
7393
*/

0 commit comments

Comments
 (0)