Merge pull request #592 from lalop/master

escape / with \\

Author: ruflin

lib/Elastica/Util.php

@@ -44,12 +44,15 @@ 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);
         }
 
+        // since elastisearch uses lucene 4.0 / needs to be escaped by \\
+        $result = str_replace('/', '\\\\/', $result);
+
         return $result;
     }
 

test/lib/Elastica/Test/UtilTest.php

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