8000 [FrameworkBundle] Fix compatibility with symfony/security-core 6.x (deps=high tests) by wouterj · Pull Request #44427 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[FrameworkBundle] Fix compatibility with symfony/security-core 6.x (deps=high tests) #44427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2021
Merged

[FrameworkBundle] Fix compatibility with symfony/security-core 6.x (deps=high tests) #44427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,10 @@ public function loginUser(object $user, string $firewallContext = 'main'): self
}

$token = new TestBrowserToken($user->getRoles(), $user, $firewallContext);
$token->setAuthenticated(true);
// @deprecated since Symfony 5.4
if (method_exists($token, 'setAuthenticated')) {
$token->setAuthenticated(true);
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The real bugfix of this PR, this adds support for security-core 6.0 in FrameworkBundle.


$container = $this->getContainer();
$container->get('security.untracked_token_storage')->setToken($token);
Expand Down
12 changes: 11 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,12 @@ public function testForward()
public function testGetUser()
{
$user = new InMemoryUser('user', 'pass');
$token = new UsernamePasswordToken($user, 'pass', 'default', ['ROLE_USER']);
if (method_exists(UsernamePasswordToken::class, 'setAuthenticated')) {
// @deprecated since Symfony 5.4
$token = new UsernamePasswordToken($user, 'pass', 'default', ['ROLE_USER']);
} else {
$token = new UsernamePasswordToken($user, 'default', ['ROLE_USER']);
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Expected BC break, correct deprecations are triggered on 5.4.


$controller = $this->createController();
$controller->setContainer($this->getContainerWithTokenStorage($token));
Expand All @@ -148,6 +153,11 @@ public function testGetUser()

public function testGetUserAnonymousUserConvertedToNull()
{
// @deprecated since Symfony 5.4
if (!class_exists(AnonymousToken::class)) {
$this->markTestSkipped('This test requires "symfony/security-core" <6.0.');
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is irrelevant in 6.0, as anonymous tokens are removed and anonymous sessions are now null anyways (so no conversion is needed in AbstractController::getUser()).

}

$token = new AnonymousToken('default', 'anon.');

$controller = $this->createController();
Expand Down
0