Merge branch '6.0' into 6.1

* 6.0:
  add caution to URL-encode special characters in Notifier DSNs
  [Form][NumberType] Fix constants
  Fix development testing examples

Author: javiereguiluz

controller/error_pages.rst

@@ -170,7 +170,7 @@ automatically when installing ``symfony/framework-bundle``):
             xsi:schemaLocation="http://symfony.com/schema/routing
                 https://symfony.com/schema/routing/routing-1.0.xsd">
 
-            <when env="prod">
+            <when env="dev">
                 <import resource="@FrameworkBundle/Resources/config/routing/errors.xml" prefix="/_error"/>
             </when>
         </routes>
@@ -181,7 +181,7 @@ automatically when installing ``symfony/framework-bundle``):
         use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
 
         return function (RoutingConfigurator $routes) {
-            if ('dev' === $container->env()) {
+            if ('dev' === $routes->env()) {
                 $routes->import('@FrameworkBundle/Resources/config/routing/errors.xml')
                     ->prefix('/_error')
                 ;

notifier.rst

@@ -47,6 +47,13 @@ The notifier component supports the following channels:
 SMS Channel
 ~~~~~~~~~~~
 
+.. caution::
+
+    If any of the DSN values contains any character considered special in a
+    URI (such as ``+``, ``@``, ``$``, ``#``, ``/``, ``:``, ``*``, ``!``), you must
+    encode them. See `RFC 3986`_ for the full list of reserved characters or use the
+    :phpfunction:`urlencode` function to encode them.
+
 The SMS channel uses :class:`Symfony\\Component\\Notifier\\Texter` classes
 to send SMS messages to mobile phones. This feature requires subscribing to
 a third-party service that sends SMS messages. Symfony provides integration
@@ -151,6 +158,13 @@ configure the ``texter_transports``:
 Chat Channel
 ~~~~~~~~~~~~
 
+.. caution::
+
+    If any of the DSN values contains any character considered special in a
+    URI (such as ``+``, ``@``, ``$``, ``#``, ``/``, ``:``, ``*``, ``!``), you must
+    encode them. See `RFC 3986`_ for the full list of reserved characters or use the
+    :phpfunction:`urlencode` function to encode them.
+
 The chat channel is used to send chat messages to users by using
 :class:`Symfony\\Component\\Notifier\\Chatter` classes. Symfony provides
 integration with these chat services:
@@ -292,6 +306,13 @@ notification emails:
 Push Channel
 ~~~~~~~~~~~~
 
+.. caution::
+
+    If any of the DSN values contains any character considered special in a
+    URI (such as ``+``, ``@``, ``$``, ``#``, ``/``, ``:``, ``*``, ``!``), you must
+    encode them. See `RFC 3986`_ for the full list of reserved characters or use the
+    :phpfunction:`urlencode` function to encode them.
+
 The push channel is used to send notifications to users by using
 :class:`Symfony\\Component\\Notifier\\Texter` classes. Symfony provides
 integration with these push services:
@@ -749,3 +770,5 @@ Learn more
     :glob:
 
     notifier/*
+
+.. _`RFC 3986`: https://www.ietf.org/rfc/rfc3986.txt

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

@@ -2,13 +2,13 @@ rounding_mode
 ~~~~~~~~~~~~~
 
 **type**: ``integer`` **default**: ``\NumberFormatter::ROUND_DOWN`` for ``IntegerType``
-and ``\NumberFormatter::ROUND_HALF_UP`` for ``MoneyType`` and ``NumberType``
+and ``\NumberFormatter::ROUND_HALFUP`` for ``MoneyType`` and ``NumberType``
 
 * IntegerType
 **default**: ``\NumberFormatter::ROUND_DOWN``
 
 * MoneyType and NumberType
-**default**: ``\NumberFormatter::ROUND_HALF_UP``
+**default**: ``\NumberFormatter::ROUND_HALFUP``
 
 
 If a submitted number needs to be rounded (based on the `scale`_ option), you