GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[UTIL][Form] Fix bug with repeated_password

This commit is contained in:
Diogo Peralta Cordeiro 2021-11-16 23:27:29 +00:00
parent 89d36a68e5
commit f07dce4604
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/Util/Form/FormFields.php
View File

@ -1,10 +1,9 @@
<?php
declare(strict_types = 1);
declare(strict_types=1);
namespace App\Util\Form;
use function App\Core\I18n\_m;
use App\Entity\Actor;
use App\Entity\Language;
use App\Util\Common;
@ -13,39 +12,40 @@ use Symfony\Component\Form\Extension\Core\Type\PasswordType;
use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
use Symfony\Component\Validator\Constraints\Length;
use Symfony\Component\Validator\Constraints\NotBlank;
use function App\Core\I18n\_m;
abstract class FormFields
{
public static function repeated_password(array $options = []): array
{
$constraints = $options['required']
? [
new NotBlank(['message' => _m('Please enter a password')]),
new Length(['min' => Common::config('password', 'min_length'), 'minMessage' => _m(['Your password should be at least # characters'], ['count' => Common::config('password', 'min_length')]),
'max' => Common::config('password', 'max_length'), 'maxMessage' => _m(['Your password should be at most # characters'], ['count' => Common::config('password', 'max_length')]), ]),
] : [];
$constraints = (array_key_exists('required', $options) && $options['required'] === false) ? []
: [
new NotBlank(['message' => _m('Please enter a password')]),
new Length(['min' => Common::config('password', 'min_length'), 'minMessage' => _m(['Your password should be at least # characters'], ['count' => Common::config('password', 'min_length')]),
'max' => Common::config('password', 'max_length'), 'maxMessage' => _m(['Your password should be at most # characters'], ['count' => Common::config('password', 'max_length')]),]),
];
return [
'password', RepeatedType::class,
[
'type' => PasswordType::class,
'type' => PasswordType::class,
'first_options' => [
'label' => _m('Password'),
'label_attr' => ['class' => 'section-form-label'],
'attr' => ['placeholder' => _m('********'), 'required' => $options['required'] ?? true],
'label' => _m('Password'),
'label_attr' => ['class' => 'section-form-label'],
'attr' => ['placeholder' => _m('********'), 'required' => $options['required'] ?? true],
'constraints' => $constraints,
'help' => _m('Write a password with at least {min_length} characters, and a maximum of {max_length}.', ['min_length' => Common::config('password', 'min_length'), 'max_length' => Common::config('password', 'max_length')]),
'help' => _m('Write a password with at least {min_length} characters, and a maximum of {max_length}.', ['min_length' => Common::config('password', 'min_length'), 'max_length' => Common::config('password', 'max_length')]),
],
'second_options' => [
'label' => _m('Repeat Password'),
'label_attr' => ['class' => 'section-form-label'],
'attr' => ['placeholder' => _m('********')],
'help' => _m('Confirm your password.'),
'required' => $options['required'] ?? true,
'label' => _m('Repeat Password'),
'label_attr' => ['class' => 'section-form-label'],
'attr' => ['placeholder' => _m('********')],
'help' => _m('Confirm your password.'),
'required' => $options['required'] ?? true,
'constraints' => $constraints,
],
'mapped' => false,
'required' => $options['required'] ?? true,
'mapped' => false,
'required' => $options['required'] ?? true,
'invalid_message' => _m('The password fields must match'),
],
];
@ -58,16 +58,16 @@ abstract class FormFields
{
return [
'password', PasswordType::class, [
'label' => _m('Password'),
'label_attr' => ['class' => 'section-form-label'],
'attr' => ['placeholder' => '********'],
'required' => $options['required'] ?? true,
'mapped' => false,
'label' => _m('Password'),
'label_attr' => ['class' => 'section-form-label'],
'attr' => ['placeholder' => '********'],
'required' => $options['required'] ?? true,
'mapped' => false,
'constraints' => [
new NotBlank(['message' => _m('Please enter a password')]),
new Length(['min' => Common::config('password', 'min_length'), 'minMessage' => _m(['Your password should be at least # characters'], ['count' => Common::config('password', 'min_length')]),
'max' => Common::config('password', 'max_length'), 'maxMessage' => _m(['Your password should be at most # characters'], ['count' => Common::config('password', 'max_length')]), ]),
], ],
'max' => Common::config('password', 'max_length'), 'maxMessage' => _m(['Your password should be at most # characters'], ['count' => Common::config('password', 'max_length')]),]),
],],
];
}
@ -78,12 +78,12 @@ abstract class FormFields
'language' . ($multiple ? 's' : ''),
ChoiceType::class,
[
'label' => _m($label),
'label' => _m($label),
'preferred_choices' => $preferred_language_choices,
'choices' => $language_choices,
'required' => $required,
'multiple' => $multiple,
'help' => _m($help),
'choices' => $language_choices,
'required' => $required,
'multiple' => $multiple,
'help' => _m($help),
],
];
}