conditionally use password hasher instead of encoder

Author: jrushlow

src/Generator.php

@@ -69,6 +69,7 @@ public function generateClass(string $className, string $templateName, array $va
         $variables = array_merge($variables, [
             'class_name' => Str::getShortClassName($className),
             'namespace' => Str::getNamespace($className),
+            'generator' => $this->templateComponentGenerator,
         ]);
 
         $this->addOperation($targetPath, $templateName, $variables);

src/Maker/MakeAuthenticator.php

@@ -40,6 +40,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
@@ -337,6 +338,8 @@ private function generateAuthenticatorClass(array $securityData, string $authent
         $guardTemplateVariables = [
             'user_class_name' => $userClassNameDetails->getShortName(),
             'user_needs_encoder' => $hasEncoder,
+            'password_class_details' => $generator->createClassNameDetails(UserPasswordEncoderInterface::class, '\\'),
+            'password_variable_name' => 'passwordEncoder',
             'user_is_entity' => $isEntity,
             'provider_key_type_hint' => $this->providerKeyTypeHint(),
             'password_authenticated' => $guardPasswordAuthenticated,
@@ -353,7 +356,15 @@ private function generateAuthenticatorClass(array $securityData, string $authent
             }
 
             if ($hasEncoder) {
-                $useStatements[] = UserPasswordEncoderInterface::class;
+                $encoder = UserPasswordEncoderInterface::class;
+
+                if (interface_exists(UserPasswordHasherInterface::class)) {
+                    $encoder = UserPasswordHasherInterface::class;
+                    $guardTemplateVariables['password_class_details'] = $generator->createClassNameDetails(UserPasswordHasherInterface::class, '\\');
+                    $guardTemplateVariables['password_variable_name'] = 'passwordHasher';
+                }
+
+                $useStatements[] = $encoder;
             }
 
             if ($guardPasswordAuthenticated) {

src/Resources/skeleton/authenticator/LoginFormAuthenticator.tpl.php

@@ -13,14 +13,14 @@ class <?= $class_name; ?> extends AbstractFormLoginAuthenticator<?= $password_au
 <?= $user_is_entity ? "    private \$entityManager;\n" : null ?>
     private $urlGenerator;
     private $csrfTokenManager;
-<?= $user_needs_encoder ? "    private \$passwordEncoder;\n" : null ?>
+<?= $user_needs_encoder ? sprintf("    private %s$%s;\n", $generator->getPropertyType($password_class_details), $password_variable_name) : null?>
 
-    public function __construct(<?= $user_is_entity ? 'EntityManagerInterface $entityManager, ' : null ?>UrlGeneratorInterface $urlGenerator, CsrfTokenManagerInterface $csrfTokenManager<?= $user_needs_encoder ? ', UserPasswordEncoderInterface $passwordEncoder' : null ?>)
+    public function __construct(<?= $user_is_entity ? 'EntityManagerInterface $entityManager, ' : null ?>UrlGeneratorInterface $urlGenerator, CsrfTokenManagerInterface $csrfTokenManager<?= $user_needs_encoder ? sprintf(', %s $%s', $password_class_details->getShortName(), $password_variable_name) : null ?>)
     {
 <?= $user_is_entity ? "        \$this->entityManager = \$entityManager;\n" : null ?>
         $this->urlGenerator = $urlGenerator;
         $this->csrfTokenManager = $csrfTokenManager;
-<?= $user_needs_encoder ? "        \$this->passwordEncoder = \$passwordEncoder;\n" : null ?>
+<?= $user_needs_encoder ? sprintf("        \$this->%s = \$%s;\n", $password_variable_name, $password_variable_name) : null ?>
     }
 
     public function supports(Request $request)
@@ -65,10 +65,13 @@ public function getUser($credentials, UserProviderInterface $userProvider)
 
     public function checkCredentials($credentials, UserInterface $user)
     {
-        <?= $user_needs_encoder ? "return \$this->passwordEncoder->isPasswordValid(\$user, \$credentials['password']);\n"
-        : "// Check the user's password or other credentials and return true or false
+<?php if ($user_needs_encoder): ?>
+        return $this-><?= $password_variable_name ?>->isPasswordValid($user, $credentials['password']);
+<?php else : ?>
+        // Check the user's password or other credentials and return true or false
         // If there are no credentials to check, you can just return true
-        throw new \Exception('TODO: check the credentials inside '.__FILE__);\n" ?>
+        throw new \Exception('TODO: check the credentials inside '.__FILE__);
+<?php endif ?>
     }
 
 <?php if ($password_authenticated): ?>