X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/778597e00e9b7786f7c94b45a18f20014e992b26..78afa67ad8c7163374b13f05394cc9e016189f3a:/Form/RegisterType.php

diff --git a/Form/RegisterType.php b/Form/RegisterType.php
index bfedcf7..7512160 100644
--- 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;
 
@@ -20,7 +29,8 @@ 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
@@ -30,7 +40,7 @@ class RegisterType extends AbstractType {
 
 		//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']]);
+			$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
@@ -63,7 +73,7 @@ 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]);
 
@@ -91,15 +101,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';
 	}
 }