Merge branch 'release/2.0.1'

src/Lexer.php

@@ -16,4 +16,28 @@ class Lexer extends BaseLexer
 {
     // Overriding this to include $ search by.
     const REGEX_VALUE       = '/(\w|\$|\-|\+|\*|\?|\:|\.|\%[0-9a-f]{2})+/Ai';
+
+    /**
+     * Custom replace - to %2D for easier find by.
+     *
+     * @param string $code request uri params
+     * @return \Xiag\Rql\Parser\TokenStream
+     */
+    public function tokenize($code)
+    {
+        // Replace for each string value between (), there can be many rql params.
+        if (strpos($code, 'string:') !== false) {
+            preg_match_all('/\(.*?string:(.*?)\)/', $code, $matches);
+            if (array_key_exists(1, $matches) && !empty($matches)) {
+                foreach ($matches[1] as $match) {
+                    if (strpos($match, '-') !== false) {
+                        $new = preg_replace('/-/', '%2D', 'string:' . $match, 1);
+                        $code = preg_replace('/string:' . $match . '/', $new, $code, 1);
+                    }
+                }
+            }
+        }
+
+        return parent::tokenize($code);
+    }
 }