Fix civility to have default value and not forced value

[userbundle] / Form / RecoverType.php

diff --git a/Form/RecoverType.php b/Form/RecoverType.php
index 25de0d7aec307372ad0aceb343a0592466f76eaa..b1785dd3eff5c48f7e6f3dfc614a67ce7da1d660 100644 (file)
--- a/Form/RecoverType.php
+++ b/Form/RecoverType.php
@@ -5,9 +5,10 @@ namespace Rapsys\UserBundle\Form;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Validator\Constraints\Email;
 use Symfony\Component\Validator\Constraints\NotBlank;
 
@@ -16,16 +17,37 @@ class RecoverType extends AbstractType {
         * {@inheritdoc}
         */
        public function buildForm(FormBuilderInterface $builder, array $options) {
-               return $builder
-                       ->add('mail', EmailType::class, ['attr' => ['placeholder' => 'Your mail'], 'constraints' => [new NotBlank(['message' => 'Please provide your mail']), new Email(['message' => 'Your mail doesn\'t seems to be valid'])]])
-                       ->add('submit', SubmitType::class, ['label' => 'Send', 'attr' => ['class' => 'submit']]);
+               $form = $builder;
+
+               //Add extra mail field
+               if (!empty($options['mail'])) {
+                       $form->add('mail', EmailType::class, ['attr' => ['placeholder' => 'Your mail'], 'constraints' => [new NotBlank(['message' => 'Please provide your mail']), new Email(['message' => 'Your mail doesn\'t seems to be valid'])]]);
+               }
+
+               //Add extra password field
+               if (!empty($options['password'])) {
+                       $form->add('password', RepeatedType::class, ['type' => PasswordType::class, 'invalid_message' => 'The password and confirmation must match', 'first_options' => ['attr' => ['placeholder' => 'Your password'], 'label' => 'Password'], 'second_options' => ['attr' => ['placeholder' => 'Your password confirmation'], 'label' => 'Confirm password'], 'options' => ['constraints' => [new NotBlank(['message' => 'Please provide your password'])]]]);
+               }
+
+               //Add submit
+               $form->add('submit', SubmitType::class, ['label' => 'Send', 'attr' => ['class' => 'submit']]);
+
+               //Return form
+               return $form;
        }
 
        /**
         * {@inheritdoc}
         */
        public function configureOptions(OptionsResolver $resolver) {
-               $resolver->setDefaults(['error_bubbling' => true]);
+               //Set defaults
+               $resolver->setDefaults(['error_bubbling' => true, 'mail' => true, 'password' => true]);
+
+               //Add extra mail option
+               $resolver->setAllowedTypes('mail', 'boolean');
+
+               //Add extra password option
+               $resolver->setAllowedTypes('password', 'boolean');
        }
 
        /**