Use * as wildcard, thus align with kernel PR

ezsystems · Feb 1, 2019 · e648a6f · e648a6f
1 parent bd2d90b
commit e648a6f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/lib/Query/Common/CriterionVisitor/Field/FieldLike.php b/lib/Query/Common/CriterionVisitor/Field/FieldLike.php
@@ -54,17 +54,13 @@ public function visit(Criterion $criterion, CriterionVisitor $subVisitor = null)
 
         $queries = [];
         foreach ($searchFields as $name => $fieldType) {
-            $preparedValue = $this->escapeWildcard(
-                $this->toString(
-                    $this->mapSearchFieldValue($criterion->value, $fieldType)
-                )
-            );
+            $preparedValue = $this->toString($this->mapSearchFieldValue($criterion->value, $fieldType));
 
-            // Todo: Verify (add integration tests) that % has actually worked with SQL engine before we add here & api doc
-            if (strpos($preparedValue, '%') !== false) {
-                $queries[] = $name . ':' . str_replace('%', '*', $preparedValue);
+            // Check if there is user supplied wildcard or not
+            if (strpos($preparedValue, '*') !== false) {
+                $queries[] = $name . ':' . $this->escapeExpressions($preparedValue, true);
             } else {
-                $queries[] = $name . ':*' . $preparedValue . '*';
+                $queries[] = $name . ':"' . $this->escapeQuote($preparedValue) . '"';
             }
         }
 

diff --git a/lib/Query/CriterionVisitor.php b/lib/Query/CriterionVisitor.php
@@ -134,20 +134,27 @@ protected function escapeQuote($string, $doubleQuote = false)
     }
 
     /**
-     * Escapes value for use in wildcard search.
+     * Escapes value for use in expressions.
+     *
+     * @param string $string
+     * @param bool $allowWildcard Allow "*" in expression.
      *
-     * @param $value
      * @return mixed
      */
-    protected function escapeWildcard($value)
+    protected function escapeExpressions($string, $allowWildcard = false)
     {
-        $reservedCharacters = preg_quote('+-&|!(){}[]^"~*?:\\ ');
+        if ($allowWildcard) {
+            $reservedCharacters = preg_quote('+-&|!(){}[]^"~?:\\ ');
+        } else {
+            $reservedCharacters = preg_quote('+-&|!(){}[]^"~*?:\\ ');
+        }
 
         return preg_replace_callback(
             '/([' . $reservedCharacters . '])/',
             function ($matches) {
                 return '\\' . $matches[0];
             },
-            $value);
+            $string
+        );
     }
 }