Adapt entity and user checker to match with symfony classes and interfaces

[userbundle] / Form / RegisterType.php

diff --git a/Form/RegisterType.php b/Form/RegisterType.php
index bfedcf72faa6278eb6a3ca2f088db05d94b4b15b..71a0dcd8742e0f4834e9cf55aeeaf0829ca94cf8 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 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;
 
@@ -20,37 +29,33 @@ 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]);
                }
 
-               //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, 'data' => $options['civility_default']]);
+               //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'])]], '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'])]]);
-               }
-
-               //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'])]]]);
+                       $form->add('surname', TextType::class, ['attr' => ['placeholder' => 'Your surname']]);
                }
 
                //Add submit
@@ -63,9 +68,9 @@ class RegisterType extends AbstractType {
        /**
         * {@inheritdoc}
         */
-       public function configureOptions(OptionsResolver $resolver) {
+       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]);
+               $resolver->setDefaults(['error_bubbling' => true, 'civility_class' => 'RapsysUserBundle:Civility', 'civility_default' => null, 'mail' => true, 'civility' => true, 'forename' => true, 'surname' => true, 'password' => true]);
 
                //Add civility class
                $resolver->setAllowedTypes('civility_class', 'string');
@@ -80,9 +85,6 @@ class RegisterType extends AbstractType {
                //Add extra civility option
                $resolver->setAllowedTypes('civility', 'boolean');
 
-               //Add extra pseudonym option
-               $resolver->setAllowedTypes('pseudonym', 'boolean');
-
                //Add extra forename option
                $resolver->setAllowedTypes('forename', 'boolean');
 
@@ -91,15 +93,12 @@ class RegisterType extends AbstractType {
 
                //Add extra password option
                $resolver->setAllowedTypes('password', 'boolean');
-
-               //Return resolver
-               return $resolver;
        }
 
        /**
         * {@inheritdoc}
         */
-       public function getName() {
+       public function getName(): string {
                return 'rapsys_user_register';
        }
 }