Merge remote-tracking branch 'origin/master' into 2.4

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Form / Type / UserInformationType.php

diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
index e3196d9cc868def3cd4f633f705b1182e8041e05..6e4c9154c5777a39b6ddd65153f507f54f90ddd2 100644 (file)
--- a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
@@ -3,6 +3,10 @@
 namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -11,9 +15,24 @@ class UserInformationType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name', 'text')
-            ->add('email', 'email')
-            ->add('save', 'submit')
+            ->add('name', TextType::class, [
+                'label' => 'config.form_user.name_label',
+            ])
+            ->add('email', EmailType::class, [
+                'label' => 'config.form_user.email_label',
+            ])
+            ->add('emailTwoFactor', CheckboxType::class, [
+                'required' => false,
+                'label' => 'config.form_user.emailTwoFactor_label',
+            ])
+            ->add('googleTwoFactor', CheckboxType::class, [
+                'required' => false,
+                'label' => 'config.form_user.googleTwoFactor_label',
+                'mapped' => false,
+            ])
+            ->add('save', SubmitType::class, [
+                'label' => 'config.form.save',
+            ])
             ->remove('username')
             ->remove('plainPassword')
         ;
@@ -21,17 +40,17 @@ class UserInformationType extends AbstractType
 
     public function getParent()
     {
-        return 'fos_user_registration';
+        return 'FOS\UserBundle\Form\Type\RegistrationFormType';
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
-        $resolver->setDefaults(array(
-            'data_class' => 'Wallabag\CoreBundle\Entity\User',
-        ));
+        $resolver->setDefaults([
+            'data_class' => 'Wallabag\UserBundle\Entity\User',
+        ]);
     }
 
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'update_user';
     }