Merge branch '6.2' into 6.3

* 6.2:
  Remove 6.0 and 6.1 from the PR template
  [Validator] Make ConstraintValidatorTestCase compatible with PHPUnit 10
  [WebProfilerBundle] Fix some minor HTML issues
  [WebProfilerBundle] Disable Turbo for debug toolbar links
  [WebProfilerBundle] Fix an accessibility issue in the search form of the header
  [Mailer][MailPace] Fix undefined key in error response
  [Form] Fix PasswordHasherListener to work with empty data
  [PropertyInfo] Add meaningful message when `phpstan/phpdoc-parser` is not installed when using `PhpStanExtractor`

Author: fabpot

Extension/PasswordHasher/EventListener/PasswordHasherListener.php

@@ -14,13 +14,15 @@
 use Symfony\Component\Form\Exception\InvalidConfigurationException;
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Form\FormEvent;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 
 /**
  * @author Sébastien Alfaiate <[email protected]>
+ * @author Gábor Egyed <[email protected]>
  */
 class PasswordHasherListener
 {
@@ -35,26 +37,11 @@ public function __construct(
 
     public function registerPassword(FormEvent $event)
     {
-        $form = $event->getForm();
-        $parentForm = $form->getParent();
-        $mapped = $form->getConfig()->getMapped();
-
-        if ($parentForm && $parentForm->getConfig()->getType()->getInnerType() instanceof RepeatedType) {
-            $mapped = $parentForm->getConfig()->getMapped();
-            $parentForm = $parentForm->getParent();
-        }
-
-        if ($mapped) {
-            throw new InvalidConfigurationException('The "hash_property_path" option cannot be used on mapped field.');
-        }
-
-        if (!($user = $parentForm?->getData()) || !$user instanceof PasswordAuthenticatedUserInterface) {
-            throw new InvalidConfigurationException(sprintf('The "hash_property_path" option only supports "%s" objects, "%s" given.', PasswordAuthenticatedUserInterface::class, get_debug_type($user)));
-        }
+        $this->assertNotMapped($event->getForm());
 
         $this->passwords[] = [
-            'user' => $user,
-            'property_path' => $form->getConfig()->getOption('hash_property_path'),
+            'form' => $event->getForm(),
+            'property_path' => $event->getForm()->getConfig()->getOption('hash_property_path'),
             'password' => $event->getData(),
         ];
     }
@@ -69,14 +56,45 @@ public function hashPasswords(FormEvent $event)
 
         if ($form->isValid()) {
             foreach ($this->passwords as $password) {
+                $user = $this->getUser($password['form']);
+
                 $this->propertyAccessor->setValue(
-                    $password['user'],
+                    $user,
                     $password['property_path'],
-                    $this->passwordHasher->hashPassword($password['user'], $password['password'])
+                    $this->passwordHasher->hashPassword($user, $password['password'])
                 );
             }
         }
 
         $this->passwords = [];
     }
+
+    private function getTargetForm(FormInterface $form): FormInterface
+    {
+        $parent = $form->getParent();
+
+        if ($parent && $parent->getConfig()->getType()->getInnerType() instanceof RepeatedType) {
+            return $parent;
+        }
+
+        return $form;
+    }
+
+    private function getUser(FormInterface $form): PasswordAuthenticatedUserInterface
+    {
+        $parent = $this->getTargetForm($form)->getParent();
+
+        if (!($user = $parent?->getData()) || !$user instanceof PasswordAuthenticatedUserInterface) {
+            throw new InvalidConfigurationException(sprintf('The "hash_property_path" option only supports "%s" objects, "%s" given.', PasswordAuthenticatedUserInterface::class, get_debug_type($user)));
+        }
+
+        return $user;
+    }
+
+    private function assertNotMapped(FormInterface $form): void
+    {
+        if ($this->getTargetForm($form)->getConfig()->getMapped()) {
+            throw new InvalidConfigurationException('The "hash_property_path" option cannot be used on mapped field.');
+        }
+    }
 }

Tests/Extension/PasswordHasher/Type/PasswordTypePasswordHasherExtensionTest.php

@@ -77,6 +77,42 @@ public function testPasswordHashSuccess()
         $this->assertSame($user->getPassword(), $hashedPassword);
     }
 
+    public function testPasswordHashSuccessWitnEmptyData()
+    {
+        $user = new User();
+
+        $plainPassword = 'PlainPassword';
+        $hashedPassword = 'HashedPassword';
+
+        $this->passwordHasher
+            ->expects($this->once())
+            ->method('hashPassword')
+            ->with($user, $plainPassword)
+            ->willReturn($hashedPassword)
+        ;
+
+        $this->assertNull($user->getPassword());
+
+        $form = $this->factory
+            ->createBuilder('Symfony\Component\Form\Extension\Core\Type\FormType', null, [
+                'data_class' => User::class,
+                'empty_data' => function () use ($user) {
+                    return $user;
+                },
+            ])
+            ->add('plainPassword', 'Symfony\Component\Form\Extension\Core\Type\PasswordType', [
+                'hash_property_path' => 'password',
+                'mapped' => false,
+            ])
+            ->getForm()
+        ;
+
+        $form->submit(['plainPassword' => $plainPassword]);
+
+        $this->assertTrue($form->isValid());
+        $this->assertSame($user->getPassword(), $hashedPassword);
+    }
+
     public function testPasswordHashOnInvalidForm()
     {
         $user = new User();