MAGETWO-44555: Exception in Advanced Search if used special symbols

 - Fixed Binder and Cleaner

Author: aohorodnyk

lib/internal/Magento/Framework/Search/Adapter/Mysql/Query/Builder/Match.php

@@ -12,17 +12,18 @@
 use Magento\Framework\Search\Adapter\Mysql\ScoreBuilder;
 use Magento\Framework\Search\Request\Query\BoolExpression;
 use Magento\Framework\Search\Request\QueryInterface as RequestQueryInterface;
+use Zend_Db_Expr;
 
 class Match implements QueryInterface
 {
-    const SPECIAL_CHARACTERS = '-+~/\\<>\'":*$#@()!,.?`=%';
+    const SPECIAL_CHARACTERS = '-+~/\<>\'":*$#@()!,.?`=%^';
 
     const MINIMAL_CHARACTER_LENGTH = 3;
 
     /**
      * @var string[]
      */
-    private $replaceSymbols = [];
+    private $pattern = [];
 
     /**
      * @var ResolverInterface
@@ -50,7 +51,12 @@ public function __construct(
         $fulltextSearchMode = Fulltext::FULLTEXT_MODE_BOOLEAN
     ) {
         $this->resolver = $resolver;
-        $this->replaceSymbols = str_split(self::SPECIAL_CHARACTERS, 1);
+        $characters = str_split(self::SPECIAL_CHARACTERS, 1);
+        foreach ($characters as $key => $value) {
+            $characters[$key] = "\\{$value}";
+        }
+        $characters = implode('', $characters);
+        $this->pattern = $characters = "/([{$characters}])/";
         $this->fulltextHelper = $fulltextHelper;
         $this->fulltextSearchMode = $fulltextSearchMode;
     }
@@ -85,7 +91,7 @@ public function build(
 
         $matchQuery = $this->fulltextHelper->getMatchQuery(
             $columns,
-            $queryValue,
+            new Zend_Db_Expr($queryValue),
             $this->fulltextSearchMode
         );
         $scoreBuilder->addCondition($matchQuery, true);
@@ -106,7 +112,7 @@ public function build(
      */
     protected function prepareQuery($queryValue, $conditionType)
     {
-        $queryValue = str_replace($this->replaceSymbols, ' ', $queryValue);
+        $queryValue = preg_replace($this->pattern, '\\\\$1', $queryValue);
 
         $stringPrefix = '';
         if ($conditionType === BoolExpression::QUERY_CONDITION_MUST) {

lib/internal/Magento/Framework/Search/Request/Binder.php

@@ -81,6 +81,7 @@ private function processData($data, $bindData)
                         } else {
                             $data[$key] = $bindValue;
                         }
+                        $data['is_bind'] = true;
                     }
                 }
             }

lib/internal/Magento/Framework/Search/Request/Cleaner.php

@@ -90,8 +90,7 @@ private function cleanQuery($queryName)
                 }
                 break;
             case QueryInterface::TYPE_MATCH:
-                if (preg_match('/\$(.+)\$/si', $query['value'], $matches)
-                    && !preg_match('/^\$+$/si', $query['value'], $matches)) {
+                if (!array_key_exists('is_bind', $query)) {
                     unset($this->requestData['queries'][$queryName]);
                 }
                 break;
@@ -131,8 +130,9 @@ private function cleanAggregations()
                 foreach ($this->requestData['aggregations'] as $aggregationName => $aggregationValue) {
                     switch ($aggregationValue['type']) {
                         case 'dynamicBucket':
-                            if (is_string($aggregationValue['method'])
-                                && preg_match('/\$(.+)\$/si', $aggregationValue['method'])
+                            if (
+                                !array_key_exists('is_bind', $aggregationValue)
+                                && is_string($aggregationValue['method'])
                             ) {
                                 unset($this->requestData['aggregations'][$aggregationName]);
                             }