Merge cs-fixes-30 into cs-fixes-31

This commit is contained in:
Tim Nagel 2015-03-12 21:57:26 +11:00
commit 345b5d423d
87 changed files with 525 additions and 543 deletions

View file

@ -53,9 +53,9 @@ class IndexConfig
/**
* Constructor expects an array as generated by the Container Configuration builder.
*
* @param string $name
* @param string $name
* @param TypeConfig[] $types
* @param array $config
* @param array $config
*/
public function __construct($name, array $types, array $config)
{
@ -92,7 +92,9 @@ class IndexConfig
/**
* @param string $typeName
*
* @return TypeConfig
*
* @throws \InvalidArgumentException
*/
public function getType($typeName)

View file

@ -20,6 +20,7 @@ interface ManagerInterface
* Returns configuration for an index.
*
* @param $index
*
* @return IndexConfig
*/
public function getIndexConfiguration($index);
@ -36,6 +37,7 @@ interface ManagerInterface
*
* @param string $index
* @param string $type
*
* @return TypeConfig
*/
public function getTypeConfiguration($index, $type);

View file

@ -17,9 +17,10 @@ use FOS\ElasticaBundle\Annotation\Search as BaseSearch;
* Annotation class for setting search repository.
*
* @Annotation
*
* @deprecated Use FOS\ElasticaBundle\Annotation\Search instead
* @Target("CLASS")
*/
class Search extends BaseSearch
{
}
}

View file

@ -57,6 +57,7 @@ class ContainerSource implements SourceInterface
* Builds TypeConfig objects for each type.
*
* @param array $config
*
* @return array
*/
protected function getTypes($config)

View file

@ -23,4 +23,4 @@ interface SourceInterface
* @return \FOS\ElasticaBundle\Configuration\IndexConfig[]
*/
public function getConfiguration();
}
}