Merge branch '3.4' into 4.1

* 3.4:
  Added documentation for validator message variables in File constraints
  Revert a change related to flash messages and sessions
  Added explanation how non-scalar or non-unique choice values are handled

Author: javiereguiluz

reference/constraints/File.rst

@@ -212,6 +212,20 @@ maxSizeMessage
 
 The message displayed if the file is larger than the `maxSize`_ option.
 
+You can use the following parameters in this message:
+
++------------------+------------------------------------------------+
+| Parameter        | Description                                    |
++==================+================================================+
+| ``{{ size }}``   | File size of the given file                    |
++------------------+------------------------------------------------+
+| ``{{ limit }}``  | Maximum file size allowed                      |
++------------------+------------------------------------------------+
+| ``{{ suffix }}`` | Suffix for the used file size unit (see above) |
++------------------+------------------------------------------------+
+| ``{{ file }}``   | Absolute file path                             |
++------------------+------------------------------------------------+
+
 mimeTypesMessage
 ~~~~~~~~~~~~~~~~
 
@@ -220,6 +234,18 @@ mimeTypesMessage
 The message displayed if the mime type of the file is not a valid mime type
 per the `mimeTypes`_ option.
 
+You can use the following parameters in this message:
+
++-----------------+----------------------------------------+
+| Parameter       | Description                            |
++=================+========================================+
+| ``{{ type }}``  | The MIME type of the given file        |
++-----------------+----------------------------------------+
+| ``{{ types }}`` | The list of allowed MIME types         |
++-----------------+----------------------------------------+
+| ``{{ file }}``  | Absolute file path                     |
++-----------------+----------------------------------------+
+
 disallowEmptyMessage
 ~~~~~~~~~~~~~~~~~~~~
 
@@ -228,6 +254,14 @@ disallowEmptyMessage
 This constraint checks if the uploaded file is empty (i.e. 0 bytes). If it is,
 this message is displayed.
 
+You can use the following parameters in this message:
+
++----------------+--------------------+
+| Parameter      | Description        |
++================+====================+
+| ``{{ file }}`` | Absolute file path |
++----------------+--------------------+
+
 notFoundMessage
 ~~~~~~~~~~~~~~~
 
@@ -237,6 +271,14 @@ The message displayed if no file can be found at the given path. This error
 is only likely if the underlying value is a string path, as a ``File`` object
 cannot be constructed with an invalid file path.
 
+You can use the following parameters in this message:
+
++----------------+--------------------+
+| Parameter      | Description        |
++================+====================+
+| ``{{ file }}`` | Absolute file path |
++----------------+--------------------+
+
 notReadableMessage
 ~~~~~~~~~~~~~~~~~~
 
@@ -245,6 +287,14 @@ notReadableMessage
 The message displayed if the file exists, but the PHP ``is_readable()`` function
 fails when passed the path to the file.
 
+You can use the following parameters in this message:
+
++----------------+--------------------+
+| Parameter      | Description        |
++================+====================+
+| ``{{ file }}`` | Absolute file path |
++----------------+--------------------+
+
 uploadIniSizeErrorMessage
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -253,6 +303,16 @@ uploadIniSizeErrorMessage
 The message that is displayed if the uploaded file is larger than the ``upload_max_filesize``
 ``php.ini`` setting.
 
+You can use the following parameters in this message:
+
++------------------+------------------------------------------------+
+| Parameter        | Description                                    |
++==================+================================================+
+| ``{{ limit }}``  | Maximum file size allowed                      |
++------------------+------------------------------------------------+
+| ``{{ suffix }}`` | Suffix for the used file size unit (see above) |
++------------------+------------------------------------------------+
+
 uploadFormSizeErrorMessage
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -261,14 +321,65 @@ uploadFormSizeErrorMessage
 The message that is displayed if the uploaded file is larger than allowed
 by the HTML file input field.
 
+This message has no parameters.
+
+uploadPartialErrorMessage
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**type**: ``string`` **default**: ``The file was only partially uploaded.``
+
+The message that is displayed if the uploaded file is only partially uploaded.
+
+This message has no parameters.
+
+uploadNoFileErrorMessage
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+**type**: ``string`` **default**: ``No file was uploaded.``
+
+The message that is displayed if no file was uploaded.
+
+This message has no parameters.
+
+uploadNoTmpDirErrorMessage
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**type**: ``string`` **default**: ``No temporary folder was configured in php.ini.``
+
+The message that is displayed if the php.ini setting ``upload_tmp_dir`` is
+missing.
+
+This message has no parameters.
+
+uploadCantWriteErrorMessage
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**type**: ``string`` **default**: ``Cannot write temporary file to disk.``
+
+The message that is displayed if the uploaded file can't be stored in the
+temporary folder.
+
+This message has no parameters.
+
+uploadExtensionErrorMessage
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+**type**: ``string`` **default**: ``A PHP extension caused the upload to fail.``
+
+The message that is displayed if a PHP extension caused the file upload to
+fail.
+
+This message has no parameters.
+
 uploadErrorMessage
 ~~~~~~~~~~~~~~~~~~
 
 **type**: ``string`` **default**: ``The file could not be uploaded.``
 
 The message that is displayed if the uploaded file could not be uploaded
-for some unknown reason, such as the file upload failed or it couldn't be
-written to disk.
+for some unknown reason.
+
+This message has no parameters.
 
 .. include:: /reference/constraints/_payload-option.rst.inc
 

reference/forms/types/choice.rst

@@ -172,6 +172,11 @@ is the item's label and the array value is the item's value::
         'choices' => array('In Stock' => true, 'Out of Stock' => false),
     ));
 
+If there are choice values that are not scalar or the stringified
+representation is not unique Symfony will use incrementing integers
+as values. When the form gets submitted the correct values with the
+correct types will be assigned to the model.
+
 .. include:: /reference/forms/types/options/choice_attr.rst.inc
 
 .. _reference-form-choice-label:

session/avoid_session_start.rst

@@ -29,7 +29,7 @@ access the flash messages:
 
 .. code-block:: html+twig
 
-    {% if app.request.method == 'POST' %}
+    {% if app.request.hasPreviousSession %}
         {% for message in app.flashes('notice') %}
             <div class="flash-notice">
                 {{ message }}