Skip to content

Commit 64c606e

Browse files
committed
Merge branch '5.1' into 5.x
* 5.1: Added the versionadded directive Update messenger.rst Add info() method sample
2 parents b8653eb + 0c6a782 commit 64c606e

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

components/options_resolver.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,9 @@ method::
811811
$resolver->define('host')
812812
->required()
813813
->default('smtp.example.org')
814-
->allowedTypes('string');
814+
->allowedTypes('string')
815+
->info('The IP address or hostname');
816+
815817
$resolver->define('transport')
816818
->required()
817819
->default('transport')
@@ -821,8 +823,7 @@ method::
821823

822824
.. versionadded:: 5.1
823825

824-
The :method:`Symfony\\Component\\OptionsResolver\\OptionsResolver::define` method
825-
was introduced in Symfony 5.1.
826+
The ``define()`` and ``info()`` methods were introduced in Symfony 5.1.
826827

827828
Performance Tweaks
828829
~~~~~~~~~~~~~~~~~~

messenger.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ On production, there are a few important things to think about:
466466
process control system like :ref:`Supervisor <messenger-supervisor>`.
467467

468468
**Don't Let Workers Run Forever**
469-
Some services (like Doctrine's EntityManager) will consume more memory
469+
Some services (like Doctrine's ``EntityManager``) will consume more memory
470470
over time. So, instead of allowing your worker to run forever, use a flag
471471
like ``messenger:consume --limit=10`` to tell your worker to only handle 10
472472
messages before exiting (then Supervisor will create a new process). There

0 commit comments

Comments
 (0)