Skip to content

Commit ba67490

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: Fix typo in choice_translation_parameters doc Fix doc of cache prefix and namespace
2 parents ca7fe83 + 54aacc7 commit ba67490

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

cache.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ You can also create more customized pools:
305305
Each pool manages a set of independent cache keys: keys from different pools
306306
*never* collide, even if they share the same backend. This is achieved by prefixing
307307
keys with a namespace that's generated by hashing the name of the pool, the name
308-
of the compiled container class and a :ref:`configurable seed <reference-cache-prefix-seed>`
309-
that defaults to the project directory.
308+
of the cache adapter class and a :ref:`configurable seed <reference-cache-prefix-seed>`
309+
that defaults to the project directory and compiled container class.
310310

311311
Each custom pool becomes a service whose service ID is the name of the pool
312312
(e.g. ``custom_thing.cache``). An autowiring alias is also created for each pool

reference/configuration/framework.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -2713,7 +2713,7 @@ email_validation_mode
27132713

27142714
**type**: ``string`` **default**: ``loose``
27152715

2716-
Sets the default value for
2716+
Sets the default value for
27172717
:doc:`/reference/constraints/Email` validator. The possible values are:
27182718

27192719
* ``loose``, it uses a simple regular expression to validate the address (it
@@ -3230,9 +3230,9 @@ The cache clearer used to clear your PSR-6 cache.
32303230
prefix_seed
32313231
...........
32323232

3233-
**type**: ``string`` **default**: ``null``
3233+
**type**: ``string`` **default**: ``_%kernel.project_dir%.%kernel.container_class%``
32343234

3235-
If defined, this value is used as part of the "namespace" generated for the
3235+
This value is used as part of the "namespace" generated for the
32363236
cache item keys. A common practice is to use the unique name of the application
32373237
(e.g. ``symfony.com``) because that prevents naming collisions when deploying
32383238
multiple applications into the same path (on different servers) that share the

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Given this translation message:
5050
You can specify the placeholder values as follows::
5151

5252
$builder->add('id', null, [
53-
'choice' => [
53+
'choices' => [
5454
'form.order.yes' => true,
5555
'form.order.no' => false,
5656
],
@@ -66,7 +66,7 @@ You can specify the placeholder values as follows::
6666
If an array, the keys of the ``choices`` array must be used as keys::
6767

6868
$builder->add('id', null, [
69-
'choice' => [
69+
'choices' => [
7070
'form.order.yes' => true,
7171
'form.order.no' => false,
7272
],

0 commit comments

Comments
 (0)