Skip to content

Commit 9a260da

Browse files
pawan-adobe-securitypawan-adobe-security
committed
cia-2.4.8-beta2-develop-2.4-develop-sync-01132025: resolve conflict
2 parents 83c1cb0 + e5aba98 commit 9a260da

File tree

37 files changed

+107
-111
lines changed

37 files changed

+107
-111
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
},

‎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/Model/Config/Backend/ForceProviders.php

+5-5
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

77
declare(strict_types=1);
@@ -44,8 +44,8 @@ public function __construct(
4444
ScopeConfigInterface $config,
4545
TypeListInterface $cacheTypeList,
4646
TfaInterface $tfa,
47-
AbstractResource $resource = null,
48-
AbstractDb $resourceCollection = null,
47+
?AbstractResource $resource = null,
48+
?AbstractDb $resourceCollection = null,
4949
array $data = []
5050
) {
5151
parent::__construct(
@@ -76,7 +76,7 @@ public function beforeSave()
7676
$value = explode(',', $value);
7777
}
7878
$validValues = is_array($value) ? array_intersect($codes, $value) : [];
79-
if (empty($value) || !$validValues) {
79+
if (count($value) === 0 || count($validValues) === 0) {
8080
throw new ValidatorException(__('You have to select at least one Two-Factor Authorization provider'));
8181
}
8282

‎TwoFactorAuth/Model/Country.php

+4-4
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

@@ -48,8 +48,8 @@ public function __construct(
4848
Registry $registry,
4949
DataObjectHelper $dataObjectHelper,
5050
CountryInterfaceFactory $countryDataFactory,
51-
AbstractResource $resource = null,
52-
AbstractDb $resourceCollection = null,
51+
?AbstractResource $resource = null,
52+
?AbstractDb $resourceCollection = null,
5353
array $data = []
5454
) {
5555
parent::__construct($context, $registry, $resource, $resourceCollection, $data);

‎TwoFactorAuth/Model/Provider/Engine/DuoSecurity.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ class DuoSecurity implements EngineInterface
8787
public function __construct(
8888
ScopeConfigInterface $scopeConfig,
8989
UrlInterface $urlBuilder,
90-
Client $client = null,
91-
DuoAuth $duoAuth = null
90+
?Client $client = null,
91+
?DuoAuth $duoAuth = null
9292
) {
9393
$this->scopeConfig = $scopeConfig;
9494
$this->urlBuilder = $urlBuilder;

‎TwoFactorAuth/Model/Provider/Engine/Google.php

+15-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

@@ -10,8 +10,10 @@
1010
use Base32\Base32;
1111
use Endroid\QrCode\Color\Color;
1212
use Endroid\QrCode\Encoding\Encoding;
13+
use Endroid\QrCode\ErrorCorrectionLevel;
1314
use Endroid\QrCode\ErrorCorrectionLevel\ErrorCorrectionLevelHigh;
1415
use Endroid\QrCode\QrCode;
16+
use Endroid\QrCode\RoundBlockSizeMode;
1517
use Endroid\QrCode\Writer\PngWriter;
1618
use Exception;
1719
use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -214,13 +216,17 @@ public function verify(UserInterface $user, DataObject $request): bool
214216
public function getQrCodeAsPng(UserInterface $user): string
215217
{
216218
// @codingStandardsIgnoreStart
217-
$qrCode = new QrCode($this->getProvisioningUrl($user));
218-
$qrCode->setSize(400);
219-
$qrCode->setMargin(0);
220-
$qrCode->setErrorCorrectionLevel(new ErrorCorrectionLevelHigh());
221-
$qrCode->setForegroundColor(new Color(0, 0, 0, 0));
222-
$qrCode->setBackgroundColor(new Color(255, 255, 255, 0));
223-
$qrCode->setEncoding(new Encoding('UTF-8'));
219+
$qrCode = new QrCode(
220+
$this->getProvisioningUrl($user),
221+
new Encoding('UTF-8'),
222+
ErrorCorrectionLevel::High,
223+
400,
224+
0,
225+
RoundBlockSizeMode::Margin,
226+
new Color(0, 0, 0, 0),
227+
new Color(255, 255, 255, 0)
228+
);
229+
224230

225231
$writer = new PngWriter();
226232
$pngData = $writer->write($qrCode);

0 commit comments

Comments
 (0)