Merge pull request #3962 from magento-obsessive-owls/MAGETWO-98738

Author: danmooney2

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

@@ -85,6 +85,7 @@ protected function _construct()
      */
     private function queryByPhrase($phrase)
     {
+        $phrase = $this->fullTextSelect->removeSpecialCharacters($phrase);
         $matchQuery = $this->fullTextSelect->getMatchQuery(
             ['synonyms' => 'synonyms'],
             $phrase,

dev/tests/integration/testsuite/Magento/Search/Model/SynonymReaderTest.php

@@ -31,6 +31,9 @@ public static function loadByPhraseDataProvider()
             [
                 'ELIZABETH', []
             ],
+            [
+                '-+<(ELIZABETH)>*~', []
+            ],
             [
                 'ENGLISH', [['synonyms' => 'british,english', 'store_id' => 1, 'website_id' => 0]]
             ],
@@ -43,6 +46,9 @@ public static function loadByPhraseDataProvider()
             [
                 'Monarch', [['synonyms' => 'queen,monarch', 'store_id' => 1, 'website_id' => 0]]
             ],
+            [
+                '-+<(Monarch)>*~', [['synonyms' => 'queen,monarch', 'store_id' => 1, 'website_id' => 0]]
+            ],
             [
                 'MONARCH English', [
                 ['synonyms' => 'queen,monarch', 'store_id' => 1, 'website_id' => 0],

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

@@ -7,8 +7,18 @@
 
 use Magento\Framework\App\ResourceConnection;
 
+/**
+ * MySQL Fulltext Query Builder
+ */
 class Fulltext
 {
+    /**
+     * Characters that have special meaning in fulltext match syntax
+     *
+     * @var string
+     */
+    const SPECIAL_CHARACTERS = '-+<>*()~';
+
     /**
      * FULLTEXT search in MySQL search mode "natural language"
      */
@@ -51,7 +61,7 @@ public function __construct(ResourceConnection $resource)
     {
         $this->connection = $resource->getConnection();
     }
-    
+
     /**
      * Method for FULLTEXT search in Mysql, will generated MATCH ($columns) AGAINST ('$expression' $mode)
      *
@@ -73,8 +83,7 @@ public function getMatchQuery($columns, $expression, $mode = self::FULLTEXT_MODE
     }
 
     /**
-     * Method for FULLTEXT search in Mysql, will added generated
-     * MATCH ($columns) AGAINST ('$expression' $mode) to where clause
+     * Method for FULLTEXT search in Mysql; will add generated MATCH ($columns) AGAINST ('$expression' $mode) to $select
      *
      * @param \Magento\Framework\DB\Select $select
      * @param string|string[] $columns Columns which add to MATCH ()
@@ -95,4 +104,15 @@ 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);
+    }
 }