merged branch bamarni/patch-5 (PR #5285)

Commits
-------

bd9319b added a missing phpdoc param

Discussion
----------

added a missing phpdoc param
This commit is contained in:
Fabien Potencier 2012-08-17 18:59:45 +02:00
commit 248a48ae49
1 changed files with 9 additions and 8 deletions

View File

@ -86,14 +86,15 @@ class EntityChoiceList extends ObjectChoiceList
/** /**
* Creates a new entity choice list. * Creates a new entity choice list.
* *
* @param ObjectManager $manager An EntityManager instance * @param ObjectManager $manager An EntityManager instance
* @param string $class The class name * @param string $class The class name
* @param string $labelPath The property path used for the label * @param string $labelPath The property path used for the label
* @param EntityLoaderInterface $entityLoader An optional query builder * @param EntityLoaderInterface $entityLoader An optional query builder
* @param array $entities An array of choices * @param array $entities An array of choices
* @param string $groupPath A property path pointing to the property used * @param array $preferredEntities An array of preferred choices
* to group the choices. Only allowed if * @param string $groupPath A property path pointing to the property used
* the choices are given as flat array. * to group the choices. Only allowed if
* the choices are given as flat array.
*/ */
public function __construct(ObjectManager $manager, $class, $labelPath = null, EntityLoaderInterface $entityLoader = null, $entities = null, array $preferredEntities = array(), $groupPath = null) public function __construct(ObjectManager $manager, $class, $labelPath = null, EntityLoaderInterface $entityLoader = null, $entities = null, array $preferredEntities = array(), $groupPath = null)
{ {