Skip to content

Commit 650277c

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Mutate some `cautions` to `dangers`
2 parents 1509f6f + a4b49e0 commit 650277c

File tree

15 files changed

+17
-17
lines changed

15 files changed

+17
-17
lines changed

components/http_foundation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ class, which can make this even easier::
849849
The ``JsonResponse`` class sets the ``Content-Type`` header to
850850
``application/json`` and encodes your data to JSON when needed.
851851

852-
.. caution::
852+
.. danger::
853853

854854
To avoid XSSI `JSON Hijacking`_, you should pass an associative array
855855
as the outermost array to ``JsonResponse`` and not an indexed array so

components/lock.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ instance, to clean up the ``/tmp`` directory or after a reboot of the machine
809809
when a directory uses ``tmpfs``. It's not an issue if the lock is released when
810810
the process ended, but it is in case of ``Lock`` reused between requests.
811811

812-
.. caution::
812+
.. danger::
813813

814814
Do not store locks on a volatile file system if they have to be reused in
815815
several requests.
@@ -842,7 +842,7 @@ When the Memcached service is shared and used for multiple usage, Locks could be
842842
removed by mistake. For instance some implementation of the PSR-6 ``clear()``
843843
method uses the Memcached's ``flush()`` method which purges and removes everything.
844844

845-
.. caution::
845+
.. danger::
846846

847847
The method ``flush()`` must not be called, or locks should be stored in a
848848
dedicated Memcached service away from Cache.
@@ -950,7 +950,7 @@ be lost without notifying the running processes.
950950
When the Redis service is shared and used for multiple usages, locks could be
951951
removed by mistake.
952952

953-
.. caution::
953+
.. danger::
954954

955955
The command ``FLUSHDB`` must not be called, or locks should be stored in a
956956
dedicated Redis service away from Cache.

components/process.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ are done doing other stuff::
247247
**synchronously** inside this event. Be aware that ``kernel.terminate``
248248
is called only if you use PHP-FPM.
249249

250-
.. caution::
250+
.. danger::
251251

252252
Beware also that if you do that, the said PHP-FPM process will not be
253253
available to serve any new request until the subprocess is finished. This

components/yaml.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ And parse them by using the ``PARSE_OBJECT`` flag::
239239
The YAML component uses PHP's ``serialize()`` method to generate a string
240240
representation of the object.
241241

242-
.. caution::
242+
.. danger::
243243

244244
Object serialization is specific to this implementation, other PHP YAML
245245
parsers will likely not recognize the ``php/object`` tag and non-PHP

configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ To do so, define a parameter with the same name as the env var using this syntax
732732
always exists, because its value will be ``null`` when the related env var
733733
is not defined.
734734

735-
.. caution::
735+
.. danger::
736736

737737
Beware that dumping the contents of the ``$_SERVER`` and ``$_ENV`` variables
738738
or outputting the ``phpinfo()`` contents will display the values of the

configuration/secrets.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ running:
4747
This will generate ``config/secrets/prod/prod.encrypt.public.php`` and
4848
``config/secrets/prod/prod.decrypt.private.php``.
4949

50-
.. caution::
50+
.. danger::
5151

5252
The ``prod.decrypt.private.php`` file is highly sensitive. Your team of developers
5353
and even Continuous Integration services don't need that key. If the

controller.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ and ``redirect()`` methods::
144144
return $this->redirect('http://symfony.com/doc');
145145
}
146146

147-
.. caution::
147+
.. danger::
148148

149149
The ``redirect()`` method does not check its destination in any way. If you
150150
redirect to a URL provided by end-users, your application may be open

deployment/proxies.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ so you can also pass your own value (e.g. ``0b00110``).
108108
# ...
109109
trusted_proxies: '%env(TRUSTED_PROXIES)%'
110110
111-
.. caution::
111+
.. danger::
112112

113113
The "trusted proxies" feature does not work as expected when using the
114114
`nginx realip module`_. Disable that module when serving Symfony applications.

http_cache/cache_invalidation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ Then, register the class as a service that :doc:`decorates </service_container/s
152152
;
153153
};
154154
155-
.. caution::
155+
.. danger::
156156

157157
You must protect the ``PURGE`` HTTP method somehow to avoid random people
158158
purging your cached data.

http_cache/ssi.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The SSI instructions are done via HTML comments:
2727
There are some other `available directives`_ but
2828
Symfony manages only the ``#include virtual`` one.
2929

30-
.. caution::
30+
.. danger::
3131

3232
Be careful with SSI, your website may fall victim to injections.
3333
Please read this `OWASP article`_ first!

profiler.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Profiler
44
The profiler is a powerful **development tool** that gives detailed information
55
about the execution of any request.
66

7-
.. caution::
7+
.. danger::
88

99
**Never** enable the profiler in production environments
1010
as it will lead to major security vulnerabilities in your project.

rate_limiter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Symfony uses these rate limiters in built-in features like :ref:`login throttlin
1111
which limits how many failed login attempts a user can make in a given period of
1212
time, but you can use them for your own features too.
1313

14-
.. caution::
14+
.. danger::
1515

1616
By definition, the Symfony rate limiters require Symfony to be booted
1717
in a PHP process. This makes them not useful to protect against `DoS attacks`_.

security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,7 +880,7 @@ The form can look like anything, but it usually follows some conventions:
880880
Actually, all of this can be configured under the ``form_login`` key. See
881881
:ref:`reference-security-firewall-form-login` for more details.
882882

883-
.. caution::
883+
.. danger::
884884

885885
This login form is currently not protected against CSRF attacks. Read
886886
:ref:`form_login-csrf` on how to protect your login form.

serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ custom normalizers and/or encoders can also be loaded by tagging them as
8383
:ref:`serializer.encoder <reference-dic-tags-serializer-encoder>`. It's also
8484
possible to set the priority of the tag in order to decide the matching order.
8585

86-
.. caution::
86+
.. danger::
8787

8888
Always make sure to load the ``DateTimeNormalizer`` when serializing the
8989
``DateTime`` or ``DateTimeImmutable`` classes to avoid excessive memory

session.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1679,7 +1679,7 @@ Then, register the ``SodiumMarshaller`` service using this key:
16791679
]);
16801680
};
16811681
1682-
.. caution::
1682+
.. danger::
16831683

16841684
This will encrypt the values of the cache items, but not the cache keys. Be
16851685
careful not to leak sensitive data in the keys.

0 commit comments

Comments
 (0)