Merge branch '2.4-develop' into bug/39479-grouped-product-qty-validation

Author: engcom-Hotel

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/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

@@ -1,19 +1,33 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
+
 namespace Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export;
 
+use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\ImportExport\Controller\Adminhtml\Export as ExportController;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing as ExportAdvancedPricing;
 use Magento\Catalog\Model\Product as CatalogProduct;
+use Magento\ImportExport\Model\Export\EntityFiltersProviderInterface;
 
 class GetFilter extends ExportController implements HttpGetActionInterface, HttpPostActionInterface
 {
+    /**
+     * @param Context $context
+     * @param EntityFiltersProviderInterface $filtersProvider
+     */
+    public function __construct(
+        Context $context,
+        private readonly EntityFiltersProviderInterface $filtersProvider
+    ) {
+        parent::__construct($context);
+    }
+
     /**
      * Get grid-filter of entity attributes action.
      *
@@ -34,9 +48,7 @@ public function execute()
                 /** @var $export \Magento\ImportExport\Model\Export */
                 $export = $this->_objectManager->create(\Magento\ImportExport\Model\Export::class);
                 $export->setData($data);
-                $attrFilterBlock->prepareCollection(
-                    $export->filterAttributeCollection($export->getEntityAttributeCollection())
-                );
+                $attrFilterBlock->prepareCollection($this->filtersProvider->getFilters($export));
                 return $resultLayout;
             } catch (\Exception $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -7,6 +7,7 @@
     "require": {
         "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
+        "magento/module-backend": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-import-export": "*",
         "magento/module-catalog-inventory": "*",

app/code/Magento/AdvancedPricingImportExport/etc/di.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -19,4 +19,11 @@
         </arguments>
     </type>
     <preference for="Magento\ImportExport\Controller\Adminhtml\Export\GetFilter" type="Magento\AdvancedPricingImportExport\Controller\Adminhtml\Export\GetFilter" />
+    <type name="Magento\ImportExport\Model\Export\EntityFiltersProvider">
+        <arguments>
+            <argument name="providers" xsi:type="array">
+                <item name="advanced_pricing" xsi:type="object">Magento\CatalogImportExport\Model\Export\EntityFiltersProvider</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/AsyncConfig/Test/Mftf/Test/AsyncConfigurationTest.xml

@@ -1,9 +1,9 @@
 <?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.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -59,8 +59,10 @@
         <see selector="{{CatalogSection.successMessage}}" userInput="Configuration changes will be applied by consumer soon." stepKey="seeCustomSuccessMessage"/>
 
         <!--Trigger the Consumer-->
-        <magentoCLI stepKey="EnableAsyncConfig" command="queue:consumers:start saveConfigProcessor --max-messages=1"/>
-
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="EnableAsyncConfig">
+            <argument name="consumerName" value="saveConfigProcessor"/>
+            <argument name="maxMessages" value="1"/>
+        </actionGroup>
         <!--Open Configuration Page Again-->
         <amOnPage url="{{CatalogConfigPage.url}}" stepKey="navigateToConfigurationPageAgain" />
         <waitForPageLoad stepKey="waitForPageLoadAgain"/>

app/code/Magento/Backend/App/Area/FrontNameResolver.php

@@ -107,11 +107,10 @@ public function getFrontName($checkHost = false)
         if ($checkHost && !$this->isHostBackend()) {
             return false;
         }
-        $isCustomPathUsed = (bool)(string)$this->config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_PATH);
-        if ($isCustomPathUsed) {
-            return (string)$this->config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH);
-        }
-        return $this->defaultFrontName;
+
+        return $this->config->isSetFlag(self::XML_PATH_USE_CUSTOM_ADMIN_PATH)
+            ? (string)$this->config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH)
+            : $this->defaultFrontName;
     }
 
     /**
@@ -127,9 +126,8 @@ public function isHostBackend()
         if (!$this->request->getServer('HTTP_HOST')) {
             return false;
         }
-
-        if ($this->scopeConfig->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)) {
-            $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE);
+        if ($this->scopeConfig->isSetFlag(self::XML_PATH_USE_CUSTOM_ADMIN_URL)) {
+            $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL);
         } else {
             $xmlPath = $this->request->isSecure() ? Store::XML_PATH_SECURE_BASE_URL : Store::XML_PATH_UNSECURE_BASE_URL;
             $backendUrl = $this->config->getValue($xmlPath);

app/code/Magento/Backend/Test/Mftf/Data/BackenedData.xml

@@ -1,14 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/************************************************************************
+ *
+ *  ADOBE CONFIDENTIAL
+ *  ___________________
+ *
+ *  Copyright 2025 Adobe
+ *  All Rights Reserved.
+ *
+ *  NOTICE: All information contained herein is, and remains
+ *  the property of Adobe and its suppliers, if any. The intellectual
+ *  and technical concepts contained herein are proprietary to Adobe
+ *  and its suppliers and are protected by all applicable intellectual
+ *  property laws, including trade secret and copyright laws.
+ *  Dissemination of this information or reproduction of this material
+ *  is strictly forbidden unless prior written permission is obtained
+ *  from Adobe.
+ *  ************************************************************************
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="backendDataOne" type="backend">
         <data key="backendConfigName">data</data>
     </entity>
+    <entity name="WebdriverKey">
+        <data key="tabKey">[\Facebook\WebDriver\WebDriverKeys::TAB]</data>
+    </entity>
 </entities>

app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php

@@ -80,12 +80,16 @@ protected function setUp(): void
      */
     public function testIfCustomPathUsed(): void
     {
-        $this->configMock
+        $this->configMock->expects($this->once())
+            ->method('isSetFlag')
+            ->with(FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_PATH)
+            ->willReturn(true);
+
+        $this->configMock->expects($this->once())
             ->method('getValue')
-            ->willReturnCallback(fn($param) => match ([$param]) {
-                ['admin/url/use_custom_path'] => true,
-                ['admin/url/custom_path'] => 'expectedValue'
-            });
+            ->with(FrontNameResolver::XML_PATH_CUSTOM_ADMIN_PATH)
+            ->willReturn('expectedValue');
+
         $this->assertEquals('expectedValue', $this->model->getFrontName());
     }
 
@@ -94,15 +98,11 @@ public function testIfCustomPathUsed(): void
      */
     public function testIfCustomPathNotUsed(): void
     {
-        $this->configMock->expects(
-            $this->once()
-        )->method(
-            'getValue'
-        )->with(
-            'admin/url/use_custom_path'
-        )->willReturn(
-            false
-        );
+        $this->configMock->expects($this->once())
+            ->method('isSetFlag')
+            ->with(FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_PATH)
+            ->willReturn(false);
+
         $this->assertEquals($this->_defaultFrontName, $this->model->getFrontName());
     }
 
@@ -125,7 +125,12 @@ public function testIsHostBackend(
         string $customAdminUrl,
         bool $expectedValue
     ): void {
-        $this->scopeConfigMock->method('getValue')
+        $this->scopeConfigMock
+            ->method('isSetFlag')
+            ->willReturn($useCustomAdminUrl);
+
+        $this->scopeConfigMock
+            ->method('getValue')
             ->willReturnMap(
                 [
                     [Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
@@ -138,7 +143,7 @@ public function testIsHostBackend(
                     ],
                     [
                         FrontNameResolver::XML_PATH_CUSTOM_ADMIN_URL,
-                        ScopeInterface::SCOPE_STORE,
+                        ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
                         null,
                         $customAdminUrl
                     ]

app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

@@ -1,17 +1,18 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\BundleImportExport\Test\Unit\Model\Import\Product\Type;
 
 use Magento\BundleImportExport\Model\Import\Product\Type\Bundle;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as ProductAttributeCollection;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as ProductAttributeCollectionFactory;
 use Magento\CatalogImportExport\Model\Import\Product;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
-use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory as AttributeSetCollectionFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\ScopeInterface;
 use Magento\Framework\App\ScopeResolverInterface;
@@ -34,46 +35,41 @@ class BundleTest extends AbstractImportTestCase
     /**
      * @var Bundle
      */
-    protected $bundle;
+    private $bundle;
 
     /**
      * @var ResourceConnection|MockObject
      */
-    protected $resource;
+    private $resource;
 
     /**
      * @var Select|MockObject
      */
-    protected $select;
+    private $select;
 
     /**
      * @var Product|MockObject
      */
-    protected $entityModel;
+    private $entityModel;
 
     /**
      * @var []
      */
-    protected $params;
+    private $params;
 
     /** @var AdapterInterface|MockObject
      */
-    protected $connection;
+    private $connection;
 
     /**
-     * @var MockObject
+     * @var AttributeSetCollectionFactory|MockObject
      */
-    protected $attrSetColFac;
+    private $attrSetColFac;
 
     /**
-     * @var MockObject
+     * @var ProductAttributeCollectionFactory|MockObject
      */
-    protected $prodAttrColFac;
-
-    /**
-     * @var Collection|MockObject
-     */
-    protected $setCollection;
+    private $prodAttrColFac;
 
     /**
      * @var ScopeResolverInterface|MockObject
@@ -179,36 +175,17 @@ protected function setUp(): void
         );
         $this->resource->expects($this->any())->method('getConnection')->willReturn($this->connection);
         $this->resource->expects($this->any())->method('getTableName')->willReturn('tableName');
-        $this->attrSetColFac = $this->createPartialMock(
-            CollectionFactory::class,
-            ['create']
-        );
-        $this->setCollection = $this->createPartialMock(
-            Collection::class,
-            ['setEntityTypeFilter']
-        );
-        $this->attrSetColFac->expects($this->any())->method('create')->willReturn(
-            $this->setCollection
-        );
-        $this->setCollection->expects($this->any())
-            ->method('setEntityTypeFilter')
-            ->willReturn([]);
-        $this->prodAttrColFac = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class,
-            ['create']
-        );
-        $attrCollection =
-            $this->createMock(\Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection::class);
-        $attrCollection->expects($this->any())->method('addFieldToFilter')->willReturn([]);
+        $this->attrSetColFac = $this->createMock(AttributeSetCollectionFactory::class);
+        $this->prodAttrColFac = $this->createMock(ProductAttributeCollectionFactory::class);
+        $attrCollection = $this->createMock(ProductAttributeCollection::class);
+        $attrCollection->expects($this->any())->method('addFieldToFilter')->willReturnSelf();
+        $attrCollection->expects($this->any())->method('getItems')->willReturn([]);
         $this->prodAttrColFac->expects($this->any())->method('create')->willReturn($attrCollection);
         $this->params = [
             0 => $this->entityModel,
             1 => 'bundle'
         ];
-        $this->scopeResolver = $this->getMockBuilder(ScopeResolverInterface::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['getScope'])
-            ->getMockForAbstractClass();
+        $this->scopeResolver = $this->createMock(ScopeResolverInterface::class);
 
         $objects = [
             [

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