Cleanup

[userbundle] / Form / RegisterType.php

diff --git a/Form/RegisterType.php b/Form/RegisterType.php
index a2a73797aa98b99dfdb6f282451f0194562620c0..5dbeda8336e92d7b5dfbe90571d64ba8a15e992f 100644 (file)
--- a/Form/RegisterType.php
+++ b/Form/RegisterType.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
- * This file is part of the Rapsys PackBundle package.
+ * This file is part of the Rapsys UserBundle package.
  *
  * (c) Raphaël Gertz <symfony@rapsys.eu>
  *
@@ -13,6 +13,7 @@ namespace Rapsys\UserBundle\Form;
 
 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;
@@ -35,37 +36,43 @@ class RegisterType extends AbstractType {
 
                //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'])]]);
+                       $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'])], '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'])) {
+                               $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'])]], 'required' => true]);
+                       //Add password field
+                       } else {
+                               $form->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'])) {
+                       $form->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'])]]);
+                       $form->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'])]]);
+                       $form->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'])) {
+                       $form->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'])) {
+                       $form->add('enable', CheckboxType::class, ['attr' => ['placeholder' => 'Your enable']]);
                }
 
                //Add submit
@@ -80,7 +87,10 @@ class RegisterType extends AbstractType {
         */
        public function configureOptions(OptionsResolver $resolver): void {
                //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' => 'RapsysUserBundle: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 +102,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 +114,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';
        }
 }