Merge branch '6.0' into 6.1

javiereguiluz · javiereguiluz · commit dc15ca30199b · 2022-05-20T13:35:00.000+02:00
* 6.0:
  Tiny language fix in messenger.rst
  Added naming_strategy option to doctrine config reference
diff --git a/messenger.rst b/messenger.rst
@@ -1538,7 +1538,7 @@ The SQS transport DSN may looks like this:
 .. note::
 
     The transport will automatically create queues that are needed. This
-    can be disabled setting the ``auto_setup`` option to ``false``.
+    can be disabled by setting the ``auto_setup`` option to ``false``.
 
 .. tip::
 
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
@@ -191,6 +191,7 @@ that the ORM resolves to:
             metadata_cache_driver: array
             query_cache_driver: array
             result_cache_driver: array
+            naming_strategy: doctrine.orm.naming_strategy.default
 
 There are lots of other configuration options that you can use to overwrite
 certain classes, but those are for very advanced use-cases only.
@@ -216,6 +217,7 @@ can be placed directly under ``doctrine.orm`` config level.
             class_metadata_factory_name:  Doctrine\ORM\Mapping\ClassMetadataFactory
             default_repository_class:  Doctrine\ORM\EntityRepository
             auto_mapping: false
+            naming_strategy: doctrine.orm.naming_strategy.default
             hydrators:
                 # ...
             mappings:
