From b95d9840fb06b88151a50aecd566cc83fe518c6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Mon, 11 Dec 2023 03:19:40 +0100 Subject: [PATCH] Use register inherited forms --- Form/EditType.php | 38 +++++++++++++++++++++++++++++ Form/LoginType.php | 57 +++++++------------------------------------- Form/RecoverType.php | 37 ++++++++++++++++++++++++++++ Form/ResetType.php | 37 ++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 49 deletions(-) create mode 100644 Form/EditType.php create mode 100644 Form/RecoverType.php create mode 100644 Form/ResetType.php diff --git a/Form/EditType.php b/Form/EditType.php new file mode 100644 index 0000000..24c659c --- /dev/null +++ b/Form/EditType.php @@ -0,0 +1,38 @@ + + * + * 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\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; + +/** + * {@inheritdoc} + */ +class EditType extends RegisterType { + /** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver): void { + //Call parent configure option + parent::configureOptions($resolver); + + //Set defaults + $resolver->setDefaults(['mail' => false, 'password' => false]); + } + + /** + * {@inheritdoc} + */ + public function getName(): string { + return 'rapsys_user_edit'; + } +} diff --git a/Form/LoginType.php b/Form/LoginType.php index d4413ed..4f82d75 100644 --- a/Form/LoginType.php +++ b/Form/LoginType.php @@ -11,62 +11,21 @@ namespace Rapsys\UserBundle\Form; -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\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Validator\Constraints\Email; -use Symfony\Component\Validator\Constraints\NotBlank; - -class LoginType extends AbstractType { - /** - * {@inheritdoc} - */ - 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'])], 'required' => true]); - } - - //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 submit - $form->add('submit', SubmitType::class, ['label' => 'Send', 'attr' => ['class' => 'submit']]); - - //Return form - return $form; - } +/** + * {@inheritdoc} + */ +class LoginType extends RegisterType { /** * {@inheritdoc} */ public function configureOptions(OptionsResolver $resolver): void { - //Set defaults - $resolver->setDefaults(['error_bubbling' => true, 'mail' => true, 'password' => true, 'password_repeated' => true]); + //Call parent configure option + parent::configureOptions($resolver); - //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'); + //Set defaults + $resolver->setDefaults(['civility' => false, 'password' => true, 'password_repeated' => false, 'forename' => false, 'surname' => false]); } /** diff --git a/Form/RecoverType.php b/Form/RecoverType.php new file mode 100644 index 0000000..40be11b --- /dev/null +++ b/Form/RecoverType.php @@ -0,0 +1,37 @@ + + * + * 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\Component\OptionsResolver\OptionsResolver; + +/** + * {@inheritdoc} + */ +class RecoverType extends RegisterType { + /** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver): void { + //Call parent configure option + parent::configureOptions($resolver); + + //Set defaults + $resolver->setDefaults(['civility' => false, 'mail' => true, 'password' => true, 'forename' => false, 'surname' => false]); + } + + /** + * {@inheritdoc} + */ + public function getName(): string { + return 'rapsys_user_recover'; + } +} diff --git a/Form/ResetType.php b/Form/ResetType.php new file mode 100644 index 0000000..3033a43 --- /dev/null +++ b/Form/ResetType.php @@ -0,0 +1,37 @@ + + * + * 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\Component\OptionsResolver\OptionsResolver; + +/** + * {@inheritdoc} + */ +class ResetType extends RegisterType { + /** + * {@inheritdoc} + */ + public function configureOptions(OptionsResolver $resolver): void { + //Call parent configure option + parent::configureOptions($resolver); + + //Set defaults + $resolver->setDefaults(['civility' => false, 'mail' => false, 'password' => true, 'forename' => false, 'surname' => false]); + } + + /** + * {@inheritdoc} + */ + public function getName(): string { + return 'rapsys_user_reset'; + } +} -- 2.41.0