Skip to content

Commit f53f3ef

Browse files
Use 'logout_path' twig function
1 parent eb74e2a commit f53f3ef

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
@@ -276,7 +276,6 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
276276
$input->getArgument('logout-setup'),
277277
$supportRememberMe,
278278
$alwaysRememberMe,
279-
$input->getOption('firewall-name')
280279
);
281280
}
282281

@@ -359,7 +358,7 @@ private function generateAuthenticatorClass(array $securityData, string $authent
359358
);
360359
}
361360

362-
private function generateFormLoginFiles(string $controllerClass, string $userNameField, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe, string $firewallName = 'main'): void
361+
private function generateFormLoginFiles(string $controllerClass, string $userNameField, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe): void
363362
{
364363
$controllerClassNameDetails = $this->generator->createClassNameDetails(
365364
$controllerClass,
@@ -412,7 +411,6 @@ private function generateFormLoginFiles(string $controllerClass, string $userNam
412411
'username_is_email' => false !== stripos($userNameField, 'email'),
413412
'username_label' => ucfirst(Str::asHumanWords($userNameField)),
414413
'logout_setup' => $logoutSetup,
415-
'logout_path' => $this->supportsLogoutRouteLoader() ? '_logout_'.$firewallName : 'app_logout',
416414
'support_remember_me' => $supportRememberMe,
417415
'always_remember_me' => $alwaysRememberMe,
418416
]

src/Maker/Security/MakeFormLogin.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
161161
'logout_setup' => $this->willLogout,
162162
'username_label' => Str::asHumanWords($this->userNameField),
163163
'username_is_email' => false !== stripos($this->userNameField, 'email'),
164-
'logout_path' => $this->supportsLogoutRouteLoader() ? '_logout_'.$this->firewallToUpdate : 'app_logout',
165164
]
166165
);
167166

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)