Remove guestid and guestgroup in favour of more reliable defaultgroup

[userbundle] / Form / LoginType.php

diff --git a/Form/LoginType.php b/Form/LoginType.php
index b58b44699c45418b1bd198ed04d45fbe523ed748..fccd4bec81e688fc042dc3583bc3b67c0aaac222 100644 (file)
--- a/Form/LoginType.php
+++ b/Form/LoginType.php
@@ -1,7 +1,7 @@
 <?php declare(strict_types=1);
 
 /*
 <?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>
  *
  *
  * (c) Raphaël Gertz <symfony@rapsys.eu>
  *


@@ -11,68 +11,27 @@
 
 namespace Rapsys\UserBundle\Form;
 
 
 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\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'])]]);
-               }
-
-               //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'])]]]);
-                       //Add password field
-                       } else {
-                               $form->add('password', PasswordType::class, ['attr' => ['placeholder' => 'Your password'], '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}
+ */
+class LoginType extends RegisterType {

        /**
         * {@inheritdoc}
         */
        public function configureOptions(OptionsResolver $resolver): void {
        /**
         * {@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]);

        }
 
        /**
         * {@inheritdoc}
         */
        public function getName(): string {
        }
 
        /**
         * {@inheritdoc}
         */
        public function getName(): string {

-               return 'rapsys_user_login';
+               return 'rapsysuser_login';

        }
 }
        }
 }