MCP-946: Price Index Optimization

- Fix static tests

Author: aa-kashk

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price/DisabledProductOptionPriceModifier.php

@@ -34,12 +34,23 @@ class DisabledProductOptionPriceModifier implements PriceModifierInterface
     /**
      * @var array
      */
-    private $isBundle = [];
+    private $websiteIdsOfProduct = [];
 
     /**
-     * @var array
+     * @var BundleSelection
      */
-    private $websiteIdsOfProduct = [];
+    private BundleSelection $bundleSelection;
+
+    /**
+     * @var Config
+     */
+    private Config $config;
+
+    /**
+     * @var MetadataPool
+     */
+    private MetadataPool $metadataPool;
+
 
     /**
      * @param ResourceConnection $resourceConnection
@@ -115,40 +126,19 @@ private function getWebsiteIdsOfProduct(int $entityId): array
     }
 
     /**
-     * Is product bundle
-     *
-     * @param int $entityId
-     * @return bool
-     */
-    private function isBundle(int $entityId): bool
-    {
-        if (isset($this->isBundle[$entityId])) {
-            return $this->isBundle[$entityId];
-        }
-        $connection = $this->resourceConnection->getConnection('indexer');
-        $select = $connection->select();
-        $select->from(
-            ['cpe' => $this->resourceConnection->getTableName('catalog_product_entity')],
-            ['type_id']
-        )->where('cpe.entity_id = ?', $entityId);
-        $typeId = $connection->fetchOne($select);
-        $this->isBundle[$entityId] = $typeId === Type::TYPE_BUNDLE;
-        return $this->isBundle[$entityId];
-    }
-
-    /** Get Bundle Ids
+     * Get Bundle Ids
      *
      * @param array $entityIds
      * @return \Traversable
      */
-    protected function getBundleIds(array $entityIds): \Traversable
+    private function getBundleIds(array $entityIds): \Traversable
     {
         $connection = $this->resourceConnection->getConnection('indexer');
         $select = $connection->select();
         $select->from(
             ['cpe' => $this->resourceConnection->getTableName('catalog_product_entity')],
             ['entity_id']
-        )->where('cpe.entity_id in ( ? )', $entityIds ?? [0], \Zend_Db::INT_TYPE)
+        )->where('cpe.entity_id in ( ? )', !empty($entityIds) ? $entityIds : [0], \Zend_Db::INT_TYPE)
         ->where('type_id = ?', Type::TYPE_BUNDLE);
 
         $statement = $select->query();

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php

@@ -113,6 +113,7 @@ class Fulltext implements
      * @param int|null $batchSize
      * @param DeploymentConfig|null $deploymentConfig
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         FullFactory $fullActionFactory,

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php

@@ -226,7 +226,7 @@ class Full
      * @param \Magento\CatalogSearch\Model\ResourceModel\Fulltext $fulltextResource
      * @param \Magento\Framework\Search\Request\DimensionFactory $dimensionFactory
      * @param \Magento\Framework\Indexer\ConfigInterface $indexerConfig
-     * @param null $indexIteratorFactory
+     * @param mixed $indexIteratorFactory
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param DataProvider|null $dataProvider
      * @param int $batchSize