Merge branch '2.8' into 3.0

symfony · Jan 6, 2016 · c7767ad · c7767ad
2 parents 3f7191f + 172b72b
commit c7767ad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/cookbook/security/guard-authentication.rst b/cookbook/security/guard-authentication.rst
@@ -303,7 +303,7 @@ Finally, configure your ``firewalls`` key in ``security.yml`` to use this authen
 
                     # if you want, disable storing the user in the session
                     # stateless: true
-                    
+
                     # maybe other things, like form_login, remember_me, etc
                     # ...
 
@@ -427,7 +427,7 @@ Each authenticator needs the following methods:
 
 **supportsRememberMe**
     If you want to support "remember me" functionality, return true from this method.
-    You will still need to active ``rememebe_me`` under your firewall for it to work.
+    You will still need to active ``remember_me`` under your firewall for it to work.
     Since this is a stateless API, you do not want to support "remember me"
     functionality in this example.
 
@@ -448,17 +448,17 @@ to cause a failure::
 
     // src/AppBundle/Security/TokenAuthenticator.php
     // ...
-    
+
     use Symfony\Component\Security\Core\Exception\CustomUserMessageAuthenticationException;
-    
+
     class TokenAuthenticator extends AbstractGuardAuthenticator
     {
         // ...
-        
+
         public function getCredentials(Request $request)
         {
             // ...
-            
+
             if ($token == 'ILuvAPIs') {
                 throw new CustomUserMessageAuthenticationException(
                     'ILuvAPIs is not a real API key: it\'s just a silly phrase'
@@ -467,7 +467,7 @@ to cause a failure::
 
             // ...
         }
-        
+
         // ...
     }
 
@@ -512,7 +512,7 @@ Frequently Asked Questions
 
                         # if you want, disable storing the user in the session
                         # stateless: true
-                    
+
                         # maybe other things, like form_login, remember_me, etc
                         # ...
 

diff --git a/reference/forms/types/options/choice_label.rst.inc b/reference/forms/types/options/choice_label.rst.inc
@@ -49,7 +49,7 @@ If your choice values are objects, then ``choice_label`` can also be a
         'choices' => array(
             new Status(Status::YES),
             new Status(Status::NO),
-            new Status::(Status::MAYBE),
+            new Status(Status::MAYBE),
         ),
         'choices_as_values' => true,
         'choice_label' => 'displayName',