10000 [Security] Fix BC break introduced in #10694 by romainneutron · Pull Request #12049 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Security] Fix BC break introduced in #10694 #12049

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
Sep 27, 2014
Merged

[Security] Fix BC break introduced in #10694 #12049

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
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
<tag name="monolog.logger" channel="security" />
<argument type="service" id="security.context" />
<argument /> <!-- Key -->
<argument type="service" id="security.authentication.manager" />
<argument type="service" id="logger" on-invalid="null" />
<argument type="service" id="security.authentication.manager" />
</service>

<service id="security.authentication.provider.anonymous" class="%security.authentication.provider.anonymous.class%" public="false">
Expand Down
7 changes: 5 additions & 2 deletions src/Symfony/Component/Security/Http/Firewall/AnonymousAuthenticationListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class AnonymousAuthenticationListener implements ListenerInterface
private $authenticationManager;
private $logger;

public function __construct(SecurityContextInterface $context, $key, AuthenticationManagerInterface $authenticationManager, LoggerInterface $logger = null)
public function __construct(SecurityContextInterface $context, $key, LoggerInterface $logger = null, AuthenticationManagerInterface $authenticationManager = null)
{
$this->context = $context;
$this->key = $key;
Expand All @@ -51,7 +51,10 @@ public function handle(GetResponseEvent $event)
}

try {
$token = $this->authenticationManager->authenticate(new AnonymousToken($this->key, 'anon.', array()));
if (null !== $this->authenticationManager) {
$token = $this->authenticationManager->authenticate(new AnonymousToken($this->key, 'anon.', array()));
}

$this->context->setToken($token);

if (null !== $this->logger) {
Expand Down
0