X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/eb32a4432898fa794c951d02603bd39a952112a2..869aa1e2035b8f5feaa4f0ca62be552a9e32c053:/Form/RegisterType.php

diff --git a/Form/RegisterType.php b/Form/RegisterType.php
index 93212d8..eb4acdb 100644
--- a/Form/RegisterType.php
+++ b/Form/RegisterType.php
@@ -1,9 +1,19 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys UserBundle package.
+ *
+ * (c) Raphaël Gertz <symfony@rapsys.eu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
 
 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;
@@ -13,29 +23,56 @@ use Symfony\Component\Form\FormBuilderInterface;
 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}
 	 */
-	public function buildForm(FormBuilderInterface $builder, array $options) {
+	public function buildForm(FormBuilderInterface $builder, array $options): FormBuilderInterface {
+		//Create form
 		$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'])]]);
+			$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]);
 		}
 
-		$form
-			->add('civility', EntityType::class, ['class' => $options['class_civility'], 'attr' => ['placeholder' => 'Your civility'], 'constraints' => [new NotBlank(['message' => 'Please provide your civility'])], 'choice_translation_domain' => true, 'data' => $options['civility']])
-			->add('pseudonym', TextType::class, ['attr' => ['placeholder' => 'Your pseudonym'], 'constraints' => [new NotBlank(['message' => 'Please provide your pseudonym'])]])
-			->add('forename', TextType::class, ['attr' => ['placeholder' => 'Your forename'], 'constraints' => [new NotBlank(['message' => 'Please provide your forename'])]])
-			->add('surname', TextType::class, ['attr' => ['placeholder' => 'Your surname'], 'constraints' => [new NotBlank(['message' => 'Please provide 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 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 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']]);
+		}
+
+		//Add extra surname field
+		if (!empty($options['surname'])) {
+			$form->add('surname', TextType::class, ['attr' => ['placeholder' => 'Your surname']]);
+		}
+
+		//Add extra active field
+		if (!empty($options['active'])) {
+			$form->add('active', CheckboxType::class, ['attr' => ['placeholder' => 'Your active']]);
+		}
+
+		//Add extra enable field
+		if (!empty($options['enable'])) {
+			$form->add('enable', CheckboxType::class, ['attr' => ['placeholder' => 'Your enable']]);
 		}
 
 		//Add submit
@@ -48,18 +85,46 @@ class RegisterType extends AbstractType {
 	/**
 	 * {@inheritdoc}
 	 */
-	public function configureOptions(OptionsResolver $resolver) {
-		$resolver->setDefaults(['error_bubbling' => true, 'class_civility' => 'RapsysUserBundle:Civility', 'civility' => null, 'password' => true, 'mail' => true]);
-		$resolver->setAllowedTypes('class_civility', 'string');
-		$resolver->setAllowedTypes('civility', [Civility::class, 'null']);
-		$resolver->setAllowedTypes('password', 'boolean');
+	public function configureOptions(OptionsResolver $resolver): void {
+		//Set defaults
+		$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');
+
+		//Add civility default
+		//XXX: trigger strange error about table not existing is not specified in form create
+		$resolver->setAllowedTypes('civility_default', [Civility::class, 'null']);
+
+		//Add extra mail option
 		$resolver->setAllowedTypes('mail', 'boolean');
+
+		//Add extra password option
+		$resolver->setAllowedTypes('password', 'boolean');
+
+		//Add extra password repeated option
+		$resolver->setAllowedTypes('password_repeated', 'boolean');
+
+		//Add extra forename option
+		$resolver->setAllowedTypes('forename', 'boolean');
+
+		//Add extra surname option
+		$resolver->setAllowedTypes('surname', 'boolean');
+
+		//Add extra active option
+		$resolver->setAllowedTypes('active', 'boolean');
+
+		//Add extra enable option
+		$resolver->setAllowedTypes('enable', 'boolean');
 	}
 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function getName() {
+	public function getName(): string {
 		return 'rapsys_user_register';
 	}
 }