Merge branch '2.4'

symfony · May 6, 2014 · d6474fc · d6474fc
2 parents a9648e8 + e28d0cb
commit d6474fc
Show file tree

Hide file tree

Showing 9 changed files with 412 additions and 27 deletions.
diff --git a/book/security.rst b/book/security.rst
@@ -438,7 +438,7 @@ Next, create the controller that will display the login form::
 
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Symfony\Component\HttpFoundation\Request;
-    use Symfony\Component\Security\Core\SecurityContext;
+    use Symfony\Component\Security\Core\SecurityContextInterface;
 
     class SecurityController extends Controller
     {
@@ -447,20 +447,20 @@ Next, create the controller that will display the login form::
             $session = $request->getSession();
 
             // get the login error if there is one
-            if ($request->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) {
+            if ($request->attributes->has(SecurityContextInterface::AUTHENTICATION_ERROR)) {
                 $error = $request->attributes->get(
-                    SecurityContext::AUTHENTICATION_ERROR
+                    SecurityContextInterface::AUTHENTICATION_ERROR
                 );
             } else {
-                $error = $session->get(SecurityContext::AUTHENTICATION_ERROR);
-                $session->remove(SecurityContext::AUTHENTICATION_ERROR);
+                $error = $session->get(SecurityContextInterface::AUTHENTICATION_ERROR);
+                $session->remove(SecurityContextInterface::AUTHENTICATION_ERROR);
             }
 
             return $this->render(
                 'AcmeSecurityBundle:Security:login.html.twig',
                 array(
                     // last username entered by the user
-                    'last_username' => $session->get(SecurityContext::LAST_USERNAME),
+                    'last_username' => $session->get(SecurityContextInterface::LAST_USERNAME),
                     'error'         => $error,
                 )
             );

diff --git a/components/dependency_injection/factories.rst b/components/dependency_injection/factories.rst
@@ -79,8 +79,8 @@ class:
 
 When you specify the class to use for the factory (via ``factory_class``)
 the method will be called statically. If the factory itself should be instantiated
-and the resulting object's method called (as in this example), configure the
-factory itself as a service:
+and the resulting object's method called, configure the factory itself as a service.
+In this case, the method (e.g. get) should be changed to be non-static:
 
 .. configuration-block::