cia-2.4.8-beta2-develop-2.4-develop-sync-01132025: resolve conflict

pawan-adobe-security · pawan-adobe-security · commit 9a260daabfef · 2025-01-14T19:21:29.000+05:30
diff --git a/ReCaptchaAdminUi/composer.json b/ReCaptchaAdminUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-admin-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-config": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaCheckout/composer.json b/ReCaptchaCheckout/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-checkout",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaCheckoutSalesRule/composer.json b/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.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
         "magento/module-sales-rule": "*",
diff --git a/ReCaptchaContact/composer.json b/ReCaptchaContact/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-contact",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*"
     },
diff --git a/ReCaptchaCustomer/composer.json b/ReCaptchaCustomer/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-customer",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaFrontendUi/composer.json b/ReCaptchaFrontendUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-frontend-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-re-captcha-ui": "*"
diff --git a/ReCaptchaMigration/composer.json b/ReCaptchaMigration/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-migration",
     "description": "Google reCAPTCHA config migration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-config": "*"
     },
diff --git a/ReCaptchaNewsletter/composer.json b/ReCaptchaNewsletter/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-newsletter",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaPaypal/composer.json b/ReCaptchaPaypal/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-paypal",
     "description": "Google reCaptcha integration for Magento2 PayPal PayflowPro payment form",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaResendConfirmationEmail/composer.json b/ReCaptchaResendConfirmationEmail/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-resend-confirmation-email",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaReview/composer.json b/ReCaptchaReview/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-review",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaSendFriend/composer.json b/ReCaptchaSendFriend/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-send-friend",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaStorePickup/composer.json b/ReCaptchaStorePickup/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-store-pickup",
     "description": "Google reCaptcha integration for Magento2 Inventory Store Pickup shipping form",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
         "magento/module-re-captcha-ui": "*"
diff --git a/ReCaptchaUi/composer.json b/ReCaptchaUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-validation-api": "*"
     },
diff --git a/ReCaptchaUser/composer.json b/ReCaptchaUser/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-user",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*"
diff --git a/ReCaptchaValidation/Model/ValidationConfig.php b/ReCaptchaValidation/Model/ValidationConfig.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -45,7 +45,7 @@ public function __construct(
         string $privateKey,
         string $remoteIp,
         string $validationFailureMessage,
-        ValidationConfigExtensionInterface $extensionAttributes = null
+        ?ValidationConfigExtensionInterface $extensionAttributes = null
     ) {
         $this->privateKey = $privateKey;
         $this->remoteIp = $remoteIp;
diff --git a/ReCaptchaValidation/composer.json b/ReCaptchaValidation/composer.json
@@ -2,10 +2,10 @@
     "name": "magento/module-re-captcha-validation",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-validation-api": "*",
-        "google/recaptcha": "^1.2"
+        "phpfui/recaptcha": "^2.0.0"
     },
     "type": "magento2-module",
     "license": "OSL-3.0",
diff --git a/ReCaptchaValidationApi/composer.json b/ReCaptchaValidationApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-validation-api",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",
diff --git a/ReCaptchaVersion2Checkbox/composer.json b/ReCaptchaVersion2Checkbox/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-version-2-checkbox",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaVersion2Invisible/composer.json b/ReCaptchaVersion2Invisible/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-version-2-invisible",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaVersion3Invisible/composer.json b/ReCaptchaVersion3Invisible/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-version-3-invisible",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-re-captcha-ui": "*",
diff --git a/ReCaptchaWebapiApi/composer.json b/ReCaptchaWebapiApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-webapi-api",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-validation-api": "*"
     },
diff --git a/ReCaptchaWebapiGraphQl/Model/Resolver/ReCaptchaFormConfig.php b/ReCaptchaWebapiGraphQl/Model/Resolver/ReCaptchaFormConfig.php
@@ -61,8 +61,8 @@ public function resolve(
         Field $field,
         $context,
         ResolveInfo $info,
-        array $value = null,
-        array $args = null,
+        ?array $value = null,
+        ?array $args = null,
     ) {
         try {
             $captchaType = $this->captchaTypeResolver->getCaptchaTypeFor($this->formTypes[$args['formType']]);
diff --git a/ReCaptchaWebapiGraphQl/Model/Resolver/ReCaptchaV3.php b/ReCaptchaWebapiGraphQl/Model/Resolver/ReCaptchaV3.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -73,8 +72,8 @@ public function resolve(
         Field $field,
         $context,
         ResolveInfo $info,
-        array $value = null,
-        array $args = null
+        ?array $value = null,
+        ?array $args = null
     ) {
         return [
             'is_enabled' => $this->isEnabled(),
diff --git a/ReCaptchaWebapiGraphQl/composer.json b/ReCaptchaWebapiGraphQl/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-webapi-graph-ql",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-authorization": "*",
         "magento/module-re-captcha-frontend-ui": "*",
diff --git a/ReCaptchaWebapiRest/composer.json b/ReCaptchaWebapiRest/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-webapi-rest",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-authorization": "*",
         "magento/module-re-captcha-validation-api": "*",
diff --git a/ReCaptchaWebapiUi/composer.json b/ReCaptchaWebapiUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-re-captcha-webapi-ui",
     "description": "Google reCAPTCHA integration for Magento2",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-re-captcha-frontend-ui": "*"
     },
diff --git a/Securitytxt/composer.json b/Securitytxt/composer.json
@@ -3,7 +3,7 @@
     "description": "Security.txt file for Magento 2 websites",
     "type": "magento2-module",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-config": "*",
         "magento/module-store": "*"
diff --git a/TwoFactorAuth/Model/Config/Backend/ForceProviders.php b/TwoFactorAuth/Model/Config/Backend/ForceProviders.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -44,8 +44,8 @@ public function __construct(
         ScopeConfigInterface $config,
         TypeListInterface $cacheTypeList,
         TfaInterface $tfa,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         parent::__construct(
@@ -76,7 +76,7 @@ public function beforeSave()
             $value = explode(',', $value);
         }
         $validValues = is_array($value) ? array_intersect($codes, $value) : [];
-        if (empty($value) || !$validValues) {
+        if (count($value) === 0 || count($validValues) === 0) {
             throw new ValidatorException(__('You have to select at least one Two-Factor Authorization provider'));
         }
 
diff --git a/TwoFactorAuth/Model/Country.php b/TwoFactorAuth/Model/Country.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -48,8 +48,8 @@ public function __construct(
         Registry $registry,
         DataObjectHelper $dataObjectHelper,
         CountryInterfaceFactory $countryDataFactory,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
diff --git a/TwoFactorAuth/Model/Provider/Engine/DuoSecurity.php b/TwoFactorAuth/Model/Provider/Engine/DuoSecurity.php
@@ -87,8 +87,8 @@ class DuoSecurity implements EngineInterface
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         UrlInterface $urlBuilder,
-        Client $client = null,
-        DuoAuth $duoAuth = null
+        ?Client $client = null,
+        ?DuoAuth $duoAuth = null
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->urlBuilder = $urlBuilder;
diff --git a/TwoFactorAuth/Model/Provider/Engine/Google.php b/TwoFactorAuth/Model/Provider/Engine/Google.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -10,8 +10,10 @@
 use Base32\Base32;
 use Endroid\QrCode\Color\Color;
 use Endroid\QrCode\Encoding\Encoding;
+use Endroid\QrCode\ErrorCorrectionLevel;
 use Endroid\QrCode\ErrorCorrectionLevel\ErrorCorrectionLevelHigh;
 use Endroid\QrCode\QrCode;
+use Endroid\QrCode\RoundBlockSizeMode;
 use Endroid\QrCode\Writer\PngWriter;
 use Exception;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -214,13 +216,17 @@ public function verify(UserInterface $user, DataObject $request): bool
     public function getQrCodeAsPng(UserInterface $user): string
     {
         // @codingStandardsIgnoreStart
-        $qrCode = new QrCode($this->getProvisioningUrl($user));
-        $qrCode->setSize(400);
-        $qrCode->setMargin(0);
-        $qrCode->setErrorCorrectionLevel(new ErrorCorrectionLevelHigh());
-        $qrCode->setForegroundColor(new Color(0, 0, 0, 0));
-        $qrCode->setBackgroundColor(new Color(255, 255, 255, 0));
-        $qrCode->setEncoding(new Encoding('UTF-8'));
+        $qrCode = new QrCode(
+            $this->getProvisioningUrl($user),
+            new Encoding('UTF-8'),
+            ErrorCorrectionLevel::High,
+            400,
+            0,
+            RoundBlockSizeMode::Margin,
+            new Color(0, 0, 0, 0),
+            new Color(255, 255, 255, 0)
+        );
+
 
         $writer = new PngWriter();
         $pngData = $writer->write($qrCode);
diff --git a/TwoFactorAuth/Model/ResourceModel/UserConfig.php b/TwoFactorAuth/Model/ResourceModel/UserConfig.php
diff --git a/TwoFactorAuth/Model/UserConfig.php b/TwoFactorAuth/Model/UserConfig.php
diff --git a/TwoFactorAuth/Test/Unit/Model/Provider/Engine/DuoSecurityTest.php b/TwoFactorAuth/Test/Unit/Model/Provider/Engine/DuoSecurityTest.php
diff --git a/TwoFactorAuth/composer.json b/TwoFactorAuth/composer.json
diff --git a/_metapackage/composer.json b/_metapackage/composer.json
