Merge branch '2.4-develop' into ACP2E-3872

Author: soklymeach

app/code/Magento/AdminAnalytics/Test/Mftf/Test/AdminCheckAnalyticsTrackingTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2025 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -16,6 +16,7 @@
             <severity value="MINOR"/>
             <testCaseId value="MC-36869"/>
             <group value="pr_exclude"/>
+            <group value="all_bundled_only"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

app/code/Magento/CacheInvalidate/Test/Mftf/Test/AdminValidateEAVTypesAndAttributesConfigurationTest.xml

@@ -20,9 +20,8 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminGoToCacheManagementPageActionGroup" stepKey="goToCacheManagementPage"/>
-            <!--Verify Cache Type EAV Types And Attributes Is ENABLED -->
-            <waitForText selector="{{AdminMessagesSection.assertCacheManagementStatusEnabled('EAV')}}" userInput="ENABLED" stepKey="verifyCacheTypeEAVTypesAndAttributesIsENABLED"/>
+            <comment userInput="BIC Workaround" stepKey="goToCacheManagementPage" />
+            <magentoCLI command="cache:enable" arguments="eav" stepKey="verifyCacheTypeEAVTypesAndAttributesIsENABLED"/>
         </before>
         <after>
             <!--Delete created entity -->

app/code/Magento/Email/Model/Transport.php

@@ -242,11 +242,15 @@ public function sendMessage(): void
     private function setReturnPath(SymfonyMessage $email): void
     {
         if ($this->isSetReturnPath === 2 && $this->returnPathValue) {
-            $email->getHeaders()->addMailboxListHeader('Sender', [$this->returnPathValue]);
+            $email->getHeaders()->addMailboxHeader('Sender', $this->returnPathValue);
         } elseif ($this->isSetReturnPath === 1 &&
-            !empty($fromAddresses = $email->getHeaders()->get('From')?->getAddresses())) {
+            !empty(
+                /** @var \Symfony\Component\Mime\Address[] $fromAddresses */
+                $fromAddresses = $email->getHeaders()->get('From')?->getAddresses()
+            )
+        ) {
             reset($fromAddresses);
-            $email->getHeaders()->addMailboxListHeader('Sender', [current($fromAddresses)->getAddress()]);
+            $email->getHeaders()->addMailboxHeader('Sender', current($fromAddresses));
         }
     }
 

app/code/Magento/SalesGraphQl/Model/Formatter/Order.php

@@ -57,7 +57,7 @@ public function format(OrderInterface $orderModel): array
             'shipping_address' => $this->orderAddress->getOrderShippingAddress($orderModel),
             'billing_address' => $this->orderAddress->getOrderBillingAddress($orderModel),
             'payment_methods' => $this->orderPayments->getOrderPaymentMethod($orderModel),
-            'applied_coupons' => $orderModel->getCouponCode() ? ['code' => $orderModel->getCouponCode()] : [],
+            'applied_coupons' => $orderModel->getCouponCode() ? [['code' => $orderModel->getCouponCode()]] : [],
             'model' => $orderModel,
             'comments' => $this->getOrderComments($orderModel)
         ];

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less

@@ -24,7 +24,7 @@
     padding: @page-main-actions__padding;
 }
 
-.actions-scrollable {
+.customer-index-edit .actions-scrollable {
     .page-actions {
         display: flex;
         overflow-x: auto;

composer.json

@@ -93,7 +93,7 @@
         "wikimedia/less.php": "^5.0"
     },
     "require-dev": {
-        "magento/magento-allure-phpunit": "^3.0",
+        "allure-framework/allure-phpunit": "^3.1",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || ^1.0",
         "dg/bypass-finals": "^1.4",
         "friendsofphp/php-cs-fixer": "^3.22",