Merge pull request #722 from jkbnerad/master

Fixed replacing reserved words.

Author: ruflin

changes.txt

@@ -1,5 +1,8 @@
 CHANGES
 
+2014-11-13
+- fixed reserved words in queries which composed of upper case letters (Util::replaceBooleanWords)
+
 2014-10-31
 - Adding PSR-4 autoloading support
 

lib/Elastica/Util.php

@@ -65,7 +65,7 @@ public static function escapeTerm($term)
      */
     public static function replaceBooleanWords($term)
     {
-        $replacementMap = array('AND'=>'&&', 'OR'=>'||', 'NOT'=>'!');
+        $replacementMap = array(' AND '=>' && ', ' OR '=>' || ', ' NOT '=>' !');
         $result = strtr($term, $replacementMap);
 
         return $result;

test/lib/Elastica/Test/UtilTest.php

@@ -29,6 +29,26 @@ public function getEscapeTermPairs()
         );
     }
 
+    /**
+     * @dataProvider getReplaceBooleanWordsPairs
+     */
+    public function testReplaceBooleanWords($before, $after) 
+    {
+        $this->assertEquals($after, Util::replaceBooleanWords($before));
+    }
+    
+    public function getReplaceBooleanWordsPairs()
+    {
+        return array(
+            array('to be OR not to be', 'to be || not to be'),
+            array('ORIGINAL GIFTS', 'ORIGINAL GIFTS'),
+            array('Black AND White', 'Black && White'),
+            array('TIMBERLAND Men`s', 'TIMBERLAND Men`s'),
+            array('hello NOT kitty', 'hello !kitty'),
+            array('SEND NOTIFICATION', 'SEND NOTIFICATION')
+        );
+    }        
+    
     public function testEscapeTermSpecialCharacters()
     {
         $before = '\\+-&&||!(){}[]^"~*?:/';