Skip to content

Commit a750ec5

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: Mutate some `cautions` to `dangers`
2 parents 20dca7d + 564a3ac commit a750ec5

File tree

16 files changed

+18
-18
lines changed

16 files changed

+18
-18
lines changed

components/http_foundation.rst

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

844-
.. caution::
844+
.. danger::
845845

846846
To avoid XSSI `JSON Hijacking`_, you should pass an associative array
847847
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
@@ -824,7 +824,7 @@ instance, to clean up the ``/tmp`` directory or after a reboot of the machine
824824
when a directory uses ``tmpfs``. It's not an issue if the lock is released when
825825
the process ended, but it is in case of ``Lock`` reused between requests.
826826

827-
.. caution::
827+
.. danger::
828828

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

860-
.. caution::
860+
.. danger::
861861

862862
The method ``flush()`` must not be called, or locks should be stored in a
863863
dedicated Memcached service away from Cache.
@@ -965,7 +965,7 @@ be lost without notifying the running processes.
965965
When the Redis service is shared and used for multiple usages, locks could be
966966
removed by mistake.
967967

968-
.. caution::
968+
.. danger::
969969

970970
The command ``FLUSHDB`` must not be called, or locks should be stored in a
971971
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
@@ -748,7 +748,7 @@ To do so, define a parameter with the same name as the env var using this syntax
748748
always exists, because its value will be ``null`` when the related env var
749749
is not defined.
750750

751-
.. caution::
751+
.. danger::
752752

753753
Beware that dumping the contents of the ``$_SERVER`` and ``$_ENV`` variables
754754
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!

0 commit comments

Comments
 (0)