Skip to content

Commit 3265c08

Browse files
Use 'logout_path' twig function
1 parent 4280338 commit 3265c08

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

src/Maker/MakeAuthenticator.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
282282
$input->getArgument('logout-setup'),
283283
$supportRememberMe,
284284
$alwaysRememberMe,
285-
$input->getOption('firewall-name')
286285
);
287286
}
288287

@@ -366,7 +365,7 @@ private function generateAuthenticatorClass(array $securityData, string $authent
366365
);
367366
}
368367

369-
private function generateFormLoginFiles(string $controllerClass, string $userNameField, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe, string $firewallName = 'main'): void
368+
private function generateFormLoginFiles(string $controllerClass, string $userNameField, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe): void
370369
{
371370
$controllerClassNameDetails = $this->generator->createClassNameDetails(
372371
$controllerClass,
@@ -419,7 +418,6 @@ private function generateFormLoginFiles(string $controllerClass, string $userNam
419418
'username_is_email' => false !== stripos($userNameField, 'email'),
420419
'username_label' => ucfirst(Str::asHumanWords($userNameField)),
421420
'logout_setup' => $logoutSetup,
422-
'logout_path' => $this->supportsLogoutRouteLoader() ? '_logout_'.$firewallName : 'app_logout',
423421
'support_remember_me' => $supportRememberMe,
424422
'always_remember_me' => $alwaysRememberMe,
425423
]

src/Maker/Security/MakeFormLogin.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
171171
'logout_setup' => $this->willLogout,
172172
'username_label' => Str::asHumanWords($this->userNameField),
173173
'username_is_email' => false !== stripos($this->userNameField, 'email'),
174-
'logout_path' => $this->supportsLogoutRouteLoader() ? '_logout_'.$this->firewallToUpdate : 'app_logout',
175174
]
176175
);
177176

src/Resources/skeleton/security/formLogin/login_form.tpl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<?php if ($logout_setup): ?>
1212
{% if app.user %}
1313
<div class="mb-3">
14-
You are logged in as {{ app.user.userIdentifier }}, <a href="{{ path('<?= $logout_path; ?>') }}">Logout</a>
14+
You are logged in as {{ app.user.userIdentifier }}, <a href="{{ logout_path() }}">Logout</a>
1515
</div>
1616
{% endif %}
1717

tests/fixtures/security/make-form-login/expected/login.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
{% if app.user %}
1212
<div class="mb-3">
13-
You are logged in as {{ app.user.userIdentifier }}, <a href="{{ path('app_logout') }}">Logout</a>
13+
You are logged in as {{ app.user.userIdentifier }}, <a href="{{ logout_path() }}">Logout</a>
1414
</div>
1515
{% endif %}
1616

tests/fixtures/security/make-form-login/expected/login_routeloader_logout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
{% if app.user %}
1212
<div class="mb-3">
13-
You are logged in as {{ app.user.userIdentifier }}, <a href="{{ path('_logout_main') }}">Logout</a>
13+
You are logged in as {{ app.user.userIdentifier }}, <a href="{{ logout_path() }}">Logout</a>
1414
</div>
1515
{% endif %}
1616

0 commit comments

Comments
 (0)