Merge branch '2.1.x'

Conflicts:
	Finder/TransformedFinder.php
This commit is contained in:
Tim Nagel 2013-11-19 08:29:02 +11:00
commit 40d3df9f92

View file

@ -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
*