Add password_repeated option

[userbundle] / Form / LoginType.php

diff --git a/Form/LoginType.php b/Form/LoginType.php
index 66afbca228ad4bc941e9a99441635a3b71ac6bf7..d4413ede13ff0a2cbb70620f867958a3d6b7be50 100644 (file)
--- a/Form/LoginType.php
+++ b/Form/LoginType.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;
 
@@ -16,23 +25,23 @@ class LoginType 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 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'])]]]);
+                               $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'])]]);
+                               $form->add('password', PasswordType::class, ['attr' => ['placeholder' => 'Your password'], 'constraints' => [new NotBlank(['message' => 'Please provide your password'])], 'required' => true]);
                        }
                }
 
@@ -46,7 +55,7 @@ class LoginType extends AbstractType {
        /**
         * {@inheritdoc}
         */
-       public function configureOptions(OptionsResolver $resolver) {
+       public function configureOptions(OptionsResolver $resolver): void {
                //Set defaults
                $resolver->setDefaults(['error_bubbling' => true, 'mail' => true, 'password' => true, 'password_repeated' => true]);
 
@@ -63,7 +72,7 @@ class LoginType extends AbstractType {
        /**
         * {@inheritdoc}
         */
-       public function getName() {
+       public function getName(): string {
                return 'rapsys_user_login';
        }
 }