Merge branch 'ACP2E-2279' of https://github.com/magento-l3/magento2ce into PR-VK-2023-09-29

Author: vkolesny

app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php

@@ -164,7 +164,8 @@ public function getField(AbstractAttribute $attribute): array
                 ),
                 'index' => $this->indexTypeConverter->convert(
                     IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
-                )
+                ),
+                'normalizer' => 'folding',
             ];
         }
 
@@ -202,7 +203,8 @@ public function getField(AbstractAttribute $attribute): array
                     ),
                     'index' => $this->indexTypeConverter->convert(
                         IndexTypeConverterInterface::INTERNAL_NO_ANALYZE_VALUE
-                    )
+                    ),
+                    'normalizer' => 'folding',
                 ];
             }
         }

app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php

@@ -105,6 +105,12 @@ public function build()
                 'tokenizer' => $tokenizer,
                 'filter' => array_merge($filter, $synonymFilter),
                 'char_filter' => $charFilter,
+                'normalizer' => [
+                    'folding' => [
+                        'type' => 'custom',
+                        'filter' => ['asciifolding', 'lowercase'],
+                    ],
+                ],
             ],
         ];
 

app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/FieldMapper/Product/FieldProvider/StaticFieldTest.php

@@ -297,6 +297,7 @@ public function attributeProvider(): array
                             'sort_attr_code' => [
                                 'type' => 'string',
                                 'index' => 'not_analyzed',
+                                'normalizer' => 'folding',
                             ],
                         ],
                     ],
@@ -375,6 +376,7 @@ public function attributeProvider(): array
                             'sort_attr_code' => [
                                 'type' => 'string',
                                 'index' => 'not_analyzed',
+                                'normalizer' => 'folding',
                             ],
                         ],
                     ],

dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php

@@ -6,7 +6,9 @@
 namespace Magento\Elasticsearch\Model\Indexer;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Test\Fixture\Product as ProductFixture;
 use Magento\Indexer\Model\Indexer;
+use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
@@ -75,6 +77,7 @@ protected function assertPreConditions(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $currentEngine = $objectManager->get(EngineResolverInterface::class)->getCurrentSearchEngine();
+        // phpstan:ignore "Class Magento\TestModuleCatalogSearch\Model\SearchEngineVersionReader not found."
         $installedEngine = $objectManager->get(SearchEngineVersionReader::class)->getFullVersion();
         $this->assertEquals(
             $installedEngine,
@@ -166,6 +169,29 @@ public function testSortCaseSensitive(): void
         self::assertEquals($productThird->getId(), $fifthInSearchResults);
     }
 
+    #[
+        DataFixture(ProductFixture::class, ['sku' => 'p1', 'name' => 'A']),
+        DataFixture(ProductFixture::class, ['sku' => 'p2', 'name' => 'Ç']),
+        DataFixture(ProductFixture::class, ['sku' => 'p3', 'name' => 'D']),
+        DataFixture(ProductFixture::class, ['sku' => 'p4', 'name' => 'Ü']),
+        DataFixture(ProductFixture::class, ['sku' => 'p5', 'name' => 'Z']),
+    ]
+    public function testSortAccentedCharacters(): void
+    {
+        $expectedOrder = [
+            (int) $this->productRepository->get('p1')->getId(),
+            (int) $this->productRepository->get('p2')->getId(),
+            (int) $this->productRepository->get('p3')->getId(),
+            (int) $this->productRepository->get('p4')->getId(),
+            (int) $this->productRepository->get('p5')->getId(),
+        ];
+        $this->reindexAll();
+
+        $result = $this->sortByName();
+        $actualOrder = array_map(fn ($id) => (int) $id, array_column($result, '_id'));
+        self::assertEquals($expectedOrder, $actualOrder);
+    }
+
     /**
      * Test search of specific product after full reindex
      *