Merge branch '7.2' into 7.3

javiereguiluz · javiereguiluz · commit 86447819d075 · 2025-03-04T10:25:23.000+01:00
* 7.2:
  [Messenger] Fix some syntax issue
diff --git a/messenger.rst b/messenger.rst
@@ -543,18 +543,19 @@ command with the ``--all`` option:
 
     The ``--all`` option was introduced in Symfony 7.1.
 
-The ``--keepalive`` option can be used to prevent messages from being prematurely
-redelivered during long-running processing. It marks the message as "in progress"
-and prevents it from being redelivered until the worker finishes processing it:
+Messages that take a long time to process may be redelivered prematurely because
+some transports assume that an unacknowledged message is lost. To prevent this
+issue, use the ``--keepalive`` command option to specify an interval (in seconds;
+default value = ``5``) at which the message is marked as "in progress". This prevents
+the message from being redelivered until the worker completes processing it:
 
 .. code-block:: terminal
 
-    php bin/console messenger:consume --keepalive=5
+    $ php bin/console messenger:consume --keepalive
 
 .. note::
 
-    This option is only available for supported transports, which are
-    the Doctrine, Beanstalkd and AmazonSQS transports.
+    This option is only available for the following transports: Beanstalkd and AmazonSQS.
 
 .. versionadded:: 7.2
 
@@ -1785,10 +1786,6 @@ The transport has a number of options:
     The message time to run before it is put back in the ready queue - in
     seconds.
 
-.. versionadded:: 7.2
-
-    Keepalive support, using the ``--keepalive`` option, was added in Symfony 7.2.
-
 The Beanstalkd transport lets you set the priority of the messages being dispatched.
 Use the ``Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\BeanstalkdPriorityStamp``
 and pass a number to specify the priority (default = ``1024``; lower numbers mean higher priority)::
@@ -2138,10 +2135,6 @@ The transport has a number of options:
     FIFO queues don't support setting a delay per message, a value of ``delay: 0``
     is required in the retry strategy settings.
 
-.. versionadded:: 7.2
-
-    Keepalive support, using the `--keepalive` option, was added in Symfony 7.2.
-
 Serializing Messages
 ~~~~~~~~~~~~~~~~~~~~
 
