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

View File

@ -91,6 +91,7 @@ class EntityChoiceList extends ObjectChoiceList
* @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 array $preferredEntities An array of preferred choices
* @param string $groupPath A property path pointing to the property used * @param string $groupPath A property path pointing to the property used
* to group the choices. Only allowed if * to group the choices. Only allowed if
* the choices are given as flat array. * the choices are given as flat array.