deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
IndexManager.php
View file

@ -10,8 +10,8 @@ class IndexManager
/**
* Constructor.
*
* @param array $indexesByName
* @param string $defaultIndexName
* @param array $indexesByName
* @param \Elastica_Index $defaultIndex
*/
public function __construct(array $indexesByName, \Elastica_Index $defaultIndex)
{
@ -33,8 +33,8 @@ class IndexManager
* Gets an index by its name
*
* @param string $name Index to return, or the default index if null
* @return Elastica_Index
* @throws InvalidArgumentException if no index exists for the given name
* @return \Elastica_Index
* @throws \InvalidArgumentException if no index exists for the given name
*/
public function getIndex($name = null)
{
@ -52,7 +52,7 @@ class IndexManager
/**
* Gets the default index
*
* @return Elastica_Index
* @return \Elastica_Index
*/
public function getDefaultIndex()
{