Merge pull request #795 from topikito/escape-new-symbols

[RFR] Escape new symbols in Util::escapeTerm (fixes #794)

lib/Elastica/Util.php

@@ -10,6 +10,7 @@
  * @author Nicolas Ruflin <[email protected]>
  * @author Thibault Duplessis <[email protected]>
  * @author Oleg Zinchenko <[email protected]>
+ * @author Roberto Nygaard <[email protected]>
  */
 class Util
 {
@@ -35,9 +36,10 @@ public static function replaceBooleanWordsAndEscapeTerm($term)
 
     /**
      * Escapes the following terms (because part of the query language)
-     * + - && || ! ( ) { } [ ] ^ " ~ * ? : \
+     * + - && || ! ( ) { } [ ] ^ " ~ * ? : \ < >
      *
      * @link http://lucene.apache.org/java/2_4_0/queryparsersyntax.html#Escaping%20Special%20Characters
+     * @link http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#_reserved_characters
      *
      * @param  string $term Query term to escape
      * @return string Escaped query term
@@ -46,7 +48,7 @@ public static function escapeTerm($term)
     {
         $result = $term;
         // \ escaping has to be first, otherwise escaped later once again
-        $chars = array('\\', '+', '-', '&&', '||', '!', '(', ')', '{', '}', '[', ']', '^', '"', '~', '*', '?', ':', '/');
+        $chars = array('\\', '+', '-', '&&', '||', '!', '(', ')', '{', '}', '[', ']', '^', '"', '~', '*', '?', ':', '/', '<', '>');
 
         foreach ($chars as $char) {
             $result = str_replace($char, '\\'.$char, $result);

test/lib/Elastica/Test/UtilTest.php

@@ -51,8 +51,8 @@ public function getReplaceBooleanWordsPairs()
 
     public function testEscapeTermSpecialCharacters()
     {
-        $before = '\\+-&&||!(){}[]^"~*?:/';
-        $after = '\\\\\\+\\-\\&&\\||\\!\\(\\)\\{\\}\\[\\]\\^\\"\\~\\*\\?\\:\\/';
+        $before = '\\+-&&||!(){}[]^"~*?:/<>';
+        $after = '\\\\\\+\\-\\&&\\||\\!\\(\\)\\{\\}\\[\\]\\^\\"\\~\\*\\?\\:\\/\<\>';
 
         $this->assertEquals(Util::escapeTerm($before), $after);
     }