Remove slug support

[userbundle] / Form / RegisterType.php

diff --git a/Form/RegisterType.php b/Form/RegisterType.php
index 93212d8ee89eda5d64a66b847016b442f1d9a23f..a2a73797aa98b99dfdb6f282451f0194562620c0 100644 (file)
--- a/Form/RegisterType.php
+++ b/Form/RegisterType.php
@@ -1,4 +1,13 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys PackBundle 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;
 
@@ -13,13 +22,15 @@ 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
@@ -27,17 +38,36 @@ class RegisterType extends AbstractType {
                        $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('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 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 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 forename field
+               if (!empty($options['forename'])) {
+                       $form->add('forename', TextType::class, ['attr' => ['placeholder' => 'Your forename'], 'constraints' => [new NotBlank(['message' => 'Please provide 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'])]]);
+               }
 
                //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 slug field
+               if (!empty($options['slug'])) {
+                       $form->add('slug', TextType::class, ['attr' => ['placeholder' => 'Your slug'], 'required' => false]);
+               }
+
                //Add submit
                $form->add('submit', SubmitType::class, ['label' => 'Send', 'attr' => ['class' => 'submit']]);
 
@@ -48,18 +78,43 @@ 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_class' => 'RapsysUserBundle:Civility', 'civility_default' => null, 'mail' => true, 'civility' => true, 'pseudonym' => true, 'forename' => true, 'surname' => true, 'password' => true, 'slug' => true]);
+
+               //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 civility option
+               $resolver->setAllowedTypes('civility', 'boolean');
+
+               //Add extra pseudonym option
+               $resolver->setAllowedTypes('pseudonym', 'boolean');
+
+               //Add extra forename option
+               $resolver->setAllowedTypes('forename', 'boolean');
+
+               //Add extra surname option
+               $resolver->setAllowedTypes('surname', 'boolean');
+
+               //Add extra password option
+               $resolver->setAllowedTypes('password', 'boolean');
+
+               //Add extra slug option
+               $resolver->setAllowedTypes('slug', 'boolean');
        }
 
        /**
         * {@inheritdoc}
         */
-       public function getName() {
+       public function getName(): string {
                return 'rapsys_user_register';
        }
 }