Merge pull request #2584 from craue/1.3.x-fix-issue-2580

[1.3] added NotBlank validation constraint to forbid blank current user's password

Author: XWB

Form/Type/ChangePasswordFormType.php

@@ -16,6 +16,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Security\Core\Validator\Constraint\UserPassword as OldUserPassword;
 use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
+use Symfony\Component\Validator\Constraints\NotBlank;
 
 class ChangePasswordFormType extends AbstractType
 {
@@ -32,7 +33,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'label' => 'form.current_password',
             'translation_domain' => 'FOSUserBundle',
             'mapped' => false,
-            'constraints' => $constraint,
+            'constraints' => array(
+                new NotBlank(),
+                $constraint,
+            ),
         ));
         $builder->add('new', 'repeated', array(
             'type' => 'password',

Form/Type/ProfileFormType.php

@@ -16,6 +16,7 @@
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Symfony\Component\Security\Core\Validator\Constraint\UserPassword as OldUserPassword;
 use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
+use Symfony\Component\Validator\Constraints\NotBlank;
 
 class ProfileFormType extends AbstractType
 {
@@ -44,7 +45,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             'label' => 'form.current_password',
             'translation_domain' => 'FOSUserBundle',
             'mapped' => false,
-            'constraints' => $constraint,
+            'constraints' => array(
+                new NotBlank(),
+                $constraint,
+            ),
         ));
     }