Merge remote-tracking branch 'origin/master' into upgrade-sf5

src/Bundle/ChillEventBundle/Form/EventType.php

@@ -18,9 +18,9 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateTimeType;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Form\Type\PickUserLocationType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Form\Type\UserPickerType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\MoneyType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -45,14 +45,8 @@ class EventType extends AbstractType
                     'class' => '',
                 ],
             ])
-            ->add('moderator', UserPickerType::class, [
-                'center' => $options['center'],
-                'role' => $options['role'],
-                'placeholder' => 'Pick a moderator',
-                'attr' => [
-                    'class' => '',
-                ],
-                'required' => false,
+            ->add('moderator', PickUserDynamicType::class, [
+                'label' => 'Pick a moderator',
             ])
             ->add('location', PickUserLocationType::class, [
                 'label' => 'event.fields.location',