Skip to content

Commit 84ead23

Browse files
committed
Merge remote-tracking branch 'origin/6.4' into 7.1
* origin/6.4: Replaced caution blocks with warning
2 parents ed9a5a7 + fdd5743 commit 84ead23

File tree

141 files changed

+246
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

141 files changed

+246
-244
lines changed

.doctor-rst.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ rules:
2323
forbidden_directives:
2424
directives:
2525
- '.. index::'
26+
- '.. caution::'
2627
indention: ~
2728
lowercase_as_in_use_statements: ~
2829
max_blank_lines:

bundles.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The Bundle System
44
=================
55

6-
.. caution::
6+
.. warning::
77

88
In Symfony versions prior to 4.0, it was recommended to organize your own
99
application code using bundles. This is :ref:`no longer recommended <best-practice-no-application-bundles>` and bundles
@@ -58,7 +58,7 @@ Start by creating a new class called ``AcmeBlogBundle``::
5858
{
5959
}
6060

61-
.. caution::
61+
.. warning::
6262

6363
If your bundle must be compatible with previous Symfony versions you have to
6464
extend from the :class:`Symfony\\Component\\HttpKernel\\Bundle\\Bundle` instead.
@@ -118,7 +118,7 @@ to be adjusted if needed:
118118

119119
.. _bundles-legacy-directory-structure:
120120

121-
.. caution::
121+
.. warning::
122122

123123
The recommended bundle structure was changed in Symfony 5, read the
124124
`Symfony 4.4 bundle documentation`_ for information about the old

bundles/best_practices.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ with Symfony Flex to install a specific Symfony version:
246246
# recommended to have a better output and faster download time)
247247
composer update --prefer-dist --no-progress
248248
249-
.. caution::
249+
.. warning::
250250

251251
If you want to cache your Composer dependencies, **do not** cache the
252252
``vendor/`` directory as this has side-effects. Instead cache

bundles/extension.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ Patterns are transformed into the actual class namespaces using the classmap
200200
generated by Composer. Therefore, before using these patterns, you must generate
201201
the full classmap executing the ``dump-autoload`` command of Composer.
202202

203-
.. caution::
203+
.. warning::
204204

205205
This technique can't be used when the classes to compile use the ``__DIR__``
206206
or ``__FILE__`` constants, because their values will change when loading

bundles/override.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ For example, to override the ``templates/registration/confirmed.html.twig``
1919
template from the AcmeUserBundle, create this template:
2020
``<your-project>/templates/bundles/AcmeUserBundle/registration/confirmed.html.twig``
2121

22-
.. caution::
22+
.. warning::
2323

2424
If you add a template in a new location, you *may* need to clear your
2525
cache (``php bin/console cache:clear``), even if you are in debug mode.

cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ Then, register the ``SodiumMarshaller`` service using this key:
829829
//->addArgument(['env(base64:CACHE_DECRYPTION_KEY)', 'env(base64:OLD_CACHE_DECRYPTION_KEY)'])
830830
->addArgument(new Reference('.inner'));
831831
832-
.. caution::
832+
.. danger::
833833

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

components/cache/adapters/apcu_adapter.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This adapter is a high-performance, shared memory cache. It can *significantly*
55
increase an application's performance, as its cache contents are stored in shared
66
memory, a component appreciably faster than many others, such as the filesystem.
77

8-
.. caution::
8+
.. warning::
99

1010
**Requirement:** The `APCu extension`_ must be installed and active to use
1111
this adapter.
@@ -30,7 +30,7 @@ and cache items version string as constructor arguments::
3030
$version = null
3131
);
3232

33-
.. caution::
33+
.. warning::
3434

3535
Use of this adapter is discouraged in write/delete heavy workloads, as these
3636
operations cause memory fragmentation that results in significantly degraded performance.

components/cache/adapters/couchbasebucket_adapter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ shared memory; you can store contents independent of your PHP environment.
1414
The ability to utilize a cluster of servers to provide redundancy and/or fail-over
1515
is also available.
1616

17-
.. caution::
17+
.. warning::
1818

1919
**Requirements:** The `Couchbase PHP extension`_ as well as a `Couchbase server`_
2020
must be installed, active, and running to use this adapter. Version ``2.6`` or

components/cache/adapters/couchbasecollection_adapter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ shared memory; you can store contents independent of your PHP environment.
88
The ability to utilize a cluster of servers to provide redundancy and/or fail-over
99
is also available.
1010

11-
.. caution::
11+
.. warning::
1212

1313
**Requirements:** The `Couchbase PHP extension`_ as well as a `Couchbase server`_
1414
must be installed, active, and running to use this adapter. Version ``3.0`` or

components/cache/adapters/filesystem_adapter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ and cache root path as constructor parameters::
3333
$directory = null
3434
);
3535

36-
.. caution::
36+
.. warning::
3737

3838
The overhead of filesystem IO often makes this adapter one of the *slower*
3939
choices. If throughput is paramount, the in-memory adapters

0 commit comments

Comments
 (0)