Add missing pull request ids

Author: ruflin

changes.txt

@@ -1,13 +1,16 @@
 CHANGES
 
+2014-11-20
+- add cache control parameters support to Elastica\Filter\Bool #725
+
 2014-11-19
 - Avoid remove previously added params when adding a suggest to the query #726
 
 2014-11-13
-- fixed reserved words in queries which composed of upper case letters (Util::replaceBooleanWords)
+- fixed reserved words in queries which composed of upper case letters (Util::replaceBooleanWords) #722
 
 2014-10-31
-- Adding PSR-4 autoloading support
+- Adding PSR-4 autoloading support #714
 
 2014-10-29
 - Updated Type::getDocument() exception handling. \Elastica\Exception\ResponseException will be thrown instead of \Elastica\Exception\NotFoundException if the ES response contains any error (i.e: Missing index) (BC break) #687

lib/Elastica/Filter/Bool.php

@@ -127,6 +127,10 @@ public function toArray()
             $args['bool']['must_not'] = $this->_mustNot;
         }
 
+        if (isset($args['bool'])) {
+            $args['bool'] = array_merge($args['bool'], $this->getParams());
+        }
+
         return $args;
     }
 

test/lib/Elastica/Test/Filter/BoolTest.php

@@ -2,6 +2,7 @@
 
 namespace Elastica\Test\Filter;
 
+use Elastica\Filter\Terms;
 use \Elastica\Query;
 use Elastica\Filter\Bool;
 use Elastica\Filter\Term;
@@ -10,8 +11,15 @@
 
 class BoolTest extends BaseTest
 {
-    public function testToArray()
+
+    /**
+     * @return array
+     */
+    public function getTestToArrayData()
     {
+        $out = array();
+
+        // case #0
         $mainBool = new Bool();
 
         $idsFilter1 = new Ids();
@@ -44,8 +52,41 @@ public function testToArray()
                 )
             )
         );
+        $out[] = array($mainBool, $expectedArray);
+
+        // case #1 _cache parameter should be supported
+        $bool = new Bool();
+        $terms = new Terms('field1', array('value1', 'value2'));
+        $termsNot = new Terms('field2', array('value1', 'value2'));
+        $bool->addMust($terms);
+        $bool->addMustNot($termsNot);
+        $bool->setCached(true);
+        $bool->setCacheKey('my-cache-key');
+        $expected = array(
+            'bool' => array(
+                'must' => array(
+                    $terms->toArray()
+                ),
+                'must_not' => array(
+                    $termsNot->toArray()
+                ),
+                '_cache' => true,
+                '_cache_key' => 'my-cache-key'
+            )
+        );
+        $out[] = array($bool, $expected);
+
+        return $out;
+    }
 
-        $this->assertEquals($expectedArray, $mainBool->toArray());
+    /**
+     * @dataProvider getTestToArrayData()
+     * @param Bool $bool
+     * @param array $expectedArray
+     */
+    public function testToArray(Bool $bool, $expectedArray)
+    {
+        $this->assertEquals($expectedArray, $bool->toArray());
     }
 
     public function testBoolFilter()