Merge remote-tracking branch 'upstream/2.3-qwerty' into MC-15662

Author: Hwashiang Yu

app/code/Magento/Search/Model/ResourceModel/SynonymReader.php

@@ -85,11 +85,10 @@ protected function _construct()
      */
     private function queryByPhrase($phrase)
     {
-        $phrase = $this->fullTextSelect->removeSpecialCharacters($phrase);
         $matchQuery = $this->fullTextSelect->getMatchQuery(
             ['synonyms' => 'synonyms'],
-            $this->escapePhrase($phrase),
-            Fulltext::FULLTEXT_MODE_BOOLEAN
+            $phrase,
+            Fulltext::FULLTEXT_MODE_NATURAL
         );
         $query = $this->getConnection()->select()->from(
             $this->getMainTable()
@@ -98,18 +97,6 @@ private function queryByPhrase($phrase)
         return $this->getConnection()->fetchAll($query);
     }
 
-    /**
-     * Cut trailing plus or minus sign, and @ symbol, using of which causes InnoDB to report a syntax error.
-     *
-     * @see https://dev.mysql.com/doc/refman/5.7/en/fulltext-boolean.html
-     * @param string $phrase
-     * @return string
-     */
-    private function escapePhrase(string $phrase): string
-    {
-        return preg_replace('/@+|[@+-]+$/', '', $phrase);
-    }
-
     /**
      * A private helper function to retrieve matching synonym groups per scope
      *

lib/internal/Magento/Framework/DB/Helper/Mysql/Fulltext.php

@@ -14,13 +14,6 @@
  */
 class Fulltext
 {
-    /**
-     * Characters that have special meaning in fulltext match syntax
-     *
-     * @var string
-     */
-    const SPECIAL_CHARACTERS = '-+<>*()~';
-
     /**
      * FULLTEXT search in MySQL search mode "natural language"
      */
@@ -106,15 +99,4 @@ public function match($select, $columns, $expression, $isCondition = true, $mode
 
         return $select;
     }
-
-    /**
-     * Remove special characters from fulltext query expression
-     *
-     * @param string $expression
-     * @return string
-     */
-    public function removeSpecialCharacters(string $expression): string
-    {
-        return str_replace(str_split(static::SPECIAL_CHARACTERS), '', $expression);
-    }
 }