diff --git a/lib/Elastica/Query.php b/lib/Elastica/Query.php index 594c8cd645..b878b8f7ef 100644 --- a/lib/Elastica/Query.php +++ b/lib/Elastica/Query.php @@ -401,7 +401,7 @@ public function setSuggest(Suggest $suggest) /** * Add a Rescore * - * @param \Elastica\Rescore\AbstractRescore $rescore suggestion object + * @param mixed $rescore suggestion object * @return $this */ public function setRescore($rescore) diff --git a/test/lib/Elastica/Test/Query/RescoreTest.php b/test/lib/Elastica/Test/Query/RescoreTest.php index 62325e3015..fc4e754803 100644 --- a/test/lib/Elastica/Test/Query/RescoreTest.php +++ b/test/lib/Elastica/Test/Query/RescoreTest.php @@ -146,13 +146,19 @@ public function testMultipleQueries() $query = new Query(); $mainQuery = new Match(); $mainQuery = $mainQuery->setFieldQuery('test1', 'foo'); + $secQuery1 = new Term(); $secQuery1 = $secQuery1->setTerm('test2', 'bar', 1); + $rescoreQuery1 = new QueryRescore(); + $rescoreQuery1->setRescoreQuery($secQuery1); + $secQuery2 = new Term(); $secQuery2 = $secQuery2->setTerm('test2', 'tom', 2); - $queryRescore = new QueryRescore(array($secQuery1, $secQuery2)); + $rescoreQuery2 = new QueryRescore(); + $rescoreQuery2->setRescoreQuery($secQuery2); + $query->setQuery($mainQuery); - $query->setRescore($queryRescore); + $query->setRescore(array($rescoreQuery1, $rescoreQuery2)); $data = $query->toArray(); $expected = array(