Merge branch 'upgrade-sf5' into signature-app-master

src/Bundle/ChillEventBundle/Form/EventType.php

@@ -13,6 +13,7 @@ namespace Chill\EventBundle\Form;
 
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Form\StoredObjectType;
+use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Form\Type\PickEventTypeType;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
@@ -23,6 +24,7 @@ use Chill\MainBundle\Form\Type\PickUserLocationType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\MoneyType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -31,7 +33,9 @@ class EventType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name')
+            ->add('name', TextType::class, [
+                'required' => true,
+            ])
             ->add('date', ChillDateTimeType::class, [
                 'required' => true,
             ])
@@ -75,7 +79,7 @@ class EventType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => \Chill\EventBundle\Entity\Event::class,
+            'data_class' => Event::class,
         ]);
         $resolver
             ->setRequired(['center', 'role'])