Merge branch '2.8' into 3.2

* 2.8:
  setfacl commands in the right order
  [#7941] use class constant
  Update guard_authentication.rst
  Fix typo
  added missing ClassMetadata

Author: xabbuh

form/unit_testing.rst

@@ -174,7 +174,9 @@ allows you to return a list of extensions to register::
     // ...
     use AppBundle\Form\Type\TestedType;
     use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
+    use Symfony\Component\Form\Form;
     use Symfony\Component\Validator\ConstraintViolationList;
+    use Symfony\Component\Validator\Mapping\ClassMetadata;
     use Symfony\Component\Validator\Validator\ValidatorInterface;
 
     class TestedTypeTest extends TypeTestCase
@@ -189,6 +191,9 @@ allows you to return a list of extensions to register::
             $this->validator
                 ->method('validate')
                 ->will($this->returnValue(new ConstraintViolationList()));
+            $validator
+                ->method('getMetadataFor')
+                ->will($this->returnValue(new ClassMetadata(Form::class)));
 
             return array(
                 new ValidatorExtension($this->validator),

security/guard_authentication.rst

@@ -148,7 +148,7 @@ user (if any).
 To create a custom authentication system, just create a class and make it implement
 :class:`Symfony\\Component\\Security\\Guard\\GuardAuthenticatorInterface`. Or, extend
 the simpler :class:`Symfony\\Component\\Security\\Guard\\AbstractGuardAuthenticator`.
-This requires you to implement six methods::
+This requires you to implement seven methods::
 
     // src/AppBundle/Security/TokenAuthenticator.php
     namespace AppBundle\Security;

setup/file_permissions.rst

@@ -50,8 +50,8 @@ following script to determine your web server user and grant the needed permissi
 
     $ HTTPDUSER=$(ps axo user,comm | grep -E '[a]pache|[h]ttpd|[_]www|[w]ww-data|[n]ginx' | grep -v root | head -1 | cut -d\  -f1)
     # if this doesn't work, try adding `-n` option
-    $ sudo setfacl -R -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX var
     $ sudo setfacl -dR -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX var
+    $ sudo setfacl -R -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX var
 
 .. note::
 

validation/translations.rst

@@ -84,14 +84,13 @@ property is not empty, add the following:
             }
         }
 
-Create a translation file under the ``validators`` catalog for the constraint
-messages, typically in the ``Resources/translations/`` directory of the bundle.
+Now, create a ``validators`` catalog file in the ``app/Resources/translations`` directory:
 
 .. configuration-block::
 
     .. code-block:: xml
 
-        <!-- validators.en.xlf -->
+        <!-- app/Resources/translations/validators.en.xlf -->
         <?xml version="1.0"?>
         <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
             <file source-language="en" datatype="plaintext" original="file.ext">
@@ -106,12 +105,15 @@ messages, typically in the ``Resources/translations/`` directory of the bundle.
 
     .. code-block:: yaml
 
-        # validators.en.yml
+        # app/Resources/translations/validators.en.yml
         author.name.not_blank: Please enter an author name.
 
     .. code-block:: php
 
-        // validators.en.php
+        // app/Resources/translations/validators.en.php
         return array(
             'author.name.not_blank' => 'Please enter an author name.',
         );
+
+You may need to clear your cache (even in the dev environment) after creating this
+file for the first time.