Skip to content

Commit c190f34

Browse files
committed
add typed properties
1 parent bc5b997 commit c190f34

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

src/Maker/MakeAuthenticator.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ private function generateAuthenticatorClass(array $securityData, string $authent
336336
PasswordAuthenticatedInterface::class);
337337

338338
$guardTemplateVariables = [
339+
'csrf_token_class_details' => $generator->createClassNameDetails(CsrfTokenManagerInterface::class, '\\'),
339340
'user_class_name' => $userClassNameDetails->getShortName(),
340341
'user_needs_encoder' => $hasEncoder,
341342
'password_class_details' => $generator->createClassNameDetails(UserPasswordEncoderInterface::class, '\\'),
@@ -353,6 +354,7 @@ private function generateAuthenticatorClass(array $securityData, string $authent
353354
if ($isEntity) {
354355
$useStatements[] = $userClassNameDetails->getFullName();
355356
$useStatements[] = EntityManagerInterface::class;
357+
$guardTemplateVariables['entity_manager_class_details'] = $generator->createClassNameDetails(EntityManagerInterface::class, '\\');
356358
}
357359

358360
if ($hasEncoder) {
@@ -377,6 +379,7 @@ private function generateAuthenticatorClass(array $securityData, string $authent
377379
sprintf('authenticator/%sLoginFormAuthenticator.tpl.php', $this->useSecurity52 ? 'Security52' : ''),
378380
array_merge([
379381
'use_statements' => TemplateComponentGenerator::generateUseStatements($useStatements),
382+
'url_generator_class_details' => $generator->createClassNameDetails(UrlGeneratorInterface::class, '\\'),
380383
'username_field' => $userNameField,
381384
'username_field_label' => Str::asHumanWords($userNameField),
382385
], ($this->useSecurity52 ? $security53TemplateVariables : $guardTemplateVariables)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ class <?= $class_name; ?> extends AbstractFormLoginAuthenticator<?= $password_au
1010

1111
public const LOGIN_ROUTE = 'app_login';
1212

13-
<?= $user_is_entity ? " private \$entityManager;\n" : null ?>
14-
private $urlGenerator;
15-
private $csrfTokenManager;
13+
<?= $user_is_entity ? sprintf(" private %s\$entityManager;\n", $generator->getPropertyType($entity_manager_class_details)) : null ?>
14+
private <?= $generator->getPropertyType($url_generator_class_details) ?>$urlGenerator;
15+
private <?= $generator->getPropertyType($csrf_token_class_details) ?>$csrfTokenManager;
1616
<?= $user_needs_encoder ? sprintf(" private %s$%s;\n", $generator->getPropertyType($password_class_details), $password_variable_name) : null?>
1717

1818
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 ?>)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class <?= $class_name; ?> extends AbstractLoginFormAuthenticator
1010

1111
public const LOGIN_ROUTE = 'app_login';
1212

13-
private <?= $use_typed_properties ? 'UrlGeneratorInterface ' : null ?>$urlGenerator;
13+
private <?= $generator->getPropertyType($url_generator_class_details) ?>$urlGenerator;
1414

1515
public function __construct(UrlGeneratorInterface $urlGenerator)
1616
{

0 commit comments

Comments
 (0)