summaryrefslogtreecommitdiffstats
path: root/Http
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2012-10-02 12:23:35 +0200
committerFabien Potencier <fabien.potencier@gmail.com>2012-10-02 12:23:35 +0200
commit2cdd8e98e2f39cc696f7bf7ef3cd39083f1fd9b6 (patch)
tree9d2293e03a58cbf6910aab7256d86cc6c764befb /Http
parent41714cb061ee428fcfacf7c87584116c96c5e0e8 (diff)
parentb560d609f9890501f54b15cfac1d68a26e6a6d57 (diff)
downloadsymfony-security-2cdd8e98e2f39cc696f7bf7ef3cd39083f1fd9b6.zip
symfony-security-2cdd8e98e2f39cc696f7bf7ef3cd39083f1fd9b6.tar.gz
symfony-security-2cdd8e98e2f39cc696f7bf7ef3cd39083f1fd9b6.tar.bz2
Merge branch '2.1'
* 2.1: [2.1] Fix SessionHandlerInterface autoloading Remove executable bit from HttpKernel/DependencyInjection/ConfigurableExtension.php [2.0][http-foundation] Fix Response::getDate method [DoctrineBridge] Require class option for DoctrineType [HttpFoundation] fixed the path to the SensioHandlerInterface class in composer.json Support the new Microsoft URL Rewrite Module for IIS 7.0. @see http://framework.zend.com/issues/browse/ZF-4491 @see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842 fixed undefined variable hasColorSupport does not take an argument Improve FilterResponseEvent docblocks Response ref
Diffstat (limited to 'Http')
-rw-r--r--Http/Firewall/ContextListener.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php
index 53b2073..b1ba24b 100644
--- a/Http/Firewall/ContextListener.php
+++ b/Http/Firewall/ContextListener.php
@@ -88,7 +88,7 @@ class ContextListener implements ListenerInterface
$token = $this->refreshUser($token);
} elseif (null !== $token) {
if (null !== $this->logger) {
- $this->logger->warn(sprintf('Session includes a "%s" where a security token is expected', is_object($value) ? get_class($value) : gettype($value)));
+ $this->logger->warn(sprintf('Session includes a "%s" where a security token is expected', is_object($token) ? get_class($token) : gettype($token)));
}
$token = null;