Merge branch '2.0.x' into 2.1.x

This commit is contained in:
Tim Nagel 2013-11-19 08:27:41 +11:00
commit 4fb0545a78

View file

@ -7,6 +7,7 @@ use FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
use FOS\ElasticaBundle\Paginator\TransformedPaginatorAdapter; use FOS\ElasticaBundle\Paginator\TransformedPaginatorAdapter;
use FOS\ElasticaBundle\Paginator\FantaPaginatorAdapter; use FOS\ElasticaBundle\Paginator\FantaPaginatorAdapter;
use Pagerfanta\Pagerfanta; use Pagerfanta\Pagerfanta;
use Elastica_Document;
use Elastica_Searchable; use Elastica_Searchable;
use Elastica_Query; use Elastica_Query;
@ -55,7 +56,7 @@ class TransformedFinder implements PaginatedFinderInterface
**/ **/
public function moreLikeThis($id, $params = array(), $query = array()) public function moreLikeThis($id, $params = array(), $query = array())
{ {
$doc = new Document($id); $doc = new Elastica_Document($id);
$results = $this->searchable->moreLikeThis($doc, $params, $query)->getResults(); $results = $this->searchable->moreLikeThis($doc, $params, $query)->getResults();
return $this->transformer->transform($results); return $this->transformer->transform($results);
@ -77,7 +78,6 @@ class TransformedFinder implements PaginatedFinderInterface
return $results; return $results;
} }
/** /**
* Gets a paginator wrapping the result of a search * Gets a paginator wrapping the result of a search
* *