Skip to content

Commit d122004

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: Add assets to the documentation add caution to URL-encode special characters in Notifier DSNs [Form][NumberType] Fix constants Fix development testing examples
2 parents ace2802 + e787633 commit d122004

File tree

4 files changed

+32
-5
lines changed

4 files changed

+32
-5
lines changed

bundles.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ to be adjusted if needed:
9797

9898
``src/``
9999
Contains all PHP classes related to the bundle logic (e.g. ``Controller/RandomController.php``).
100-
100+
101101
``config/``
102102
Houses configuration, including routing configuration (e.g. ``routing.yaml``).
103103

@@ -112,6 +112,10 @@ to be adjusted if needed:
112112
linked into the project ``public/`` directory via the ``assets:install`` console
113113
command.
114114

115+
``assets/``
116+
Contains JavaScript, CSS, images and other assets related to the bundle that
117+
are not in ``public/`` (e.g. stimulus controllers)
118+
115119
``tests/``
116120
Holds all tests for the bundle.
117121

controller/error_pages.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ automatically when installing ``symfony/framework-bundle``):
170170
xsi:schemaLocation="http://symfony.com/schema/routing
171171
https://symfony.com/schema/routing/routing-1.0.xsd">
172172
173-
<when env="prod">
173+
<when env="dev">
174174
<import resource="@FrameworkBundle/Resources/config/routing/errors.xml" prefix="/_error"/>
175175
</when>
176176
</routes>
@@ -181,7 +181,7 @@ automatically when installing ``symfony/framework-bundle``):
181181
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
182182
183183
return function (RoutingConfigurator $routes) {
184-
if ('dev' === $container->env()) {
184+
if ('dev' === $routes->env()) {
185185
$routes->import('@FrameworkBundle/Resources/config/routing/errors.xml')
186186
->prefix('/_error')
187187
;

notifier.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ The notifier component supports the following channels:
4747
SMS Channel
4848
~~~~~~~~~~~
4949

50+
.. caution::
51+
52+
If any of the DSN values contains any character considered special in a
53+
URI (such as ``+``, ``@``, ``$``, ``#``, ``/``, ``:``, ``*``, ``!``), you must
54+
encode them. See `RFC 3986`_ for the full list of reserved characters or use the
55+
:phpfunction:`urlencode` function to encode them.
56+
5057
The SMS channel uses :class:`Symfony\\Component\\Notifier\\Texter` classes
5158
to send SMS messages to mobile phones. This feature requires subscribing to
5259
a third-party service that sends SMS messages. Symfony provides integration
@@ -151,6 +158,13 @@ configure the ``texter_transports``:
151158
Chat Channel
152159
~~~~~~~~~~~~
153160

161+
.. caution::
162+
163+
If any of the DSN values contains any character considered special in a
164+
URI (such as ``+``, ``@``, ``$``, ``#``, ``/``, ``:``, ``*``, ``!``), you must
165+
encode them. See `RFC 3986`_ for the full list of reserved characters or use the
166+
:phpfunction:`urlencode` function to encode them.
167+
154168
The chat channel is used to send chat messages to users by using
155169
:class:`Symfony\\Component\\Notifier\\Chatter` classes. Symfony provides
156170
integration with these chat services:
@@ -292,6 +306,13 @@ notification emails:
292306
Push Channel
293307
~~~~~~~~~~~~
294308

309+
.. caution::
310+
311+
If any of the DSN values contains any character considered special in a
312+
URI (such as ``+``, ``@``, ``$``, ``#``, ``/``, ``:``, ``*``, ``!``), you must
313+
encode them. See `RFC 3986`_ for the full list of reserved characters or use the
314+
:phpfunction:`urlencode` function to encode them.
315+
295316
The push channel is used to send notifications to users by using
296317
:class:`Symfony\\Component\\Notifier\\Texter` classes. Symfony provides
297318
integration with these push services:
@@ -749,3 +770,5 @@ Learn more
749770
:glob:
750771

751772
notifier/*
773+
774+
.. _`RFC 3986`: https://www.ietf.org/rfc/rfc3986.txt

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ rounding_mode
22
~~~~~~~~~~~~~
33

44
**type**: ``integer`` **default**: ``\NumberFormatter::ROUND_DOWN`` for ``IntegerType``
5-
and ``\NumberFormatter::ROUND_HALF_UP`` for ``MoneyType`` and ``NumberType``
5+
and ``\NumberFormatter::ROUND_HALFUP`` for ``MoneyType`` and ``NumberType``
66

77
* IntegerType
88
**default**: ``\NumberFormatter::ROUND_DOWN``
99

1010
* MoneyType and NumberType
11-
**default**: ``\NumberFormatter::ROUND_HALF_UP``
11+
**default**: ``\NumberFormatter::ROUND_HALFUP``
1212

1313

1414
If a submitted number needs to be rounded (based on the `scale`_ option), you

0 commit comments

Comments
 (0)