Skip to content

Commit d711796

Browse files
authored
feature #1519 [make:registration] use "User" type in EmailVerifier
1 parent e209117 commit d711796

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/Maker/MakeRegistrationForm.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
253253
UserInterface::class,
254254
VerifyEmailExceptionInterface::class,
255255
VerifyEmailHelperInterface::class,
256+
$userClassNameDetails->getFullName(),
256257
]);
257258

258259
$generator->generateClass(
@@ -263,6 +264,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
263264
'id_getter' => $this->idGetter,
264265
'email_getter' => $this->emailGetter,
265266
'verify_email_anonymously' => $this->verifyEmailAnonymously,
267+
'user_class_name' => $userClassNameDetails->getShortName(),
266268
],
267269
$userRepoVars
268270
)

src/Resources/skeleton/verifyEmail/EmailVerifier.tpl.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ public function __construct(
1313
) {
1414
}
1515

16-
public function sendEmailConfirmation(string $verifyEmailRouteName, UserInterface $user, TemplatedEmail $email): void
16+
public function sendEmailConfirmation(string $verifyEmailRouteName, <?= $user_class_name ?> $user, TemplatedEmail $email): void
1717
{
1818
$signatureComponents = $this->verifyEmailHelper->generateSignature(
1919
$verifyEmailRouteName,
20-
$user-><?= $id_getter ?>(),
20+
(string) $user-><?= $id_getter ?>(),
2121
<?php if ($verify_email_anonymously): ?>
2222
$user-><?= $email_getter ?>(),
23-
['id' => $user->getId()]
23+
['id' => $user-><?= $id_getter ?>()]
2424
<?php else: ?>
2525
$user-><?= $email_getter ?>()
2626
<?php endif; ?>
@@ -39,9 +39,9 @@ public function sendEmailConfirmation(string $verifyEmailRouteName, UserInterfac
3939
/**
4040
* @throws VerifyEmailExceptionInterface
4141
*/
42-
public function handleEmailConfirmation(Request $request, UserInterface $user): void
42+
public function handleEmailConfirmation(Request $request, <?= $user_class_name ?> $user): void
4343
{
44-
$this->verifyEmailHelper->validateEmailConfirmationFromRequest($request, $user-><?= $id_getter ?>(), $user-><?= $email_getter?>());
44+
$this->verifyEmailHelper->validateEmailConfirmationFromRequest($request, (string) $user-><?= $id_getter ?>(), $user-><?= $email_getter?>());
4545

4646
$user->setVerified(true);
4747

0 commit comments

Comments
 (0)