Merge branch '2.4-develop' into spartans_pr_21042025

Author: magento-devops-queue-mgr-svc

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/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/Catalog/Model/ProductMutex.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Framework\Lock\LockManagerInterface;
+
+class ProductMutex implements ProductMutexInterface
+{
+    private const LOCK_PREFIX = 'product_mutex_';
+
+    private const LOCK_TIMEOUT = 60;
+
+    /**
+     * @param LockManagerInterface $lockManager
+     * @param int $lockWaitTimeout
+     */
+    public function __construct(
+        private readonly LockManagerInterface $lockManager,
+        private readonly int $lockWaitTimeout = self::LOCK_TIMEOUT
+    ) {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(string $sku, callable $callable, ...$args): mixed
+    {
+        if ($this->lockManager->lock(self::LOCK_PREFIX . $sku, $this->lockWaitTimeout)) {
+            try {
+                $result = $callable(...$args);
+            } finally {
+                $this->lockManager->unlock(self::LOCK_PREFIX . $sku);
+            }
+        } else {
+            throw new ProductMutexException(
+                __('Could not acquire lock for SKU %1', $sku)
+            );
+        }
+        return $result;
+    }
+}

app/code/Magento/Catalog/Model/ProductMutexException.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+use Magento\Framework\Exception\StateException;
+
+class ProductMutexException extends StateException
+{
+
+}

app/code/Magento/Catalog/Model/ProductMutexInterface.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+/**
+ * Prevents race conditions during concurrent product save operations.
+ */
+interface ProductMutexInterface
+{
+    /**
+     * Acquires a lock for SKU, executes callable and releases the lock after.
+     *
+     * @param string $sku
+     * @param callable $callable
+     * @param array $args
+     * @return mixed
+     * @throws ProductMutexException
+     */
+    public function execute(string $sku, callable $callable, ...$args): mixed;
+}

app/code/Magento/Catalog/Plugin/ProductRepositorySaveOperationSynchronizer.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Plugin;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ProductMutexException;
+use Magento\Catalog\Model\ProductMutexInterface;
+use Magento\Framework\Exception\CouldNotSaveException;
+
+class ProductRepositorySaveOperationSynchronizer
+{
+    /**
+     * @param ProductMutexInterface $productMutex
+     */
+    public function __construct(
+        private readonly ProductMutexInterface $productMutex
+    ) {
+    }
+
+    /**
+     * Synchronizes product save operations to avoid data corruption from concurrent requests.
+     *
+     * @param ProductRepositoryInterface $subject
+     * @param callable $proceed
+     * @param Product $product
+     * @param mixed $saveOptions
+     * @return ProductInterface
+     * @throws CouldNotSaveException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundSave(
+        ProductRepositoryInterface $subject,
+        callable $proceed,
+        ProductInterface $product,
+        mixed $saveOptions = false
+    ): ProductInterface {
+        try {
+            return $this->productMutex->execute((string) $product->getSku(), $proceed, $product, $saveOptions);
+        } catch (ProductMutexException $e) {
+            throw new CouldNotSaveException(
+                __('The product was unable to be saved. Please try again.'),
+                $e
+            );
+        }
+    }
+}