Merge remote-tracking branch 'upstream/7.3' into 7.3

* upstream/7.3:
  Minor tweak
  Messenger: custom consumer name with systemd
  Minor tweaks
  [Mailer] Mention the SentMessageEvent and FailedMessageEvent in the debug section
  [Form] Update enum.rst: Adding `choice_label`
  Minor tweak
  [Messenger] Add a tip about using `make:messenger-middleware`

Author: OskarStark

mailer.rst

@@ -876,6 +876,8 @@ Catch that exception to recover from the error or to display some message::
         // error message or try to resend the message
     }
 
+.. _mailer-debugging-emails:
+
 Debugging Emails
 ----------------
 
@@ -885,6 +887,10 @@ provides access to the original message (``getOriginalMessage()``) and to some
 debug information (``getDebug()``) such as the HTTP calls done by the HTTP
 transports, which is useful to debug errors.
 
+You can also access :class:`Symfony\\Component\\Mailer\\SentMessage` by listening
+to the :ref:`SentMessageEvent <mailer-sent-message-event>` and retrieve ``getDebug()``
+by listening to the :ref:`FailedMessageEvent <mailer-failed-message-event>`.
+
 .. note::
 
     If your code used :class:`Symfony\\Component\\Mailer\\MailerInterface`, you
@@ -1753,24 +1759,26 @@ and their priorities:
 
     $ php bin/console debug:event-dispatcher "Symfony\Component\Mailer\Event\MessageEvent"
 
+.. _mailer-sent-message-event:
+
 SentMessageEvent
 ~~~~~~~~~~~~~~~~
 
 **Event Class**: :class:`Symfony\\Component\\Mailer\\Event\\SentMessageEvent`
 
 ``SentMessageEvent`` allows you to act on the :class:`Symfony\\Component\\\Mailer\\\SentMessage`
-class to access the original message (``getOriginalMessage()``) and some debugging
-information (``getDebug()``) such as the HTTP calls made by the HTTP transports,
-which is useful for debugging errors::
+class to access the original message (``getOriginalMessage()``) and some
+:ref:`debugging information <mailer-debugging-emails>` (``getDebug()``) such as
+the HTTP calls made by the HTTP transports, which is useful for debugging errors::
 
     use Symfony\Component\EventDispatcher\EventSubscriberInterface;
     use Symfony\Component\Mailer\Event\SentMessageEvent;
 
     public function onMessage(SentMessageEvent $event): void
     {
-        $message = $event->getMessage();
+        $message $event->getMessage();
 
-        // do something with the message
+        // do something with the message (e.g. get its id)
     }
 
 Execute this command to find out which listeners are registered for this event
@@ -1780,20 +1788,28 @@ and their priorities:
 
     $ php bin/console debug:event-dispatcher "Symfony\Component\Mailer\Event\SentMessageEvent"
 
+.. _mailer-failed-message-event:
+
 FailedMessageEvent
 ~~~~~~~~~~~~~~~~~~
 
 **Event Class**: :class:`Symfony\\Component\\Mailer\\Event\\FailedMessageEvent`
 
-``FailedMessageEvent`` allows acting on the initial message in case of a failure::
+``FailedMessageEvent`` allows acting on the initial message in case of a failure
+and some :ref:`debugging information <mailer-debugging-emails>` (``getDebug()``)
+such as the HTTP calls made by the HTTP transports, which is useful for debugging errors::
 
     use Symfony\Component\EventDispatcher\EventSubscriberInterface;
     use Symfony\Component\Mailer\Event\FailedMessageEvent;
+    use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 
     public function onMessage(FailedMessageEvent $event): void
     {
         // e.g you can get more information on this error when sending an email
-        $event->getError();
+        $error = $event->getError();
+        if ($error instanceof TransportExceptionInterface) {
+            $error->getDebug();
+        }
 
         // do something with the message
     }

messenger.rst

@@ -880,6 +880,8 @@ directory. For example, you can create a new ``messenger-worker.service`` file.
 
     [Service]
     ExecStart=php /path/to/your/app/bin/console messenger:consume async --time-limit=3600
+    # for Redis, set a custom consumer name for each instance
+    Environment="MESSENGER_CONSUMER_NAME=symfony-%n-%i"
     Restart=always
     RestartSec=30
 
@@ -2932,6 +2934,11 @@ and a different instance will be created per bus.
             $bus->middleware()->id('App\Middleware\AnotherMiddleware');
         };
 
+.. tip::
+
+    If you have installed the MakerBundle, you can use the ``make:messenger-middleware``
+    command to bootstrap the creation your own messenger middleware.
+
 .. _middleware-doctrine:
 
 Middleware for Doctrine

reference/forms/types/enum.rst

@@ -94,6 +94,22 @@ Inherited Options
 
 These options inherit from the :doc:`ChoiceType </reference/forms/types/choice>`:
 
+.. include:: /reference/forms/types/options/choice_attr.rst.inc
+
+.. include:: /reference/forms/types/options/choice_filter.rst.inc
+
+.. include:: /reference/forms/types/options/choice_label.rst.inc
+
+.. include:: /reference/forms/types/options/choice_loader.rst.inc
+
+.. include:: /reference/forms/types/options/choice_name.rst.inc
+
+.. include:: /reference/forms/types/options/choice_translation_domain_enabled.rst.inc
+
+.. include:: /reference/forms/types/options/choice_translation_parameters.rst.inc
+
+.. include:: /reference/forms/types/options/choice_value.rst.inc
+
 .. include:: /reference/forms/types/options/error_bubbling.rst.inc
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc