replace helper w/ ClassNameDetailsObject

Author: jrushlow

src/Generator.php

@@ -154,7 +154,7 @@ public function createClassNameDetails(string $name, string $namespacePrefix, st
             $fullNamespacePrefix = $this->fileManager->getNamespacePrefixForClass($className);
         }
 
-        return new ClassNameDetails($className, $fullNamespacePrefix, $suffix);
+        return new ClassNameDetails($className, $fullNamespacePrefix, $suffix, $this->phpCompatUtil->canUseTypedProperties());
     }
 
     /**

src/Maker/MakeRegistrationForm.php

@@ -317,7 +317,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                     'user_class_name' => $userClassNameDetails->getShortName(),
                     'password_field' => $this->passwordField,
                     'will_verify_email' => $this->willVerifyEmail,
-                    'email_verifier_class' => $generator->createClassHelper($verifyEmailServiceClassNameDetails->getFullName()),
+                    'email_verifier_class_details' => $verifyEmailServiceClassNameDetails,
                     'verify_email_anonymously' => $this->verifyEmailAnonymously,
                     'from_email' => $this->fromEmailAddress,
                     'from_email_name' => $this->fromEmailName,
@@ -326,7 +326,8 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                     'authenticator_full_class_name' => $this->autoLoginAuthenticator,
                     'firewall_name' => $this->firewallName,
                     'redirect_route_name' => $this->redirectRouteName,
-                    'password_class' => $generator->createClassHelper($passwordHasher),
+                    'password_class_details' => ($passwordClassDetails = $generator->createClassNameDetails($passwordHasher, '\\')),
+                    'password_variable_name' => sprintf('$%s', lcfirst($passwordClassDetails->getShortName())),
                     'use_password_hasher' => UserPasswordHasherInterface::class === $passwordHasher,
                 ],
                 $userRepoVars

src/Resources/skeleton/registration/RegistrationController.tpl.php

@@ -7,11 +7,11 @@
 class <?= $class_name; ?> extends <?= $parent_class_name; ?><?= "\n" ?>
 {
 <?php if ($will_verify_email): ?>
-<?= $email_verifier_class->getPropertyStatement() ?>
+    private <?= $email_verifier_class_details->getPropertyType() ?>$emailVerifier;
 
-    public function __construct(<?= $email_verifier_class->getMethodArgument() ?>)
+    public function __construct(<?= $email_verifier_class_details->getShortName() ?> $emailVerifier)
     {
-        <?= $email_verifier_class->getConstructorArgument(true, false) ?>
+        $this->emailVerifier = $emailVerifier;
     }
 
 <?php endif; ?>
@@ -22,7 +22,7 @@ public function __construct(<?= $email_verifier_class->getMethodArgument() ?>)
      * @Route("<?= $route_path ?>", name="<?= $route_name ?>")
      */
 <?php } ?>
-    public function register(Request $request, <?= $password_class->getMethodArgument() ?><?= $authenticator_full_class_name ? sprintf(', GuardAuthenticatorHandler $guardHandler, %s $authenticator', $authenticator_class_name) : '' ?>): Response
+    public function register(Request $request, <?= $password_class_details->getShortName() ?> <?= $password_variable_name ?><?= $authenticator_full_class_name ? sprintf(', GuardAuthenticatorHandler $guardHandler, %s $authenticator', $authenticator_class_name) : '' ?>): Response
     {
         $user = new <?= $user_class_name ?>();
         $form = $this->createForm(<?= $form_class_name ?>::class, $user);
@@ -31,11 +31,7 @@ public function register(Request $request, <?= $password_class->getMethodArgumen
         if ($form->isSubmitted() && $form->isValid()) {
             // encode the plain password
             $user->set<?= ucfirst($password_field) ?>(
-<?php if ($use_password_hasher) : ?>
-                <?= $password_class->getVariable() ?>->hashPassword(
-<?php else: ?>
-                <?= $password_class->getVariable() ?>->encodePassword(
-<?php endif; ?>
+            <?= $password_variable_name ?>-><?= $use_password_hasher ? 'hashPassword' : 'encodePassword' ?>(
                     $user,
                     $form->get('plainPassword')->getData()
                 )
@@ -47,7 +43,7 @@ public function register(Request $request, <?= $password_class->getMethodArgumen
 <?php if ($will_verify_email): ?>
 
             // generate a signed url and email it to the user
-            <?= $email_verifier_class->getProperty() ?>->sendEmailConfirmation('app_verify_email', $user,
+            $this->emailVerifier->sendEmailConfirmation('app_verify_email', $user,
                 (new TemplatedEmail())
                     ->from(new Address('<?= $from_email ?>', '<?= $from_email_name ?>'))
                     ->to($user-><?= $email_getter ?>())
@@ -108,7 +104,7 @@ public function verifyUserEmail(Request $request<?= $verify_email_anonymously ?
 
         // validate email confirmation link, sets User::isVerified=true and persists
         try {
-            <?= $email_verifier_class->getProperty() ?>->handleEmailConfirmation($request, <?= $verify_email_anonymously ? '$user' : '$this->getUser()' ?>);
+            $this->emailVerifier->handleEmailConfirmation($request, <?= $verify_email_anonymously ? '$user' : '$this->getUser()' ?>);
         } catch (VerifyEmailExceptionInterface $exception) {
             $this->addFlash('verify_email_error', $exception->getReason());
 

src/Util/ClassNameDetails.php

@@ -16,16 +16,18 @@
 final class ClassNameDetails
 {
     private $fullClassName;
-
     private $namespacePrefix;
-
     private $suffix;
+    private $usesTypedProperties;
 
-    public function __construct(string $fullClassName, string $namespacePrefix, string $suffix = null)
+    public function __construct(string $fullClassName, string $namespacePrefix, string $suffix = null, ?bool $usesTypedProperties = null)
     {
         $this->fullClassName = $fullClassName;
         $this->namespacePrefix = trim($namespacePrefix, '\\');
         $this->suffix = $suffix;
+        $this->usesTypedProperties = $usesTypedProperties;
+
+        // @TODO throw deprecation if bool not passed....
     }
 
     public function getFullName(): string
@@ -38,6 +40,15 @@ public function getShortName(): string
         return Str::getShortClassName($this->fullClassName);
     }
 
+    public function getPropertyType(): ?string
+    {
+        if (!$this->usesTypedProperties) {
+            return null;
+        }
+
+        return sprintf('%s ', $this->getShortName());
+    }
+
     /**
      * Returns the original class name the user entered (after
      * being cleaned up).