Merge branch '2.4-develop' into ASI-fix-set-layout-tyles

magento · Jun 10, 2020 · 6e8c990 · 6e8c990
2 parents a548863 + 8513dfd
commit 6e8c990
Show file tree

Hide file tree

Showing 338 changed files with 13,308 additions and 3,340 deletions.
diff --git a/.github/ISSUE_TEMPLATE/story.md b/.github/ISSUE_TEMPLATE/story.md
@@ -0,0 +1,14 @@
+---
+name: GraphQL Story
+about: User story for GraphQL project
+labels: 'Project: GraphQL'
+
+---
+
+*As a ___ I want to ___ so that ___.*
+
+### AC
+* a
+* b
+### Approved Schema
+* a
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheCleanActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CliCacheCleanActionGroup">
+        <annotations>
+            <description>Run cache:clean by CLI with specified cache tags (space separated).</description>
+        </annotations>
+        <arguments>
+            <argument name="tags" type="string"/>
+        </arguments>
+
+        <magentoCLI command="cache:clean" arguments="{{tags}}" stepKey="cleanSpecifiedCache"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/CliCacheFlushActionGroup.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CliCacheFlushActionGroup">
+        <annotations>
+            <description>Run cache:flush by CLI with specified cache tags (space separated).</description>
+        </annotations>
+        <arguments>
+            <argument name="tags" type="string"/>
+        </arguments>
+
+        <magentoCLI command="cache:flush" arguments="{{tags}}" stepKey="flushSpecifiedCache"/>
+    </actionGroup>
+</actionGroups>
diff --git a/...tf/Test/AdminDashboardWithChartsChart.xml → ...ftf/Test/AdminDashboardWithChartsTest.xml b/...tf/Test/AdminDashboardWithChartsChart.xml → ...ftf/Test/AdminDashboardWithChartsTest.xml
diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php b/app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php
@@ -377,8 +377,7 @@ private function prepareBundlePriceByType($priceType, array $dimensions, $entity
             ]
         );
 
-        $query = $select->insertFromSelect($this->getBundlePriceTable());
-        $connection->query($query);
+        $this->tableMaintainer->insertFromSelect($select, $this->getBundlePriceTable(), []);
     }
 
     /**
@@ -418,8 +417,7 @@ private function calculateBundleOptionPrice($priceTable, $dimensions)
             ]
         );
 
-        $query = $select->insertFromSelect($this->getBundleOptionTable());
-        $connection->query($query);
+        $this->tableMaintainer->insertFromSelect($select, $this->getBundleOptionTable(), []);
 
         $this->getConnection()->delete($priceTable->getTableName());
         $this->applyBundlePrice($priceTable);
@@ -575,8 +573,7 @@ private function calculateFixedBundleSelectionPrice()
                 'tier_price' => $tierExpr,
             ]
         );
-        $query = $select->insertFromSelect($this->getBundleSelectionTable());
-        $connection->query($query);
+        $this->tableMaintainer->insertFromSelect($select, $this->getBundleSelectionTable(), []);
 
         $this->applyFixedBundleSelectionPrice();
     }
@@ -627,8 +624,7 @@ private function calculateDynamicBundleSelectionPrice($dimensions)
                 'tier_price' => $tierExpr,
             ]
         );
-        $query = $select->insertFromSelect($this->getBundleSelectionTable());
-        $connection->query($query);
+        $this->tableMaintainer->insertFromSelect($select, $this->getBundleSelectionTable(), []);
     }
 
     /**
@@ -697,8 +693,7 @@ private function prepareTierPriceIndex($dimensions, $entityIds)
             $select->where($this->dimensionToFieldMapper[$dimension->getName()] . ' = ?', $dimension->getValue());
         }
 
-        $query = $select->insertFromSelect($this->getTable('catalog_product_index_tier_price'));
-        $connection->query($query);
+        $this->tableMaintainer->insertFromSelect($select, $this->getTable('catalog_product_index_tier_price'), []);
     }
 
     /**
@@ -725,8 +720,7 @@ private function applyBundlePrice($priceTable): void
             ]
         );
 
-        $query = $select->insertFromSelect($priceTable->getTableName());
-        $this->getConnection()->query($query);
+        $this->tableMaintainer->insertFromSelect($select, $priceTable->getTableName(), []);
     }
 
     /**
@@ -785,7 +779,7 @@ private function getMainTable($dimensions)
         if ($this->fullReindexAction) {
             return $this->tableMaintainer->getMainReplicaTable($dimensions);
         }
-        return $this->tableMaintainer->getMainTable($dimensions);
+        return $this->tableMaintainer->getMainTableByDimensions($dimensions);
     }
 
     /**

diff --git a/...tf/Test/AdminMassDeleteBundleProducts.xml → ...est/AdminMassDeleteBundleProductsTest.xml b/...tf/Test/AdminMassDeleteBundleProducts.xml → ...est/AdminMassDeleteBundleProductsTest.xml
diff --git a/...to/Bundle/Test/Mftf/Test/AdminShouldBeAbleToMassUpdateAttributesForBundleProductsTest.xml b/...to/Bundle/Test/Mftf/Test/AdminShouldBeAbleToMassUpdateAttributesForBundleProductsTest.xml
@@ -34,7 +34,7 @@
                 <requiredEntity createDataKey="createBundleOption"/>
                 <requiredEntity createDataKey="createSimpleProduct"/>
             </createData>
-            <magentoCron stepKey="runCronIndex" groups="index"/>
+            <magentoCLI stepKey="runCronIndex" command="cron:run --group=index"/>
         </before>
         <after>
             <!-- Delete Simple Product -->
@@ -56,9 +56,11 @@
         <actionGroup ref="AdminUpdateProductNameAndDescriptionAttributes" stepKey="updateProductAttribute">
             <argument name="product" value="UpdateAttributeNameAndDescription"/>
         </actionGroup>
-        <!--Run cron twice-->
-        <magentoCLI command="cron:run" stepKey="cronRun"/>
-        <magentoCLI command="cron:run" stepKey="cronRunTwice"/>
+        <!-- Start message queue for product attribute consumer -->
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="startMessageQueue">
+            <argument name="consumerName" value="{{AdminProductAttributeUpdateMessageConsumerData.consumerName}}"/>
+            <argument name="maxMessages" value="{{AdminProductAttributeUpdateMessageConsumerData.messageLimit}}"/>
+        </actionGroup>
         <!-- Search for a product with a new name and Open Product -->
         <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="searchWithNewProductName">
             <argument name="product" value="UpdateAttributeNameAndDescription"/>

diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
@@ -149,7 +149,7 @@ public function getItems()
             $this->_compareProduct->setAllowUsedFlat(false);
 
             $this->_items = $this->_itemCollectionFactory->create();
-            $this->_items->useProductItem(true)->setStoreId($this->_storeManager->getStore()->getId());
+            $this->_items->useProductItem()->setStoreId($this->_storeManager->getStore()->getId());
 
             if ($this->httpContext->getValue(Context::CONTEXT_AUTH)) {
                 $this->_items->setCustomerId($this->currentCustomer->getCustomerId());

diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -279,7 +279,7 @@ public function getItemCollection()
             // cannot be placed in constructor because of the cyclic dependency which cannot be fixed with proxy class
             // collection uses this helper in constructor when calling isEnabledFlat() method
             $this->_itemCollection = $this->_itemCollectionFactory->create();
-            $this->_itemCollection->useProductItem(true)->setStoreId($this->_storeManager->getStore()->getId());
+            $this->_itemCollection->useProductItem()->setStoreId($this->_storeManager->getStore()->getId());
 
             if ($this->_customerSession->isLoggedIn()) {
                 $this->_itemCollection->setCustomerId($this->_customerSession->getCustomerId());
@@ -313,7 +313,7 @@ public function calculate($logout = false)
     {
         /** @var $collection Collection */
         $collection = $this->_itemCollectionFactory->create()
-            ->useProductItem(true);
+            ->useProductItem();
         if (!$logout && $this->_customerSession->isLoggedIn()) {
             $collection->setCustomerId($this->_customerSession->getCustomerId());
         } elseif ($this->_customerId) {

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -173,7 +173,7 @@ protected function _syncData(array $processIds = [])
                 }
             }
 
-            $query = $insertSelect->insertFromSelect($this->tableMaintainer->getMainTable($dimensions));
+            $query = $insertSelect->insertFromSelect($this->tableMaintainer->getMainTableByDimensions($dimensions));
             $this->getConnection()->query($query);
         }
         return $this;
@@ -385,7 +385,7 @@ protected function _reindexRows($changedIds = [])
                     // copy to index
                     $this->_insertFromTable(
                         $temporaryTable,
-                        $this->tableMaintainer->getMainTable($dimensions)
+                        $this->tableMaintainer->getMainTableByDimensions($dimensions)
                     );
                 }
             } else {
@@ -401,14 +401,16 @@ protected function _reindexRows($changedIds = [])
     }
 
     /**
+     * Delete Index data
+     *
      * @param array $entityIds
      * @return void
      */
     private function deleteIndexData(array $entityIds)
     {
         foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
             $select = $this->getConnection()->select()->from(
-                ['index_price' => $this->tableMaintainer->getMainTable($dimensions)],
+                ['index_price' => $this->tableMaintainer->getMainTableByDimensions($dimensions)],
                 null
             )->where('index_price.entity_id IN (?)', $entityIds);
             $query = $select->deleteFromSelect('index_price');
@@ -476,7 +478,7 @@ private function getIndexTargetTableByDimension(array $dimensions)
     {
         $indexTargetTable = $this->getIndexTargetTable();
         if ($indexTargetTable === self::getIndexTargetTable()) {
-            $indexTargetTable = $this->tableMaintainer->getMainTable($dimensions);
+            $indexTargetTable = $this->tableMaintainer->getMainTableByDimensions($dimensions);
         }
         if ($indexTargetTable === self::getIndexTargetTable() . '_replica') {
             $indexTargetTable = $this->tableMaintainer->getMainReplicaTable($dimensions);
@@ -497,6 +499,8 @@ protected function getIndexTargetTable()
     }
 
     /**
+     * Get product Id field name
+     *
      * @return string
      */
     protected function getProductIdFieldName()
@@ -533,6 +537,7 @@ private function getProductsTypes(array $changedIds = [])
 
     /**
      * Get parent products types
+     *
      * Used for add composite products to reindex if we have only simple products in changed ids set
      *
      * @param array $productsIds

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php
@@ -425,7 +425,7 @@ private function switchTables(): void
         $mainTablesByDimension = [];
 
         foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
-            $mainTablesByDimension[] = $this->dimensionTableMaintainer->getMainTable($dimensions);
+            $mainTablesByDimension[] = $this->dimensionTableMaintainer->getMainTableByDimensions($dimensions);
 
             //Move data from indexers with old realisation
             $this->moveDataFromReplicaTableToReplicaTables($dimensions);

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcher.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcher.php
@@ -15,6 +15,8 @@
 
 /**
  * Class to prepare new tables for new indexer mode
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ModeSwitcher implements \Magento\Indexer\Model\ModeSwitcherInterface
 {
@@ -98,7 +100,6 @@ public function switchMode(string $currentMode, string $previousMode)
      * Create new tables
      *
      * @param string $currentMode
-     *
      * @return void
      * @throws \Zend_Db_Exception
      */
@@ -116,7 +117,6 @@ public function createTables(string $currentMode)
      *
      * @param string $currentMode
      * @param string $previousMode
-     *
      * @return void
      */
     public function moveData(string $currentMode, string $previousMode)
@@ -125,17 +125,17 @@ public function moveData(string $currentMode, string $previousMode)
         $dimensionsArrayForPreviousMode = $this->getDimensionsArray($previousMode);
 
         foreach ($dimensionsArrayForCurrentMode as $dimensionsForCurrentMode) {
-            $newTable = $this->tableMaintainer->getMainTable($dimensionsForCurrentMode);
+            $newTable = $this->tableMaintainer->getMainTableByDimensions($dimensionsForCurrentMode);
             if (empty($dimensionsForCurrentMode)) {
                 // new mode is 'none'
                 foreach ($dimensionsArrayForPreviousMode as $dimensionsForPreviousMode) {
-                    $oldTable = $this->tableMaintainer->getMainTable($dimensionsForPreviousMode);
+                    $oldTable = $this->tableMaintainer->getMainTableByDimensions($dimensionsForPreviousMode);
                     $this->insertFromOldTablesToNew($newTable, $oldTable);
                 }
             } else {
                 // new mode is not 'none'
                 foreach ($dimensionsArrayForPreviousMode as $dimensionsForPreviousMode) {
-                    $oldTable = $this->tableMaintainer->getMainTable($dimensionsForPreviousMode);
+                    $oldTable = $this->tableMaintainer->getMainTableByDimensions($dimensionsForPreviousMode);
                     $this->insertFromOldTablesToNew($newTable, $oldTable, $dimensionsForCurrentMode);
                 }
             }
@@ -146,7 +146,6 @@ public function moveData(string $currentMode, string $previousMode)
      * Drop old tables
      *
      * @param string $previousMode
-     *
      * @return void
      */
     public function dropTables(string $previousMode)
@@ -164,7 +163,6 @@ public function dropTables(string $previousMode)
      * Get dimensions array
      *
      * @param string $mode
-     *
      * @return \Magento\Framework\Indexer\MultiDimensionProvider
      */
     private function getDimensionsArray(string $mode): \Magento\Framework\Indexer\MultiDimensionProvider
@@ -184,7 +182,6 @@ private function getDimensionsArray(string $mode): \Magento\Framework\Indexer\Mu
      * @param string $newTable
      * @param string $oldTable
      * @param Dimension[] $dimensions
-     *
      * @return void
      */
     private function insertFromOldTablesToNew(string $newTable, string $oldTable, array $dimensions = [])