summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2015-11-04 09:18:19 +0100
committerNicolas Grekas <nicolas.grekas@gmail.com>2015-11-04 09:18:19 +0100
commite2d07f929db58f70c0f556b390010ed10dda0764 (patch)
tree5f3d32f2eedd837cfb34b4506789896d5f526c41
parent969128c31e439d0d56ff99322806e9d56923149a (diff)
parent7c8e60751a6ea3ffd7bbf08a599bebfe32d56fa5 (diff)
downloadsymfony-security-e2d07f929db58f70c0f556b390010ed10dda0764.zip
symfony-security-e2d07f929db58f70c0f556b390010ed10dda0764.tar.gz
symfony-security-e2d07f929db58f70c0f556b390010ed10dda0764.tar.bz2
Merge branch '2.8'
* 2.8: asset test coverage [HttpKernel] PostResponseEvent should extend the KernelEvent [travis] session.gc_probability=0 to fix transient tests on hhvm Write the log message on a single line againn [DI] Deprecate ContainerAware in favor of ContainerAwareTrait [VarDumper] Deprecate VarDumperTestCase in favor of the trait Check whether $this->logger is not null on GuardAuthenticationListener [Console] Add progress indicator helper Conflicts: .travis.yml
-rw-r--r--Guard/Firewall/GuardAuthenticationListener.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/Guard/Firewall/GuardAuthenticationListener.php b/Guard/Firewall/GuardAuthenticationListener.php
index 0ac7c12..ed0a36e 100644
--- a/Guard/Firewall/GuardAuthenticationListener.php
+++ b/Guard/Firewall/GuardAuthenticationListener.php
@@ -77,7 +77,9 @@ class GuardAuthenticationListener implements ListenerInterface
$this->executeGuardAuthenticator($uniqueGuardKey, $guardAuthenticator, $event);
if ($event->hasResponse()) {
- $this->logger->debug(sprintf('The "%s" authenticator set the response. Any later authenticator will not be called', get_class($guardAuthenticator)));
+ if (null !== $this->logger) {
+ $this->logger->debug(sprintf('The "%s" authenticator set the response. Any later authenticator will not be called', get_class($guardAuthenticator)));
+ }
break;
}