Merge branch '6.4' into 7.0

* 6.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

Author: javiereguiluz

.doctor-rst.yaml

@@ -111,5 +111,6 @@ whitelist:
         - '.. versionadded:: 3.6' # MonologBundle
         - '.. versionadded:: 3.8' # MonologBundle
         - '.. versionadded:: 3.5' # Monolog
+        - '.. versionadded:: 3.0' # Doctrine ORM
         - '.. _`a feature to test applications using Mercure`: https://github.com/symfony/panther#creating-isolated-browsers-to-test-apps-using-mercure-or-websocket'
         - 'End to End Tests (E2E)'

reference/configuration/doctrine.rst

@@ -271,9 +271,13 @@ you can control. The following configuration options exist for a mapping:
 ........
 
 One of ``attribute`` (for PHP attributes; it's the default value),
-``xml``, ``yml``, ``php`` or ``staticphp``. This specifies which
+``xml``, ``php`` or ``staticphp``. This specifies which
 type of metadata type your mapping uses.
 
+.. versionadded:: 3.0
+
+    The ``yml`` mapping configuration is deprecated and was removed in Doctrine ORM 3.0.
+
 See `Doctrine Metadata Drivers`_ for more information about this option.
 
 ``dir``