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

Commits ------- bd9319b added a missing phpdoc param Discussion ---------- added a missing phpdoc param

Author: fabpot

src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php

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