Merge remote-tracking branch 'mainline/2.4-develop' into 2.4-develop-pr43

Author: serhii-balko

.editorconfig

@@ -10,3 +10,9 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.{yml,yaml,json}]
+indent_size = 2
+
+[{composer, auth}.json]
+indent_size = 4

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -23,6 +23,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Driver\File;
 use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
 use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
@@ -44,9 +45,10 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @since 100.0.2
  */
-class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
+class Product extends AbstractEntity
 {
-    const CONFIG_KEY_PRODUCT_TYPES = 'global/importexport/import_product_types';
+    public const CONFIG_KEY_PRODUCT_TYPES = 'global/importexport/import_product_types';
+    private const HASH_ALGORITHM = 'sha256';
 
     /**
      * Size of bunch - part of products to save in one step.
@@ -766,6 +768,11 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     private $linkProcessor;
 
+    /**
+     * @var File
+     */
+    private $fileDriver;
+
     /**
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\ImportExport\Helper\Data $importExportData
@@ -814,6 +821,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param StatusProcessor|null $statusProcessor
      * @param StockProcessor|null $stockProcessor
      * @param LinkProcessor|null $linkProcessor
+     * @param File|null $fileDriver
      * @throws LocalizedException
      * @throws \Magento\Framework\Exception\FileSystemException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -866,7 +874,8 @@ public function __construct(
         ProductRepositoryInterface $productRepository = null,
         StatusProcessor $statusProcessor = null,
         StockProcessor $stockProcessor = null,
-        LinkProcessor $linkProcessor = null
+        LinkProcessor $linkProcessor = null,
+        ?File $fileDriver = null
     ) {
         $this->_eventManager = $eventManager;
         $this->stockRegistry = $stockRegistry;
@@ -930,6 +939,7 @@ public function __construct(
         $this->dateTimeFactory = $dateTimeFactory ?? ObjectManager::getInstance()->get(DateTimeFactory::class);
         $this->productRepository = $productRepository ?? ObjectManager::getInstance()
                 ->get(ProductRepositoryInterface::class);
+        $this->fileDriver = $fileDriver ?: ObjectManager::getInstance()->get(File::class);
     }
 
     /**
@@ -1570,7 +1580,10 @@ protected function _saveProducts()
             $uploadedImages = [];
             $previousType = null;
             $prevAttributeSet = null;
+
+            $importDir = $this->_mediaDirectory->getAbsolutePath($this->getUploader()->getTmpDir());
             $existingImages = $this->getExistingImages($bunch);
+            $this->addImageHashes($existingImages);
 
             foreach ($bunch as $rowNum => $rowData) {
                 // reset category processor's failed categories array
@@ -1738,7 +1751,8 @@ protected function _saveProducts()
                 $position = 0;
                 foreach ($rowImages as $column => $columnImages) {
                     foreach ($columnImages as $columnImageKey => $columnImage) {
-                        if (!isset($uploadedImages[$columnImage])) {
+                        $uploadedFile = $this->getAlreadyExistedImage($rowExistingImages, $columnImage, $importDir);
+                        if (!$uploadedFile && !isset($uploadedImages[$columnImage])) {
                             $uploadedFile = $this->uploadMediaFiles($columnImage);
                             $uploadedFile = $uploadedFile ?: $this->getSystemFile($columnImage);
                             if ($uploadedFile) {
@@ -1753,7 +1767,7 @@ protected function _saveProducts()
                                     ProcessingError::ERROR_LEVEL_NOT_CRITICAL
                                 );
                             }
-                        } else {
+                        } elseif (isset($uploadedImages[$columnImage])) {
                             $uploadedFile = $uploadedImages[$columnImage];
                         }
 
@@ -1782,8 +1796,7 @@ protected function _saveProducts()
                             }
 
                             if (isset($rowLabels[$column][$columnImageKey])
-                                && $rowLabels[$column][$columnImageKey] !=
-                                $currentFileData['label']
+                                && $rowLabels[$column][$columnImageKey] !== $currentFileData['label']
                             ) {
                                 $labelsForUpdate[] = [
                                     'label' => $rowLabels[$column][$columnImageKey],
@@ -1792,7 +1805,7 @@ protected function _saveProducts()
                                 ];
                             }
                         } else {
-                            if ($column == self::COL_MEDIA_IMAGE) {
+                            if ($column === self::COL_MEDIA_IMAGE) {
                                 $rowData[$column][] = $uploadedFile;
                             }
                             $mediaGallery[$storeId][$rowSku][$uploadedFile] = [
@@ -1908,24 +1921,14 @@ protected function _saveProducts()
                 }
             }
 
-            $this->saveProductEntity(
-                $entityRowsIn,
-                $entityRowsUp
-            )->_saveProductWebsites(
-                $this->websitesCache
-            )->_saveProductCategories(
-                $this->categoriesCache
-            )->_saveProductTierPrices(
-                $tierPrices
-            )->_saveMediaGallery(
-                $mediaGallery
-            )->_saveProductAttributes(
-                $attributes
-            )->updateMediaGalleryVisibility(
-                $imagesForChangeVisibility
-            )->updateMediaGalleryLabels(
-                $labelsForUpdate
-            );
+            $this->saveProductEntity($entityRowsIn, $entityRowsUp)
+                ->_saveProductWebsites($this->websitesCache)
+                ->_saveProductCategories($this->categoriesCache)
+                ->_saveProductTierPrices($tierPrices)
+                ->_saveMediaGallery($mediaGallery)
+                ->_saveProductAttributes($attributes)
+                ->updateMediaGalleryVisibility($imagesForChangeVisibility)
+                ->updateMediaGalleryLabels($labelsForUpdate);
 
             $this->_eventManager->dispatch(
                 'catalog_product_import_bunch_save_after',
@@ -1939,6 +1942,87 @@ protected function _saveProducts()
 
     // phpcs:enable
 
+    /**
+     * Returns image hash by path
+     *
+     * @param string $path
+     * @return string
+     */
+    private function getFileHash(string $path): string
+    {
+        return hash_file(self::HASH_ALGORITHM, $path);
+    }
+
+    /**
+     * Returns existed image
+     *
+     * @param array $imageRow
+     * @param string $columnImage
+     * @param string $importDir
+     * @return string
+     */
+    private function getAlreadyExistedImage(array $imageRow, string $columnImage, string $importDir): string
+    {
+        if (filter_var($columnImage, FILTER_VALIDATE_URL)) {
+            $hash = $this->getFileHash($columnImage);
+        } else {
+            $path = $importDir . DS . $columnImage;
+            $hash = $this->isFileExists($path) ? $this->getFileHash($path) : '';
+        }
+
+        return array_reduce(
+            $imageRow,
+            function ($exists, $file) use ($hash) {
+                if (!$exists && isset($file['hash']) && $file['hash'] === $hash) {
+                    return $file['value'];
+                }
+
+                return $exists;
+            },
+            ''
+        );
+    }
+
+    /**
+     * Generate hashes for existing images for comparison with newly uploaded images.
+     *
+     * @param array $images
+     * @return void
+     */
+    private function addImageHashes(array &$images): void
+    {
+        $productMediaPath = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)
+            ->getAbsolutePath(DS . 'catalog' . DS . 'product');
+
+        foreach ($images as $storeId => $skus) {
+            foreach ($skus as $sku => $files) {
+                foreach ($files as $path => $file) {
+                    if ($this->fileDriver->isExists($productMediaPath . $file['value'])) {
+                        $fileName = $productMediaPath . $file['value'];
+                        $images[$storeId][$sku][$path]['hash'] = $this->getFileHash($fileName);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Is file exists
+     *
+     * @param string $path
+     * @return bool
+     */
+    private function isFileExists(string $path): bool
+    {
+        try {
+            $fileExists = $this->fileDriver->isExists($path);
+        } catch (\Exception $exception) {
+            $fileExists = false;
+        }
+
+        return $fileExists;
+    }
+
     /**
      * Clears entries from Image Set and Row Data marked as no_selection
      *
@@ -1950,9 +2034,8 @@ private function clearNoSelectionImages($rowImages, $rowData)
     {
         foreach ($rowImages as $column => $columnImages) {
             foreach ($columnImages as $key => $image) {
-                if ($image == 'no_selection') {
-                    unset($rowImages[$column][$key]);
-                    unset($rowData[$column]);
+                if ($image === 'no_selection') {
+                    unset($rowImages[$column][$key], $rowData[$column]);
                 }
             }
         }
@@ -2095,6 +2178,21 @@ protected function _saveProductTierPrices(array $tierPriceData)
         return $this;
     }
 
+    /**
+     * Returns the import directory if specified or a default import directory (media/import).
+     *
+     * @return string
+     */
+    private function getImportDir(): string
+    {
+        $dirConfig = DirectoryList::getDefaultConfig();
+        $dirAddon = $dirConfig[DirectoryList::MEDIA][DirectoryList::PATH];
+
+        return empty($this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR])
+            ? $dirAddon . DS . $this->_mediaDirectory->getRelativePath('import')
+            : $this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR];
+    }
+
     /**
      * Returns an object for upload a media files
      *
@@ -2111,11 +2209,7 @@ protected function _getUploader()
             $dirConfig = DirectoryList::getDefaultConfig();
             $dirAddon = $dirConfig[DirectoryList::MEDIA][DirectoryList::PATH];
 
-            if (!empty($this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR])) {
-                $tmpPath = $this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR];
-            } else {
-                $tmpPath = $dirAddon . '/' . $this->_mediaDirectory->getRelativePath('import');
-            }
+            $tmpPath = $this->getImportDir();
 
             if (!$fileUploader->setTmpDir($tmpPath)) {
                 throw new LocalizedException(

app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml

@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php
-/** @var $block \Magento\LayeredNavigation\Block\Navigation\FilterRenderer */
+/** @var \Magento\LayeredNavigation\Block\Navigation\FilterRenderer $block */
+/** @var \Magento\Framework\Escaper $escaper */
 /** @var \Magento\LayeredNavigation\ViewModel\Layer\Filter $viewModel */
 $viewModel = $block->getData('product_layer_view_model');
 ?>
@@ -16,28 +16,29 @@ $viewModel = $block->getData('product_layer_view_model');
     <?php foreach ($filterItems as $filterItem): ?>
         <li class="item">
             <?php if ($filterItem->getCount() > 0): ?>
-                <a href="<?= $block->escapeUrl($filterItem->getUrl()) ?>" rel="nofollow">
-                    <?= /* @noEscape */ $filterItem->getLabel() ?>
-                    <?php if ($viewModel->shouldDisplayProductCountOnLayer()): ?>
-                        <span class="count"><?= /* @noEscape */ (int)$filterItem->getCount() ?>
-                          <span class="filter-count-label">
-                            <?php if ($filterItem->getCount() == 1):
-                                ?> <?= $block->escapeHtml(__('item')) ?><?php
+                <a
+                    href="<?= $escaper->escapeUrl($filterItem->getUrl()) ?>"
+                    rel="nofollow"
+                ><?= /* @noEscape */ $filterItem->getLabel() ?><?php
+                if ($viewModel->shouldDisplayProductCountOnLayer()): ?><span
+                        class="count"><?= /* @noEscape */ (int) $filterItem->getCount() ?><span
+                            class="filter-count-label"><?php
+                            if ($filterItem->getCount() == 1): ?>
+                                <?= $escaper->escapeHtml(__('item')) ?><?php
                             else:
-                                ?> <?= $block->escapeHtml(__('item')) ?><?php
+                                ?><?= $escaper->escapeHtml(__('item')) ?><?php
                             endif;?></span></span>
-                    <?php endif; ?>
-                </a>
+                    <?php endif; ?></a>
             <?php else: ?>
-                <?= /* @noEscape */ $filterItem->getLabel() ?>
-                <?php if ($viewModel->shouldDisplayProductCountOnLayer()): ?>
-                    <span class="count"><?= /* @noEscape */ (int)$filterItem->getCount() ?>
-                      <span class="filter-count-label">
-                        <?php if ($filterItem->getCount() == 1):
-                            ?><?= $block->escapeHtml(__('items')) ?><?php
-                        else:
-                            ?><?= $block->escapeHtml(__('items')) ?><?php
-                        endif;?></span></span>
+                <?= /* @noEscape */ $filterItem->getLabel() ?><?php
+                if ($viewModel->shouldDisplayProductCountOnLayer()): ?><span
+                        class="count"><?= /* @noEscape */ (int) $filterItem->getCount() ?><span
+                            class="filter-count-label"><?php
+                            if ($filterItem->getCount() == 1): ?>
+                                <?= $escaper->escapeHtml(__('items')) ?><?php
+                            else:
+                                ?><?= $escaper->escapeHtml(__('items')) ?><?php
+                            endif;?></span></span>
                 <?php endif; ?>
             <?php endif; ?>
         </li>

app/code/Magento/Search/Model/SynonymAnalyzer.php

@@ -42,6 +42,7 @@ public function __construct(SynonymReader $synReader)
      *   3 => [ 0 => "british", 1 => "english" ],
      *   4 => [ 0 => "queen", 1 => "monarch" ]
      * ]
+     *
      * @param string $phrase
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException
@@ -136,6 +137,9 @@ private function getSearchPattern(array $words): string
     {
         $patterns = [];
         for ($lastItem = count($words); $lastItem > 0; $lastItem--) {
+            $words = array_map(function ($word) {
+                return preg_quote($word, '/');
+            }, $words);
             $phrase = implode("\s+", \array_slice($words, 0, $lastItem));
             $patterns[] = '^' . $phrase . ',';
             $patterns[] = ',' . $phrase . ',';

app/code/Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php

@@ -49,9 +49,9 @@ protected function setUp(): void
      */
     public function testGetSynonymsForPhrase()
     {
-        $phrase = 'Elizabeth is the british queen';
+        $phrase = 'Elizabeth/Angela is the british queen';
         $expected = [
-            0 => [ 0 => "Elizabeth" ],
+            0 => [ 0 => "Elizabeth/Angela" ],
             1 => [ 0 => "is" ],
             2 => [ 0 => "the" ],
             3 => [ 0 => "british", 1 => "english" ],

dev/tests/acceptance/staticRuleset.json

@@ -1,8 +1,8 @@
 {
-    "tests": [
-        "actionGroupArguments",
-        "deprecatedEntityUsage",
-        "annotations",
-        "pauseActionUsage"
-    ]
+  "tests": [
+    "actionGroupArguments",
+    "deprecatedEntityUsage",
+    "annotations",
+    "pauseActionUsage"
+  ]
 }