Removes requirement of the arguments in the constructor method (Filtered) in favor #615

changes.txt

@@ -1,5 +1,9 @@
 CHANGES
 
+2014-05-15
+ - Removed the requirement to set arguments filter and/or query in Filtered, according to the documentation:
+ http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl-filtered-query.html
+
 2014-05-13
 - Add JSON compat library; Elasticsearch JSON flags and nicer error handling
 

lib/Elastica/Query/Filtered.php

@@ -1,7 +1,9 @@
 <?php
 
 namespace Elastica\Query;
+
 use Elastica\Filter\AbstractFilter;
+use Elastica\Exception\InvalidException;
 
 /**
  * Filtered query. Needs a query and a filter
@@ -33,10 +35,12 @@ class Filtered extends AbstractQuery
      * @param \Elastica\Query\AbstractQuery   $query  Query object
      * @param \Elastica\Filter\AbstractFilter $filter Filter object
      */
-    public function __construct(AbstractQuery $query, AbstractFilter $filter)
-    {
-        $this->setQuery($query);
-        $this->setFilter($filter);
+    public function __construct(
+        AbstractQuery $query = null,
+        AbstractFilter $filter = null
+    ) {
+        $this->_query  = $query;
+        $this->_filter = $filter;
     }
 
     /**
@@ -93,9 +97,20 @@ public function getQuery()
      */
     public function toArray()
     {
-        return array('filtered' => array(
-            'query' => $this->_query->toArray(),
-            'filter' => $this->_filter->toArray()
-        ));
+        $filtered = array();
+
+        if ($this->_query !== null) {
+            $filtered['query'] = $this->_query->toArray();
+        }
+
+        if ($this->_filter !== null) {
+            $filtered['filter'] = $this->_filter->toArray();
+        }
+
+        if (empty($filtered)) {
+            throw new InvalidException('A query and/or filter is required');
+        }
+
+        return array('filtered' => $filtered);
     }
 }

test/lib/Elastica/Test/Query/FilteredTest.php

@@ -62,4 +62,13 @@ public function testFilteredGetter()
         $this->assertEquals($query1->getFilter(), $filter1);
         $this->assertEquals($query2->getFilter(), $filter2);
     }
+
+    /**
+     * @expectedException \Elastica\Exception\InvalidException
+     */
+    public function testFilteredWithoutArgumentsShouldRaiseException()
+    {
+        $query = new Filtered();
+        $query->toArray();
+    }
 }