Merge remote-tracking branch 'upstream/2.7' into 2.7

Author: javiereguiluz

form/unit_testing.rst

@@ -174,10 +174,12 @@ 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\Form\Forms;
     use Symfony\Component\Form\FormBuilder;
     use Symfony\Component\Form\Test\TypeTestCase;
     use Symfony\Component\Validator\ConstraintViolationList;
+    use Symfony\Component\Validator\Mapping\ClassMetadata;
     use Symfony\Component\Validator\Validator\ValidatorInterface;
 
     class TestedTypeTest extends TypeTestCase
@@ -190,6 +192,9 @@ allows you to return a list of extensions to register::
             $validator
                 ->method('validate')
                 ->will($this->returnValue(new ConstraintViolationList()));
+            $validator
+                ->method('getMetadataFor')
+                ->will($this->returnValue(new ClassMetadata(Form::class)));
 
             return array(
                 new ValidatorExtension($validator),

reference/constraints/LessThan.rst

@@ -26,8 +26,8 @@ Basic Usage
 
 The following constraints ensure that:
 
-* the number of ``siblings`` of a ``Person`` is less than or equal to ``5``
-* ``age`` is less than``80``
+* the number of ``siblings`` of a ``Person`` is less than ``5``
+* ``age`` is less than ``80``
 
 .. configuration-block::
 

reference/twig_reference.rst

@@ -130,12 +130,12 @@ set for the package and the URL path. More information in
 :ref:`templating-assets`. For asset versioning, see
 :ref:`reference-framework-assets-version`.
 
-assets_version
+asset_version
 ~~~~~~~~~~~~~~
 
 .. code-block:: twig
 
-    {{ assets_version(packageName = null) }}
+    {{ asset_version(packageName = null) }}
 
 ``packageName`` *(optional)*
     **type**: ``string`` | ``null`` **default**: ``null``

service_container/alias_private.rst

@@ -72,7 +72,7 @@ However, if a service has been marked as private, you can still alias it
 .. note::
 
     Services are by default public, but it's considered a good practice to mark
-    as much services private as possible.
+    as many services private as possible.
 
 Aliasing
 --------

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 app/cache app/logs
     $ sudo setfacl -dR -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs
+    $ sudo setfacl -R -m u:"$HTTPDUSER":rwX -m u:$(whoami):rwX app/cache app/logs
 
 .. 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.