Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce into eav-graphql

Author: sivaschenko

app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Block\System\Store\Grid\Render;
 
+use Magento\Framework\DataObject;
+
 /**
  * Store render group
  *
@@ -13,9 +15,9 @@
 class Group extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
-    public function render(\Magento\Framework\DataObject $row)
+    public function render(DataObject $row)
     {
         if (!$row->getData($this->getColumn()->getIndex())) {
             return null;
@@ -28,6 +30,6 @@ public function render(\Magento\Framework\DataObject $row)
         '">' .
         $this->escapeHtml($row->getData($this->getColumn()->getIndex())) .
         '</a><br />'
-        . '(' . __('Code') . ': ' . $row->getGroupCode() . ')';
+        . '(' . __('Code') . ': ' . $this->escapeHtml($row->getGroupCode()) . ')';
     }
 }

app/code/Magento/Backend/Block/Widget/Grid/Extended.php

@@ -1067,10 +1067,11 @@ public function getCsv()
             $data = [];
             foreach ($this->getColumns() as $column) {
                 if (!$column->getIsSystem()) {
+                    $exportField = (string)$column->getRowFieldExport($item);
                     $data[] = '"' . str_replace(
                         ['"', '\\'],
                         ['""', '\\\\'],
-                        $column->getRowFieldExport($item) ?: ''
+                        $exportField ?: ''
                     ) . '"';
                 }
             }

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -349,9 +349,10 @@
                         <field id="transport">smtp</field>
                     </depends>
                 </field>
-                <field id="password" translate="label comment" type="password" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="password" translate="label comment" type="obscure" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Password</label>
-                    <comment>Username</comment>
+                    <comment>Password</comment>
+                    <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                     <depends>
                         <field id="transport">smtp</field>
                     </depends>

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

@@ -36,8 +36,6 @@ class Bundle extends AbstractView
     protected $options;
 
     /**
-     * Catalog product
-     *
      * @var \Magento\Catalog\Helper\Product
      */
     protected $catalogProduct;
@@ -405,7 +403,7 @@ private function getConfigData(Product $product, array $options)
      */
     private function processOptions(string $optionId, array $options, DataObject $preConfiguredValues)
     {
-        $preConfiguredQtys = $preConfiguredValues->getData("bundle_option_qty/${optionId}") ?? [];
+        $preConfiguredQtys = $preConfiguredValues->getData("bundle_option_qty/{$optionId}") ?? [];
         $selections = $options[$optionId]['selections'];
         array_walk(
             $selections,

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

@@ -214,7 +214,7 @@ public function testMoveWhenCannotFindParentCategory(): void
     {
         $this->expectException('Magento\Framework\Exception\LocalizedException');
         $this->expectExceptionMessage('Sorry, but we can\'t find the new parent category you selected.');
-        $this->markTestIncomplete('MAGETWO-31165');
+        $this->markTestSkipped('MAGETWO-31165');
         $parentCategory = $this->createPartialMock(
             Category::class,
             ['getId', 'setStoreId', 'load']
@@ -260,7 +260,7 @@ public function testMoveWhenParentCategoryIsSameAsChildCategory(): void
         $this->expectExceptionMessage(
             'We can\'t move the category because the parent category name matches the child category name.'
         );
-        $this->markTestIncomplete('MAGETWO-31165');
+        $this->markTestSkipped('MAGETWO-31165');
         $parentCategory = $this->createPartialMock(
             Category::class,
             ['getId', 'setStoreId', 'load']

app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/ImportTest.php

@@ -186,7 +186,8 @@ private function buildSearchCriteria(array $args, ResolveInfo $info): SearchCrit
     {
         $productFields = (array)$info->getFieldSelection(1);
         $includeAggregations = isset($productFields['filters']) || isset($productFields['aggregations']);
-        $processedArgs = $this->argsSelection->process((string) $info->fieldName, $args);
+        $fieldName = $info->fieldName ?? "";
+        $processedArgs = $this->argsSelection->process((string) $fieldName, $args);
         $searchCriteria = $this->searchCriteriaBuilder->build($processedArgs, $includeAggregations);
 
         return $searchCriteria;

app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Category/Plugin/ImportTest.php

@@ -8,6 +8,8 @@
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Config as CatalogConfig;
+use Magento\Catalog\Model\Indexer\Product\Category as ProductCategoryIndexer;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor as ProductPriceIndexer;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\CatalogImportExport\Model\Import\Product\ImageTypeProcessor;
 use Magento\CatalogImportExport\Model\Import\Product\LinkProcessor;
@@ -1102,6 +1104,7 @@ protected function _deleteProducts()
                     'catalog_product_import_bunch_delete_after',
                     ['adapter' => $this, 'bunch' => $bunch]
                 );
+                $this->reindexProducts($idsToDelete);
             }
         }
         return $this;
@@ -1660,7 +1663,7 @@ protected function _saveProducts()
                         $prevAttributeSet,
                         $attributes
                     );
-                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+                    // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
                 } catch (Skip $skip) {
                     // Product is skipped.  Go on to the next one.
                 }
@@ -2466,9 +2469,17 @@ private function reindexStockStatus(array $productIds): void
      */
     private function reindexProducts($productIdsToReindex = [])
     {
-        $indexer = $this->indexerRegistry->get('catalog_product_category');
-        if (is_array($productIdsToReindex) && count($productIdsToReindex) > 0 && !$indexer->isScheduled()) {
-            $indexer->reindexList($productIdsToReindex);
+        if (is_array($productIdsToReindex) && !empty($productIdsToReindex)) {
+            $indexersToReindex = [
+                ProductCategoryIndexer::INDEXER_ID,
+                ProductPriceIndexer::INDEXER_ID
+            ];
+            foreach ($indexersToReindex as $id) {
+                $indexer = $this->indexerRegistry->get($id);
+                if (!$indexer->isScheduled()) {
+                    $indexer->reindexList($productIdsToReindex);
+                }
+            }
         }
     }