10000 Merge branch '3.4' into 4.0 · symfony/symfony-docs@0e22aff · GitHub
[go: up one dir, main page]
Skip to content

Commit 0e22aff

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '3.4' into 4.0
* 3.4: Fix a "duplicated reference" issue server_version should always be a string Document missing property_info node in framework configuration make the care team list actually in alphabetic order Add missing colon to reserved chars
2 parents c4e8e83 + 5471717 commit 0e22aff

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

‎components/cache/cache_items.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The **key** of a cache item is a plain string which acts as its
1717
identifier, so it must be unique for each cache pool. You can freely choose the
1818
keys, but they should only contain letters (A-Z, a-z), numbers (0-9) and the
1919
``_`` and ``.`` symbols. Other common symbols (such as ``{``, ``}``, ``(``,
20-
``)``, ``/``, ``\`` and ``@``) are reserved by the PSR-6 standard for future
20+
``)``, ``/``, ``\``, ``@`` and ``:``) are reserved by the PSR-6 standard for future
2121
uses.
2222

2323
The **value** of a cache item can be any data represented by a type which is

‎contributing/code_of_conduct/care_team.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ also contact all of them at once by emailing **coc@symfony.com**:
2727
* *Twitter*: `@EmilieLorenzo <https://twitter.com/EmilieLorenzo>`_
2828
* *SensioConnect*: `emilielorenzo <https://connect.sensiolabs.com/profile/emilielorenzo>`_
2929

30-
* **Tobias Nyholm**
31-
32-
* *E-mail*: tobias.nyholm [at] gmail.com
33-
* *Twitter*: `@tobiasnyholm <https://twitter.com/tobiasnyholm>`_
34-
* *SensioConnect*: `tobias <https://connect.sensiolabs.com/profile/tobias>`_
35-
3630
* **Michelle Sanver**
3731

3832
* *E-mail*: hello [at] michellesanver.com
3933
* *Twitter*: `@michellesanver <https://twitter.com/michellesanver>`_
4034
* *SensioConnect*: `michellesanver <https://connect.sensiolabs.com/profile/michellesanver>`_
4135

36+
* **Tobias Nyholm**
37+
38+
* *E-mail*: tobias.nyholm [at] gmail.com
39+
* *Twitter*: `@tobiasnyholm <https://twitter.com/tobiasnyholm>`_
40+
* *SensioConnect*: `tobias <https://connect.sensiolabs.com/profile/tobias>`_
41+
4242
About the CARE Team
4343
-------------------
4444

‎reference/configuration/doctrine.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,13 @@ If you want to configure multiple connections in YAML, put them under the
142142
user: root
143143
password: null
144144
host: localhost
145-
server_version: 5.6
145+
server_version: '5.6'
146146
customer:
147147
dbname: customer
148148
user: root
149149
password: null
150150
host: localhost
151-
server_version: 5.7
151+
server_version: '5.7'
152152
153153
The ``database_connection`` service always refers to the *default* connection,
154154
which is the first one defined or the one configured via the

‎reference/configuration/framework.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ Configuration
105105
* `magic_call`_
106106
* `throw_exception_on_invalid_index`_
107107

108+
* `property_info`_
109+
110+
* :ref:`enabled <reference-property-info-enabled>`
111+
108112
* `request`_:
109113

110114
* `formats`_
@@ -1573,6 +1577,16 @@ throw_exception_on_invalid_index
15731577
When enabled, the ``property_accessor`` service throws an exception when you
15741578
try to access an invalid index of an array.
15751579

1580+
property_info
1581+
~~~~~~~~~~~~~
1582+
1583+
.. _reference-property-info-enabled:
1584+
1585+
enabled
1586+
.......
1587+
1588+
**type**: ``boolean`` **default**: ``false``
1589+
15761590
validation
15771591
~~~~~~~~~~
15781592

0 commit comments

Comments
 (0)
0