@@ -25,11 +25,10 @@ public function request(Request $request, MailerInterface $mailer<?php if ($tran
25
25
$form->handleRequest($request);
26
26
27
27
if ($form->isSubmitted() && $form->isValid()) {
28
- return $this->processSendingPasswordResetEmail(
29
- $form->get('<?= $ email_field ?> ')->getData(),
30
- $mailer<?php if ($ translator_available ): ?> ,
31
- $translator<?php endif ?> <?= "\n" ?>
32
- );
28
+ /** @var string $email */
29
+ $email = $form->get('<?= $ email_field ?> ')->getData();
30
+
31
+ return $this->processSendingPasswordResetEmail($email, $mailer<?php if ($ translator_available ): ?> , $translator<?php endif ?> <?= "\n" ?> );
33
32
}
34
33
35
34
return $this->render('reset_password/request.html.twig', [
@@ -94,13 +93,11 @@ public function reset(Request $request, UserPasswordHasherInterface $passwordHas
94
93
// A password reset token should be used only once, remove it.
95
94
$this->resetPasswordHelper->removeResetRequest($token);
96
95
97
- // Encode(hash) the plain password, and set it.
98
- $encodedPassword = $passwordHasher->hashPassword(
99
- $user,
100
- $form->get('plainPassword')->getData()
101
- );
96
+ /** @var string $plainPassword */
97
+ $plainPassword = $form->get('plainPassword')->getData();
102
98
103
- $user-><?= $ password_setter ?> ($encodedPassword);
99
+ // Encode(hash) the plain password, and set it.
100
+ $user-><?= $ password_setter ?> ($passwordHasher->hashPassword($user, $plainPassword));
104
101
$this->entityManager->flush();
105
102
106
103
// The session is cleaned up after the password has been changed.
@@ -143,7 +140,7 @@ private function processSendingPasswordResetEmail(string $emailFormData, MailerI
143
140
144
141
$email = (new TemplatedEmail())
145
142
->from(new Address('<?= $ from_email ?> ', '<?= $ from_email_name ?> '))
146
- ->to($user-><?= $ email_getter ?> ())
143
+ ->to((string) $user-><?= $ email_getter ?> ())
147
144
->subject('Your password reset request')
148
145
->htmlTemplate('reset_password/email.html.twig')
149
146
->context([
0 commit comments