Merge remote-tracking branch 'remotes/origin/MAGETWO-98738' into owls-delivery

Author: danmooney2

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'],
             $phrase,
-            Fulltext::FULLTEXT_MODE_BOOLEAN
+            Fulltext::FULLTEXT_MODE_NATURAL
         );
         $query = $this->getConnection()->select()->from(
             $this->getMainTable()

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

@@ -12,13 +12,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"
      */
@@ -104,15 +97,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($expression)
-    {
-        return str_replace(str_split(static::SPECIAL_CHARACTERS), '', $expression);
-    }
 }