X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FForm%2FType%2FNewUserType.php;h=6a6f63d166428a990d978f65d7ff4a94f0c9171e;hb=2f9927404d620f719d4b30d9205ff43c0238e6a1;hp=a12fff2b9b850514a6d0296bed79877550a640f1;hpb=2878416f8b4d94fb5e64c2fa61861526a7654d3d;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
index a12fff2b..6a6f63d1 100644
--- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
@@ -3,8 +3,13 @@
 namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
+use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
+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\OptionsResolverInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints;
 
 class NewUserType extends AbstractType
@@ -12,29 +17,41 @@ class NewUserType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('username', 'text', array('required' => true))
-            ->add('password', 'password', array(
-                'constraints' => array(
-                    new Constraints\Length(array(
+            ->add('username', TextType::class, [
+                'required' => true,
+                'label' => 'config.form_new_user.username_label',
+            ])
+            ->add('plainPassword', RepeatedType::class, [
+                'type' => PasswordType::class,
+                'invalid_message' => 'validator.password_must_match',
+                'first_options' => ['label' => 'config.form_new_user.password_label'],
+                'second_options' => ['label' => 'config.form_new_user.repeat_new_password_label'],
+                'constraints' => [
+                    new Constraints\Length([
                         'min' => 8,
-                        'minMessage' => 'Password should by at least 8 chars long',
-                    )),
+                        'minMessage' => 'validator.password_too_short',
+                    ]),
                     new Constraints\NotBlank(),
-                ),
-            ))
-            ->add('email', 'email')
-            ->add('save', 'submit')
+                ],
+                'label' => 'config.form_new_user.plain_password_label',
+            ])
+            ->add('email', EmailType::class, [
+                'label' => 'config.form_new_user.email_label',
+            ])
+            ->add('save', SubmitType::class, [
+                'label' => 'config.form.save',
+            ])
         ;
     }
 
-    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    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 'new_user';
     }