Merge pull request magento#194 from magento-cia/cia-2.4.8-develop-2.4-develop-sync-02212025

pawan-adobe-security · web-flow · commit 890124480483 · 2025-03-06T08:59:07.000+05:30
Cia 2.4.8 develop 2.4 develop sync 02212025
diff --git a/ReCaptchaWishlist/Observer/ShareWishlistObserver.php b/ReCaptchaWishlist/Observer/ShareWishlistObserver.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All rights reserved.
  */
 declare(strict_types=1);
 
diff --git a/ReCaptchaWishlist/Test/Integration/ShareWishlistFormTest.php b/ReCaptchaWishlist/Test/Integration/ShareWishlistFormTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All rights reserved.
  */
 declare(strict_types=1);
 
diff --git a/ReCaptchaWishlist/etc/adminhtml/system.xml b/ReCaptchaWishlist/etc/adminhtml/system.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/ReCaptchaWishlist/etc/config.xml b/ReCaptchaWishlist/etc/config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/ReCaptchaWishlist/etc/frontend/events.xml b/ReCaptchaWishlist/etc/frontend/events.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/ReCaptchaWishlist/etc/module.xml b/ReCaptchaWishlist/etc/module.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/ReCaptchaWishlist/registration.php b/ReCaptchaWishlist/registration.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All rights reserved.
  */
 declare(strict_types=1);
 
diff --git a/ReCaptchaWishlist/view/frontend/layout/wishlist_index_share.xml b/ReCaptchaWishlist/view/frontend/layout/wishlist_index_share.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
  -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/ReCaptchaWishlist/view/frontend/web/css/source/_module.less b/ReCaptchaWishlist/view/frontend/web/css/source/_module.less
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All rights reserved.
  */
 .form.wishlist.share .g-recaptcha {
     margin-bottom: 40px;
diff --git a/TwoFactorAuth/Test/Integration/UserConfigRequestManagerTest.php b/TwoFactorAuth/Test/Integration/UserConfigRequestManagerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -136,7 +136,7 @@ public function testSendAppConfigRequest(): void
         $this->manager->sendConfigRequestTo($this->user);
 
         $this->assertNotEmpty($message = $this->transportBuilderMock->getSentMessage());
-        $messageHtml = $message->getBody()->getParts()[0]->getRawContent();
+        $messageHtml = quoted_printable_decode($message->getBody()->bodyToString());
         $this->assertStringContainsString(
             'You are required to configure website-wide and personal Two-Factor Authorization in order to login to',
             $messageHtml
@@ -166,7 +166,7 @@ public function testSendUserConfigRequest(): void
         $this->manager->sendConfigRequestTo($this->user);
 
         $this->assertNotEmpty($message = $this->transportBuilderMock->getSentMessage());
-        $messageHtml = $message->getBody()->getParts()[0]->getRawContent();
+        $messageHtml = quoted_printable_decode($message->getBody()->bodyToString());
         $this->assertStringContainsString(
             'You are required to configure personal Two-Factor Authorization in order to login to',
             $messageHtml
