Merge remote-tracking branch 'cevou/master' into pr/245

Conflicts:
	Command/PopulateCommand.php
	Command/SearchCommand.php
	DependencyInjection/Configuration.php
	Doctrine/AbstractElasticaToModelTransformer.php
	Doctrine/AbstractListener.php
	Doctrine/MongoDB/ElasticaToModelTransformer.php
	Doctrine/ORM/ElasticaToModelTransformer.php
	Doctrine/RepositoryManager.php
	Finder/TransformedFinder.php
	Paginator/PaginatorAdapterInterface.php
	Paginator/RawPaginatorAdapter.php
	Persister/ObjectPersister.php
	Propel/ElasticaToModelTransformer.php
	Subscriber/PaginateElasticaQuerySubscriber.php
	Tests/DataCollector/ElasticaDataCollectorTest.php
	Tests/Doctrine/AbstractProviderTest.php
	Tests/Doctrine/RepositoryManagerTest.php
	Tests/Manager/RepositoryManagerTest.php
	Tests/RepositoryTest.php
	Transformer/ElasticaToModelTransformerCollection.php
	composer.json
This commit is contained in:
Jeremy Mikola 2013-03-27 14:58:34 -04:00
commit 440c36f537
46 changed files with 190 additions and 92 deletions

View file

@ -8,6 +8,10 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use FOS\ElasticaBundle\IndexManager;
use FOS\ElasticaBundle\Provider\ProviderRegistry;
use FOS\ElasticaBundle\Resetter;
use FOS\ElasticaBundle\Provider\ProviderInterface;
/**
* Populate the search index
@ -15,17 +19,17 @@ use Symfony\Component\Console\Output\Output;
class PopulateCommand extends ContainerAwareCommand
{
/**
* @var FOS\ElasticaBundle\IndexManager
* @var IndexManager
*/
private $indexManager;
/**
* @var FOS\ElasticaBundle\Provider\ProviderRegistry
* @var ProviderRegistry
*/
private $providerRegistry;
/**
* @var FOS\ElasticaBundle\Resetter
* @var Resetter
*/
private $resetter;
@ -95,6 +99,7 @@ class PopulateCommand extends ContainerAwareCommand
$this->resetter->resetIndex($index);
}
/** @var $providers ProviderInterface[] */
$providers = $this->providerRegistry->getIndexProviders($index);
foreach ($providers as $type => $provider) {