Merge remote-tracking branch 'tango/MC-36111' into PR-2020-07-22

Author: dhorytskyi

app/code/Magento/CatalogSearch/Model/Advanced.php

@@ -233,11 +233,6 @@ public function addFilters($values)
                     ? date('Y-m-d\TH:i:s\Z', strtotime($value['to']))
                     : '';
             }
-
-            if ($attribute->getAttributeCode() === 'sku') {
-                $value = mb_strtolower($value);
-            }
-
             $condition = $this->_getResource()->prepareCondition(
                 $attribute,
                 $value,

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

@@ -104,7 +104,6 @@ public function __construct(
      * @param array $context
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getFields(array $context = []): array
     {
@@ -121,9 +120,6 @@ public function getFields(array $context = []): array
             $allAttributes[$fieldName] = [
                 'type' => $this->fieldTypeResolver->getFieldType($attributeAdapter),
             ];
-            if ($this->isNeedToAddCustomAnalyzer($fieldName) && $this->getCustomAnalyzer($fieldName)) {
-                $allAttributes[$fieldName]['analyzer'] = $this->getCustomAnalyzer($fieldName);
-            }
 
             $index = $this->fieldIndexResolver->getFieldIndex($attributeAdapter);
             if (null !== $index) {
@@ -178,26 +174,4 @@ public function getFields(array $context = []): array
 
         return $allAttributes;
     }
-
-    /**
-     * Check is the custom analyzer exists for the field
-     *
-     * @param string $fieldName
-     * @return bool
-     */
-    private function isNeedToAddCustomAnalyzer(string $fieldName): bool
-    {
-        return $fieldName === 'sku';
-    }
-
-    /**
-     * Getter for the field custom analyzer if it's exists
-     *
-     * @param string $fieldName
-     * @return string|null
-     */
-    private function getCustomAnalyzer(string $fieldName): ?string
-    {
-        return $fieldName === 'sku' ? 'sku' : null;
-    }
 }

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

@@ -62,14 +62,6 @@ public function build()
                             array_keys($filter)
                         ),
                         'char_filter' => array_keys($charFilter)
-                    ],
-                    'sku' => [
-                        'type' => 'custom',
-                        'tokenizer' => 'keyword',
-                        'filter' => array_merge(
-                            ['lowercase', 'keyword_repeat'],
-                            array_keys($filter)
-                        ),
                     ]
                 ],
                 'tokenizer' => $tokenizer,
@@ -99,11 +91,12 @@ public function setStoreId($storeId)
      */
     protected function getTokenizer()
     {
-        return [
+        $tokenizer = [
             'default_tokenizer' => [
-                'type' => 'standard'
-            ]
+                'type' => 'standard',
+            ],
         ];
+        return $tokenizer;
     }
 
     /**
@@ -113,13 +106,14 @@ protected function getTokenizer()
      */
     protected function getFilter()
     {
-        return [
+        $filter = [
             'default_stemmer' => $this->getStemmerConfig(),
             'unique_stem' => [
                 'type' => 'unique',
                 'only_on_same_position' => true
             ]
         ];
+        return $filter;
     }
 
     /**
@@ -129,11 +123,12 @@ protected function getFilter()
      */
     protected function getCharFilter()
     {
-        return [
+        $charFilter = [
             'default_char_filter' => [
                 'type' => 'html_strip',
             ],
         ];
+        return $charFilter;
     }
 
     /**

dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php

@@ -68,41 +68,6 @@ public function testExecute(array $searchParams): void
         $this->assertContains('Simple product name', $responseBody);
     }
 
-    /**
-     * Advanced search test by difference product attributes.
-     *
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-     * @magentoAppArea frontend
-     * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
-     * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
-     *
-     * @return void
-     */
-    public function testExecuteSkuWithHyphen(): void
-    {
-        $this->getRequest()->setQuery(
-            $this->_objectManager->create(
-                Parameters::class,
-                [
-                    'values' => [
-                        'name' => '',
-                        'sku' => '24-mb01',
-                        'description' => '',
-                        'short_description' => '',
-                        'price' => [
-                            'from' => '',
-                            'to' => '',
-                        ],
-                        'test_searchable_attribute' => '',
-                    ]
-                ]
-            )
-        );
-        $this->dispatch('catalogsearch/advanced/result');
-        $responseBody = $this->getResponse()->getBody();
-        $this->assertContains('Simple product name', $responseBody);
-    }
-
     /**
      * Data provider with strings for quick search.
      *