X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FForm%2FType%2FNewUserType.php;h=6a6f63d166428a990d978f65d7ff4a94f0c9171e;hb=bf27f99d546b74c3690e8b228c73e609b2d409de;hp=8aabc8bbbc40ecffdaabc6543e7a0928678329a9;hpb=16dabc326311f084d671be188c7941bbb3c341c9;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php index 8aabc8bb..6a6f63d1 100644 --- a/src/Wallabag/CoreBundle/Form/Type/NewUserType.php +++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php @@ -3,6 +3,11 @@ 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\OptionsResolver; use Symfony\Component\Validator\Constraints; @@ -12,30 +17,41 @@ class NewUserType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('username', 'text', array('required' => true)) - ->add('plainPassword', 'repeated', array( - 'type' => 'password', - '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 configureOptions(OptionsResolver $resolver) { - $resolver->setDefaults(array( + $resolver->setDefaults([ 'data_class' => 'Wallabag\UserBundle\Entity\User', - )); + ]); } - public function getName() + public function getBlockPrefix() { return 'new_user'; }