Merge branch 'master' of git://github.com/symfony/symfony into security

2 files changed, 4 insertions, 3 deletions

diff --git a/Acl/Permission/MaskBuilder.php b/Acl/Permission/MaskBuilder.php
index 9965228..a0c84f8 100644
--- a/Acl/Permission/MaskBuilder.php
+++ b/Acl/Permission/MaskBuilder.php
@@ -92,7 +92,7 @@ class MaskBuilder
      */
     public function add($mask)
     {
-        if (is_string($mask) && defined($name = 'self::MASK_'.strtoupper($mask))) {
+        if (is_string($mask) && defined($name = 'static::MASK_'.strtoupper($mask))) {
             $mask = constant($name);
         } else if (!is_int($mask)) {
             throw new \InvalidArgumentException('$mask must be an integer.');
@@ -145,7 +145,7 @@ class MaskBuilder
      */
     public function remove($mask)
     {
-        if (is_string($mask) && defined($name = 'self::MASK_'.strtoupper($mask))) {
+        if (is_string($mask) && defined($name = 'static::MASK_'.strtoupper($mask))) {
             $mask = constant($name);
         } else if (!is_int($mask)) {
             throw new \InvalidArgumentException('$mask must be an integer.');
@@ -189,7 +189,7 @@ class MaskBuilder
             }
 
             if ($mask === $cMask) {
-                if (!defined($cName = 'self::CODE_'.substr($name, 5))) {
+                if (!defined($cName = 'static::CODE_'.substr($name, 5))) {
                     throw new \RuntimeException('There was no code defined for this mask.');
                 }
 
diff --git a/Http/Firewall/ContextListener.php b/Http/Firewall/ContextListener.php
index 331a1e3..b018487 100644
--- a/Http/Firewall/ContextListener.php
+++ b/Http/Firewall/ContextListener.php
@@ -47,6 +47,7 @@ class ContextListener implements ListenerInterface
         $this->context = $context;
         $this->userProviders = $userProviders;
         $this->contextKey = $contextKey;
+        $this->logger = $logger;
 
         if (null !== $dispatcher) {
             $dispatcher->addListener(Events::onCoreResponse, $this);