Fix merge

Author: wouterj

messenger.rst

@@ -2152,6 +2152,12 @@ the consumer (e.g. render a template with links). This middleware stores the
 original request context (i.e. the host, the HTTP port, etc.) which is needed
 when building absolute URLs.
 
+Add the ``validation`` middleware if you need to validate the message
+object using the :doc:`Validator component <validator>` before handling it.
+If validation fails, a ``ValidationFailedException`` will be thrown. The
+:class:`Symfony\\Component\\Messenger\\Stamp\\ValidationStamp` can be used
+to configure the validation groups.
+
 .. configuration-block::
 
     .. code-block:: yaml
@@ -2163,6 +2169,7 @@ when building absolute URLs.
                     command_bus:
                         middleware:
                             - router_context
+                            - validation
 
     .. code-block:: xml
 
@@ -2180,6 +2187,7 @@ when building absolute URLs.
                 <framework:messenger>
                     <framework:bus name="command_bus">
                         <framework:middleware id="router_context"/>
+                        <framework:middleware id="validation"/>
                     </framework:bus>
                 </framework:messenger>
             </framework:config>
@@ -2195,70 +2203,9 @@ when building absolute URLs.
 
             $bus = $messenger->bus('command_bus');
             $bus->middleware()->id('router_context');
+            $bus->middleware()->id('validation');
         };
 
-
-Other Middlewares
-~~~~~~~~~~~~~~~~~
-
-.. versionadded:: 4.1
-
-    The ``validation`` middleware was introduced in Symfony 4.1.
-
-Add the ``validation`` middleware if you need to validate the message
-object using the :doc:`Validator component <validator>` before handling it.
-If validation fails, a ``ValidationFailedException`` will be thrown. The
-:class:`Symfony\\Component\\Messenger\\Stamp\\ValidationStamp` can be used
-to configure the validation groups.
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # config/packages/messenger.yaml
-        framework:
-            messenger:
-                buses:
-                    command_bus:
-                        middleware:
-                            - validation
-
-    .. code-block:: xml
-
-        <!-- config/packages/messenger.xml -->
-        <?xml version="1.0" encoding="UTF-8" ?>
-        <container xmlns="http://symfony.com/schema/dic/services"
-            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:framework="http://symfony.com/schema/dic/symfony"
-            xsi:schemaLocation="http://symfony.com/schema/dic/services
-                https://symfony.com/schema/dic/services/services-1.0.xsd
-                http://symfony.com/schema/dic/symfony
-                https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
-
-            <framework:config>
-                <framework:messenger>
-                    <framework:bus name="command_bus">
-                        <framework:middleware id="validation"/>
-                    </framework:bus>
-                </framework:messenger>
-            </framework:config>
-        </container>
-
-    .. code-block:: php
-
-        // config/packages/messenger.php
-        $container->loadFromExtension('framework', [
-            'messenger' => [
-                'buses' => [
-                    'command_bus' => [
-                        'middleware' => [
-                            'validation',
-                        ],
-                    ],
-                ],
-            ],
-        ]);
-
 Messenger Events
 ~~~~~~~~~~~~~~~~