Merge pull request #822 from ruflin/empty-bool-query-as-match-all

Fix empty bool query to act as match all query #817

Author: ruflin

changes.txt

@@ -1,5 +1,8 @@
 CHANGES
 
+2015-04-23
+- Fix empty bool query to act as match all query #817
+
 2015-04-15
 - deleteByQuery() implemented in Elastica\Index
 

lib/Elastica/Query/Bool.php

@@ -90,4 +90,18 @@ public function setMinimumNumberShouldMatch($minimumNumberShouldMatch)
     {
         return $this->setParam('minimum_number_should_match', $minimumNumberShouldMatch);
     }
+
+    /**
+     * Converts array to an object in case no queries are added
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        if (empty($this->_params)) {
+            $this->_params = new \stdClass();
+        }
+        return parent::toArray();
+    }
+
 }

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

@@ -111,4 +111,25 @@ public function testSearch()
 
         $this->assertEquals(0, $resultSet->count());
     }
+
+	public function testEmptyBoolQuery() {
+        $index = $this->_createIndex();
+		$type = new Type($index, 'test');
+
+		$docNumber = 3;
+		for ($i = 0; $i < $docNumber; $i++) {
+        	$doc = new Document($i, array('email' => '[email protected]'));
+			$type->addDocument($doc);
+		}
+
+		$index->refresh();
+
+		$boolQuery = new Bool();
+
+		$resultSet = $type->search($boolQuery);
+
+		$this->assertEquals($resultSet->count(), $docNumber);
+
+
+	}
 }