Merge branch '2.4'

book/installation.rst

@@ -212,6 +212,8 @@ to check your configuration:
 
 If there are any issues, correct them now before moving on.
 
+.. _book-installation-permissions:
+
 .. sidebar:: Setting up Permissions
 
     One common issue is that the ``app/cache`` and ``app/logs`` directories

components/expression_language/syntax.rst

@@ -176,7 +176,10 @@ Comparison Operators
     To test if a string does *not* match a regex, use the logical ``not``
     operator in combination with the ``matches`` operator::
 
-        $language->evaluate('not "foo" matches "/bar/"'); // returns true
+        $language->evaluate('not ("foo" matches "/bar/")'); // returns true
+
+    You must use parenthesis because the unary operator ``not`` has precedence
+    over the binary operator ``matches``.
 
 Examples::
 

cookbook/controller/service.rst

@@ -96,7 +96,7 @@ To refer to a controller that's defined as a service, use the single colon (:)
 notation. For example, to forward to the ``indexAction()`` method of the service
 defined above with the id ``acme.hello.controller``::
 
-    $this->forward('acme.hello.controller:indexAction');
+    $this->forward('acme.hello.controller:indexAction', array('name' => $name));
 
 .. note::
 

cookbook/testing/profiling.rst

@@ -51,7 +51,7 @@ finish. It's easy to achieve if you embed the token in the error message::
 
     $this->assertLessThan(
         30,
-        $profile->get('db')->getQueryCount(),
+        $profile->getCollector('db')->getQueryCount(),
         sprintf(
             'Checks that query count is less than 30 (token %s)',
             $profile->getToken()

reference/constraints/Valid.rst

@@ -9,6 +9,7 @@ object and all sub-objects associated with it.
 | Applies to     | :ref:`property or method <validation-property-target>`              |
 +----------------+---------------------------------------------------------------------+
 | Options        | - `traverse`_                                                       |
+|                | - `message`_                                                       |
 +----------------+---------------------------------------------------------------------+
 | Class          | :class:`Symfony\\Component\\Validator\\Constraints\\Type`           |
 +----------------+---------------------------------------------------------------------+
@@ -265,3 +266,10 @@ traverse
 If this constraint is applied to a property that holds an array of objects,
 then each object in that array will be validated only if this option is set
 to ``true``.
+
+message
+~~~~~~~
+
+**type**: ``string`` **default**: ``This value should be true.``
+
+This is the message that will be shown if the value is false.

reference/forms/types/form.rst

@@ -9,14 +9,18 @@ See :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\FormType`.
 The ``form`` type predefines a couple of options that are then available
 on all fields.
 
-.. include:: /reference/forms/types/options/compound.rst.inc
-
 .. include:: /reference/forms/types/options/data.rst.inc
 
 .. include:: /reference/forms/types/options/data_class.rst.inc
 
+.. include:: /reference/forms/types/options/action.rst.inc
+
+.. include:: /reference/forms/types/options/method.rst.inc
+
 .. include:: /reference/forms/types/options/empty_data.rst.inc
 
+.. include:: /reference/forms/types/options/compound.rst.inc
+
 .. _reference-form-option-required:
 
 .. include:: /reference/forms/types/options/required.rst.inc
@@ -68,7 +72,3 @@ on all fields.
 .. _reference-form-option-pattern:
 
 .. include:: /reference/forms/types/options/pattern.rst.inc
-
-.. include:: /reference/forms/types/options/action.rst.inc
-
-.. include:: /reference/forms/types/options/method.rst.inc

reference/forms/types/options/action.rst.inc

@@ -6,7 +6,7 @@ action
 
 **type**: ``string`` **default**: empty string
 
-This option specifies where to send the form's data on submission (usually an
+This option specifies where to send the form's data on submission (usually a
 URI). Its value is rendered as the ``action`` attribute of the ``form``
 element. An empty value is considered a same-document reference, i.e. the form
 will be submitted to the same URI that rendered the form.

reference/forms/types/options/method.rst.inc

@@ -26,6 +26,8 @@ used to decide whether to process the form submission in the
 
 .. note:
 
-    Only the PATCH method allows submitting partial data without that missing
-    fields are set to ``null`` in the underlying data (preserving default
-    values, if any).
+    The PATCH method allows submitting partial data. In other words, if the
+    submitted form data is missing certain fields, those will be ignored
+    and the default values (if any) will be used. With all other HTTP methods,
+    if the submitted form data is missing some fields, those fields are set
+    to ``null``.