Merge branch '2.1.x'
Conflicts: Finder/TransformedFinder.php
This commit is contained in:
commit
40d3df9f92
|
@ -2,7 +2,7 @@
|
|||
|
||||
namespace FOS\ElasticaBundle\Finder;
|
||||
|
||||
use FOS\ElasticaBundle\Finder\PaginatedFinderInterface;
|
||||
use Elastica\Document;
|
||||
use FOS\ElasticaBundle\Transformer\ElasticaToModelTransformerInterface;
|
||||
use FOS\ElasticaBundle\Paginator\TransformedPaginatorAdapter;
|
||||
use FOS\ElasticaBundle\Paginator\FantaPaginatorAdapter;
|
||||
|
@ -77,7 +77,6 @@ class TransformedFinder implements PaginatedFinderInterface
|
|||
return $results;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Gets a paginator wrapping the result of a search
|
||||
*
|
||||
|
|
Loading…
Reference in a new issue