Merge remote-tracking branch 'origin/2.4-develop' into MC-24170

Author: zakdma

app/code/Magento/Indexer/Setup/Recurring.php

@@ -13,12 +13,15 @@
 use Magento\Framework\Setup\InstallSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Indexer\IndexerInterfaceFactory;
 use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Indexer\Model\Indexer\State;
 use Magento\Indexer\Model\Indexer\StateFactory;
 use Magento\Indexer\Model\ResourceModel\Indexer\State\CollectionFactory;
 
 /**
+ * Indexer recurring setup
+ *
  * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -51,6 +54,11 @@ class Recurring implements InstallSchemaInterface
      */
     private $stateFactory;
 
+    /**
+     * @var IndexerInterfaceFactory
+     */
+    private $indexerFactory;
+
     /**
      * Init
      *
@@ -59,23 +67,26 @@ class Recurring implements InstallSchemaInterface
      * @param ConfigInterface $config
      * @param EncryptorInterface $encryptor
      * @param EncoderInterface $encoder
+     * @param IndexerInterfaceFactory $indexerFactory
      */
     public function __construct(
         CollectionFactory $statesFactory,
         StateFactory $stateFactory,
         ConfigInterface $config,
         EncryptorInterface $encryptor,
-        EncoderInterface $encoder
+        EncoderInterface $encoder,
+        IndexerInterfaceFactory $indexerFactory
     ) {
         $this->statesFactory = $statesFactory;
         $this->stateFactory = $stateFactory;
         $this->config = $config;
         $this->encryptor = $encryptor;
         $this->encoder = $encoder;
+        $this->indexerFactory = $indexerFactory;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
     {
@@ -107,6 +118,11 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
                 $state->setStatus(StateInterface::STATUS_INVALID);
                 $state->save();
             }
+
+            $indexer = $this->indexerFactory->create()->load($indexerId);
+            if ($indexer->isScheduled()) {
+                $indexer->getView()->unsubscribe()->subscribe();
+            }
         }
     }
 }

app/code/Magento/Indexer/Setup/RecurringData.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Catalog\Model\Layer;
+
+use Magento\Catalog\Model\Layer\SearchFactory;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+
+/**
+ * Quick search products by query.
+ */
+class QuickSearchByQuery
+{
+    /**
+     * @var SearchFactory
+     */
+    private $searchFactory;
+
+    /**
+     * @param SearchFactory $searchFactory
+     */
+    public function __construct(
+        SearchFactory $searchFactory
+    ) {
+        $this->searchFactory = $searchFactory;
+    }
+
+    /**
+     * Flush search instances cache and find products by search query.
+     *
+     * @param string $query
+     * @param string $sortedField
+     * @param string $sortOrder
+     * @return Collection
+     */
+    public function execute(
+        string $query,
+        string $sortedField = 'relevance',
+        string $sortOrder = 'desc'
+    ): Collection {
+        $productCollection = $this->searchFactory->create()->getProductCollection();
+        $productCollection->addSearchFilter($query);
+        $productCollection->setOrder($sortedField, $sortOrder);
+
+        return $productCollection;
+    }
+}

dev/tests/integration/framework/Magento/TestFramework/Catalog/Model/Layer/QuickSearchByQuery.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\ConfigurableProduct\Model;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+
+/**
+ * Delete configurable product with linked products
+ */
+class DeleteConfigurableProduct
+{
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var ProductResource */
+    private $productResource;
+
+    /** @var Registry */
+    private $registry;
+
+    /**
+     * @param ProductRepositoryInterface $productRepository
+     * @param ProductResource $productResource
+     * @param Registry $registry
+     */
+    public function __construct(
+        ProductRepositoryInterface $productRepository,
+        ProductResource $productResource,
+        Registry $registry
+    ) {
+        $this->productRepository = $productRepository;
+        $this->productResource = $productResource;
+        $this->registry = $registry;
+    }
+
+    /**
+     * Delete configurable product and linked products
+     *
+     * @param string $sku
+     * @return void
+     */
+    public function execute(string $sku): void
+    {
+        $configurableProduct = $this->productRepository->get($sku, false, null, true);
+        $childrenIds = $configurableProduct->getExtensionAttributes()->getConfigurableProductLinks();
+        $childrenSkus = array_column($this->productResource->getProductsSku($childrenIds), 'sku');
+        $childrenSkus[] = $sku;
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+
+        foreach ($childrenSkus as $childSku) {
+            try {
+                $this->productRepository->deleteById($childSku);
+            } catch (NoSuchEntityException $e) {
+                //product already removed
+            }
+        }
+
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
+    }
+}