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

Controller/PermissionsGroupController.php

@@ -11,6 +11,7 @@ use Chill\MainBundle\Form\PermissionsGroupType;
 use Symfony\Component\Security\Core\Role\Role;
 use Symfony\Component\Security\Core\Role\RoleInterface;
 use Chill\MainBundle\Entity\Scope;
+use Chill\MainBundle\Form\Type\ComposedRoleScopeType;
 
 /**
  * PermissionsGroup controller.
@@ -491,7 +492,7 @@ class PermissionsGroupController extends Controller
                 ->setAction($this->generateUrl('admin_permissionsgroup_add_role_scope',
                         array('id' => $permissionsGroup->getId())))
                 ->setMethod('PUT')
-                ->add('composed_role_scope', 'composed_role_scope')
+                ->add('composed_role_scope', ComposedRoleScopeType::class)
                 ->add('submit', SubmitType::class, array('label' => 'Add permission'))
                 ->getForm()
                 ;

Form/Type/AddressType.php

@@ -23,6 +23,9 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\DateType;
+
+use Chill\MainBundle\Form\Type\PostalCodeType;
 
 /**
  * A type to create/update Address entity
@@ -46,9 +49,9 @@ class AddressType extends AbstractType
                  'placeholder' => 'Choose a postal code',
                  'required' => true
               ))
-              ->add('validFrom', 'date', array(
+              ->add('validFrom', DateType::class, array(
-                'required' => true, 
+                'required' => true,
-                'widget' => 'single_text', 
+                'widget' => 'single_text',
                 'format' => 'dd-MM-yyyy'
                  )
               )

Form/UserType.php

@@ -21,7 +21,7 @@ class UserType extends AbstractType
             ->add('username')
             ;
         if ($options['is_creation']) {
-            $builder->add('plainPassword', new UserPasswordType(), array(
+            $builder->add('plainPassword', UserPasswordType::class, array(
                 'mapped' => false
             ));