X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/eda2d759065d2d735d8e3a856ddc85f0bdd275dd..279e79bae75508e655d7d210ad62e7874cab762b:/Form/RegisterType.php diff --git a/Form/RegisterType.php b/Form/RegisterType.php index a2a7379..def9e71 100644 --- a/Form/RegisterType.php +++ b/Form/RegisterType.php @@ -1,7 +1,7 @@ * @@ -11,8 +11,12 @@ namespace Rapsys\UserBundle\Form; +use Rapsys\PackBundle\Form\CaptchaType; + +use Rapsys\UserBundle\Entity\Civility; + use Symfony\Bridge\Doctrine\Form\Type\EntityType; -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\PasswordType; use Symfony\Component\Form\Extension\Core\Type\RepeatedType; @@ -23,64 +27,74 @@ use Symfony\Component\OptionsResolver\OptionsResolver; use Symfony\Component\Validator\Constraints\Email; use Symfony\Component\Validator\Constraints\NotBlank; -use Rapsys\UserBundle\Entity\Civility; - -class RegisterType extends AbstractType { +/** + * {@inheritdoc} + */ +class RegisterType extends CaptchaType { /** * {@inheritdoc} */ - public function buildForm(FormBuilderInterface $builder, array $options): FormBuilderInterface { - //Create form - $form = $builder; - + public function buildForm(FormBuilderInterface $builder, array $options): void { //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'])]]); + $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'])], 'required' => true]); } - //Add extra civility field - if (!empty($options['civility'])) { - $form->add('civility', EntityType::class, ['class' => $options['civility_class'], 'attr' => ['placeholder' => 'Your civility'], 'constraints' => [new NotBlank(['message' => 'Please provide your civility'])], 'choice_translation_domain' => true, 'empty_data' => $options['civility_default']]); + //Add extra password field + if (!empty($options['password'])) { + //Add password repeated field + if (!empty($options['password_repeated'])) { + $builder->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'])]], 'required' => true]); + //Add password field + } else { + $builder->add('password', PasswordType::class, ['attr' => ['placeholder' => 'Your password'], 'constraints' => [new NotBlank(['message' => 'Please provide your password'])], 'required' => true]); + } } - //Add extra pseudonym field - if (!empty($options['pseudonym'])) { - $form->add('pseudonym', TextType::class, ['attr' => ['placeholder' => 'Your pseudonym'], 'constraints' => [new NotBlank(['message' => 'Please provide your pseudonym'])]]); + //Add extra civility field + if (!empty($options['civility'])) { + $builder->add('civility', EntityType::class, ['class' => $options['civility_class'], 'attr' => ['placeholder' => 'Your civility'], 'choice_translation_domain' => true, 'empty_data' => $options['civility_default'], 'required' => true]); } //Add extra forename field if (!empty($options['forename'])) { - $form->add('forename', TextType::class, ['attr' => ['placeholder' => 'Your forename'], 'constraints' => [new NotBlank(['message' => 'Please provide your forename'])]]); + $builder->add('forename', TextType::class, ['attr' => ['placeholder' => 'Your forename']]); } //Add extra surname field if (!empty($options['surname'])) { - $form->add('surname', TextType::class, ['attr' => ['placeholder' => 'Your surname'], 'constraints' => [new NotBlank(['message' => 'Please provide your surname'])]]); + $builder->add('surname', TextType::class, ['attr' => ['placeholder' => 'Your surname']]); } - //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 extra active field + if (!empty($options['active'])) { + $builder->add('active', CheckboxType::class, ['attr' => ['placeholder' => 'Your active']]); } - //Add extra slug field - if (!empty($options['slug'])) { - $form->add('slug', TextType::class, ['attr' => ['placeholder' => 'Your slug'], 'required' => false]); + //Add extra enable field + if (!empty($options['enable'])) { + $builder->add('enable', CheckboxType::class, ['attr' => ['placeholder' => 'Your enable']]); } //Add submit - $form->add('submit', SubmitType::class, ['label' => 'Send', 'attr' => ['class' => 'submit']]); + $builder->add('submit', SubmitType::class, ['label' => 'Send', 'attr' => ['class' => 'submit']]); - //Return form - return $form; + //Call parent + parent::buildForm($builder, $options); } /** * {@inheritdoc} */ public function configureOptions(OptionsResolver $resolver): void { + //Call parent configure options + parent::configureOptions($resolver); + //Set defaults - $resolver->setDefaults(['error_bubbling' => true, 'civility_class' => 'RapsysUserBundle:Civility', 'civility_default' => null, 'mail' => true, 'civility' => true, 'pseudonym' => true, 'forename' => true, 'surname' => true, 'password' => true, 'slug' => true]); + $resolver->setDefaults(['error_bubbling' => true, 'civility' => true, 'civility_class' => 'Rapsys\UserBundle\Entity\Civility', 'civility_default' => null, 'mail' => true, 'password' => true, 'password_repeated' => true, 'forename' => true, 'surname' => true, 'active' => false, 'enable' => false]); + + //Add extra civility option + $resolver->setAllowedTypes('civility', 'boolean'); //Add civility class $resolver->setAllowedTypes('civility_class', 'string'); @@ -92,11 +106,11 @@ class RegisterType extends AbstractType { //Add extra mail option $resolver->setAllowedTypes('mail', 'boolean'); - //Add extra civility option - $resolver->setAllowedTypes('civility', 'boolean'); + //Add extra password option + $resolver->setAllowedTypes('password', 'boolean'); - //Add extra pseudonym option - $resolver->setAllowedTypes('pseudonym', 'boolean'); + //Add extra password repeated option + $resolver->setAllowedTypes('password_repeated', 'boolean'); //Add extra forename option $resolver->setAllowedTypes('forename', 'boolean'); @@ -104,17 +118,17 @@ class RegisterType extends AbstractType { //Add extra surname option $resolver->setAllowedTypes('surname', 'boolean'); - //Add extra password option - $resolver->setAllowedTypes('password', 'boolean'); + //Add extra active option + $resolver->setAllowedTypes('active', 'boolean'); - //Add extra slug option - $resolver->setAllowedTypes('slug', 'boolean'); + //Add extra enable option + $resolver->setAllowedTypes('enable', 'boolean'); } /** * {@inheritdoc} */ public function getName(): string { - return 'rapsys_user_register'; + return 'rapsysuser_register'; } }