Merge remote-tracking branch 'origin/2.4-develop' into MCP-954

Author: aa-kashk

app/code/Magento/Captcha/composer.json

@@ -13,9 +13,8 @@
         "magento/module-sales": "*",
         "magento/module-store": "*",
         "magento/module-authorization": "*",
-        "laminas/laminas-captcha": "^2.11.0",
-        "laminas/laminas-db": "^2.13.4",
-        "laminas/laminas-session": "^2.12.1"
+        "laminas/laminas-captcha": "^2.12",
+        "laminas/laminas-db": "^2.13.4"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Catalog/Controller/Adminhtml/Product/MassStatus.php

@@ -12,6 +12,7 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Catalog\Helper\Product\Edit\Action\Attribute as AttributeHelper;
 
 /**
  * Updates status for a batch of products.
@@ -41,27 +42,36 @@ class MassStatus extends \Magento\Catalog\Controller\Adminhtml\Product implement
      */
     private $productAction;
 
+    /**
+     * @var AttributeHelper
+     */
+    private $attributeHelper;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param Builder $productBuilder
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
      * @param \Magento\Catalog\Model\Product\Action $productAction
+     * @param AttributeHelper $attributeHelper
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         Product\Builder $productBuilder,
         \Magento\Catalog\Model\Indexer\Product\Price\Processor $productPriceIndexerProcessor,
         Filter $filter,
         CollectionFactory $collectionFactory,
-        \Magento\Catalog\Model\Product\Action $productAction = null
+        \Magento\Catalog\Model\Product\Action $productAction = null,
+        AttributeHelper $attributeHelper = null
     ) {
         $this->filter = $filter;
         $this->collectionFactory = $collectionFactory;
         $this->_productPriceIndexerProcessor = $productPriceIndexerProcessor;
         $this->productAction = $productAction ?: ObjectManager::getInstance()
             ->get(\Magento\Catalog\Model\Product\Action::class);
+        $this->attributeHelper = $attributeHelper ?: ObjectManager::getInstance()
+            ->get(AttributeHelper::class);
         parent::__construct($context, $productBuilder);
     }
 
@@ -93,6 +103,7 @@ public function execute()
     {
         $collection = $this->filter->getCollection($this->collectionFactory->create());
         $productIds = $collection->getAllIds();
+        $this->attributeHelper->setProductIds($productIds);
         $requestStoreId = $storeId = $this->getRequest()->getParam('store', null);
         $filterRequest = $this->getRequest()->getParam('filters', null);
         $status = (int) $this->getRequest()->getParam('status');

app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

@@ -29,23 +29,23 @@ abstract class AbstractAction
     /**
      * Chunk size
      */
-    const RANGE_CATEGORY_STEP = 500;
+    public const RANGE_CATEGORY_STEP = 500;
 
     /**
      * Chunk size for product
      */
-    const RANGE_PRODUCT_STEP = 1000000;
+    public const RANGE_PRODUCT_STEP = 1000000;
 
     /**
      * Catalog category index table name
      */
-    const MAIN_INDEX_TABLE = 'catalog_category_product_index';
+    public const MAIN_INDEX_TABLE = 'catalog_category_product_index';
 
     /**
      * Suffix for table to show it is temporary
      * @deprecated see getIndexTable
      */
-    const TEMPORARY_TABLE_SUFFIX = '_tmp';
+    public const TEMPORARY_TABLE_SUFFIX = '_tmp';
 
     /**
      * Cached non anchor categories select by store id
@@ -582,7 +582,7 @@ protected function createAnchorSelect(Store $store)
                 'category_id' => 'cc.entity_id',
                 'product_id' => 'ccp.product_id',
                 'position' => new \Zend_Db_Expr(
-                    $this->connection->getIfNullSql('ccp2.position', 'ccp.position + 10000')
+                    $this->connection->getIfNullSql('ccp2.position', 'MIN(ccp.position) + 10000')
                 ),
                 'is_parent' => new \Zend_Db_Expr('0'),
                 'store_id' => new \Zend_Db_Expr($store->getId()),
@@ -823,7 +823,7 @@ protected function getAllProducts(Store $store)
                     'category_id' => new \Zend_Db_Expr($store->getRootCategoryId()),
                     'product_id' => 'cp.entity_id',
                     'position' => new \Zend_Db_Expr(
-                        $this->connection->getCheckSql('ccp.product_id IS NOT NULL', 'ccp.position', '0')
+                        $this->connection->getCheckSql('ccp.product_id IS NOT NULL', 'MIN(ccp.position)', '10000')
                     ),
                     'is_parent' => new \Zend_Db_Expr(
                         $this->connection->getCheckSql('ccp.product_id IS NOT NULL', '1', '0')