symfony
diff --git a/‎UPGRADE-2.7.md
Lines changed: 22 additions & 0 deletions b/‎UPGRADE-2.7.md
Lines changed: 22 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
Lines changed: 0 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/Symfony/Component/Security/Http/Firewall/ContextListener.php
Lines changed: 1 addition & 5 deletions b/‎src/Symfony/Component/Security/Http/Firewall/ContextListener.php
Lines changed: 1 addition & 5 deletions
diff --git a/‎src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php
Lines changed: 1 addition & 1 deletion
@@ -643,3 +643,25 @@ FrameworkBundle
        }
    }
    ```
+
+Security
+---------------
+
+ * Injection of the `security.context` service has been reduced to a bare minimum. This means
+   that arguments that once hinted `SecurityContext` or `SecurityContextInterface` will have
+   to be updated accordingly to either the `TokenStorageInterface` or `AuthorizationCheckerInterface`.
+   The following classes now require the `security.token_storage` service instead of the `security.context`,
+   please update your extending implementations accordingly.
+
+    * `AbstractAuthenticationListener`
+    * `AnonymousAuthenticationListener`
+    * `ContextListener`
+    * `SimplePreAuthenticationListener`
+    * `X509AuthenticationListener`
+    * `RemoteUserAuthenticationListener`
+    * `BasicAuthenticationListener`
+    * `DigestAuthenticationListener`
+    * `ExceptionListener`
+    * `SwitchUserListener`
+    * `AccessListener`
+    * `RememberMeListener`
@@ -14,7 +14,6 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\SecurityContext;
 
 /**
 
@@ -101,7 +101,7 @@ public function handle(GetResponseEvent $event)
     }
 
     /**
-     * Writes the SecurityContext to the session.
+     * Writes the security token into the session.
      *
      * @param FilterResponseEvent $event A FilterResponseEvent instance
      */
@@ -121,10 +121,6 @@ public function onKernelResponse(FilterResponseEvent $event)
         $request = $event->getRequest();
         $session = $request->getSession();
 
-        if (null === $session) {
-            return;
-        }
-
         if ((null === $token = $this->tokenStorage->getToken()) || ($token instanceof AnonymousToken)) {
             if ($request->hasPreviousSession()) {
                 $session->remove($this->sessionKey);
 
@@ -36,8 +36,8 @@ interface RememberMeServicesInterface
     const COOKIE_ATTR_NAME = '_security_remember_me_cookie';
 
     /**
-     * This method will be called whenever the SecurityContext does not contain
-     * an TokenInterface object and the framework wishes to provide an implementation
+     * This method will be called whenever the TokenStorage does not contain
+     * a TokenInterface object and the framework wishes to provide an implementation
      * with an opportunity to authenticate the request using remember-me capabilities.
      *
      * No attempt whatsoever is made to determine whether the browser has requested
 
@@ -27,7 +27,7 @@ interface SessionAuthenticationStrategyInterface
     /**
      * This performs any necessary changes to the session.
      *
-     * This method is called before the SecurityContext is populated with a
+     * This method is called before the TokenStorage is populated with a
      * Token, and only by classes inheriting from AbstractAuthenticationListener.
      *
      * @param Request        $request
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ interface SessionAuthenticationStrategyInterface`
`27`	`27`	`/**`
`28`	`28`	`* This performs any necessary changes to the session.`
`29`	`29`	`*`
`30`		`- * This method is called before the SecurityContext is populated with a`
	`30`	`+ * This method is called before the TokenStorage is populated with a`
`31`	`31`	`* Token, and only by classes inheriting from AbstractAuthenticationListener.`
`32`	`32`	`*`
`33`	`33`	`* @param Request $request`