Skip to content

Commit 97f905e

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: Minor tweak issues/20050 Remove Doctrine mappings YML from documentation try to fix CI Update reference/configuration/doctrine.rst issues/20050 Remove Doctrine mappings YML from documentation #20050 Signed-off-by: Javier Eguiluz <javier.eguiluz@gmail.com>
2 parents f4b7d13 + 7a0e908 commit 97f905e

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.doctor-rst.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,6 @@ whitelist:
111111
- '.. versionadded:: 3.6' # MonologBundle
112112
- '.. versionadded:: 3.8' # MonologBundle
113113
- '.. versionadded:: 3.5' # Monolog
114+
- '.. versionadded:: 3.0' # Doctrine ORM
114115
- '.. _`a feature to test applications using Mercure`: https://github.com/symfony/panther#creating-isolated-browsers-to-test-apps-using-mercure-or-websocket'
115116
- 'End to End Tests (E2E)'

reference/configuration/doctrine.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,13 @@ you can control. The following configuration options exist for a mapping:
271271
........
272272

273273
One of ``annotation`` (for PHP annotations; it's the default value),
274-
``attribute`` (for PHP attributes), ``xml``, ``yml``, ``php`` or
274+
``attribute`` (for PHP attributes), ``xml``, ``php`` or
275275
``staticphp``. This specifies which type of metadata type your mapping uses.
276276

277+
.. versionadded:: 3.0
278+
279+
The ``yml`` mapping configuration is deprecated and was removed in Doctrine ORM 3.0.
280+
277281
.. deprecated:: 6.4
278282

279283
Annotations are deprecated since Symfony 6.4, use attributes instead.

0 commit comments

Comments
 (0)