Change implementation to ensure one of current use cases is not broke…

…n. Add case with slash in regression integration test.
magento · Oct 5, 2020 · 38c4a3e · 38c4a3e
1 parent 970d179
commit 38c4a3e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/code/Magento/Search/Model/SynonymAnalyzer.php b/app/code/Magento/Search/Model/SynonymAnalyzer.php
@@ -137,8 +137,10 @@ 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));
-            $phrase = preg_quote($phrase, '/');
             $patterns[] = '^' . $phrase . ',';
             $patterns[] = ',' . $phrase . ',';
             $patterns[] = ',' . $phrase . '$';

diff --git a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymAnalyzerTest.php b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymAnalyzerTest.php
@@ -78,6 +78,10 @@ public static function loadGetSynonymsForPhraseDataProvider()
                 'phrase' => 'schlicht',
                 'expectedResult' => [['schlicht', 'natürlich']]
             ],
+            'withSlashInSearchPhrase' => [
+                'phrase' => 'orange hill/peak',
+                'expectedResult' => [['orange', 'magento'], ['hill/peak']]
+            ],
         ];
     }