Merge remote-tracking branch 'origin/upgrade-sf3' into upgrade-sf3

Form/Type/Select2ChoiceType.php

@@ -22,6 +22,7 @@ namespace Chill\MainBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 
 /**
  * Extends choice to allow adding select2 library on widget
@@ -37,7 +38,7 @@ class Select2ChoiceType extends AbstractType
 
     public function getParent()
     {
-        return 'choice';
+        return ChoiceType::class;
     }
 
     public function configureOptions(OptionsResolver $resolver)