feature #1519 [make:registration] use "User" type in EmailVerifier

symfony · Apr 21, 2024 · d711796 · d711796
1 parent e209117
commit d711796
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Maker/MakeRegistrationForm.php b/src/Maker/MakeRegistrationForm.php
@@ -253,6 +253,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                 UserInterface::class,
                 VerifyEmailExceptionInterface::class,
                 VerifyEmailHelperInterface::class,
+                $userClassNameDetails->getFullName(),
             ]);
 
             $generator->generateClass(
@@ -263,6 +264,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                     'id_getter' => $this->idGetter,
                     'email_getter' => $this->emailGetter,
                     'verify_email_anonymously' => $this->verifyEmailAnonymously,
+                    'user_class_name' => $userClassNameDetails->getShortName(),
                 ],
                     $userRepoVars
                 )

diff --git a/src/Resources/skeleton/verifyEmail/EmailVerifier.tpl.php b/src/Resources/skeleton/verifyEmail/EmailVerifier.tpl.php
@@ -13,14 +13,14 @@ public function __construct(
     ) {
     }
 
-    public function sendEmailConfirmation(string $verifyEmailRouteName, UserInterface $user, TemplatedEmail $email): void
+    public function sendEmailConfirmation(string $verifyEmailRouteName, <?= $user_class_name ?> $user, TemplatedEmail $email): void
     {
         $signatureComponents = $this->verifyEmailHelper->generateSignature(
             $verifyEmailRouteName,
-            $user-><?= $id_getter ?>(),
+            (string) $user-><?= $id_getter ?>(),
 <?php if ($verify_email_anonymously): ?>
             $user-><?= $email_getter ?>(),
-            ['id' => $user->getId()]
+            ['id' => $user-><?= $id_getter ?>()]
 <?php else: ?>
             $user-><?= $email_getter ?>()
 <?php endif; ?>
@@ -39,9 +39,9 @@ public function sendEmailConfirmation(string $verifyEmailRouteName, UserInterfac
     /**
      * @throws VerifyEmailExceptionInterface
      */
-    public function handleEmailConfirmation(Request $request, UserInterface $user): void
+    public function handleEmailConfirmation(Request $request, <?= $user_class_name ?> $user): void
     {
-        $this->verifyEmailHelper->validateEmailConfirmationFromRequest($request, $user-><?= $id_getter ?>(), $user-><?= $email_getter?>());
+        $this->verifyEmailHelper->validateEmailConfirmationFromRequest($request, (string) $user-><?= $id_getter ?>(), $user-><?= $email_getter?>());
 
         $user->setVerified(true);