Merge branch '5.1' into 5.x

* 5.1:
  Tweaked the middleware example in the Messenger component

Author: wouterj

messenger.rst

@@ -1737,12 +1737,15 @@ middleware and *only* include your own:
             messenger:
                 buses:
                     messenger.bus.default:
+                        # disable the default middleware
+                        default_middleware: false
+
+                        # and/or add your own
                         middleware:
                             # service ids that implement Symfony\Component\Messenger\Middleware\MiddlewareInterface
                             - 'App\Middleware\MyMiddleware'
                             - 'App\Middleware\AnotherMiddleware'
 
-                        #default_middleware: false
 
     .. code-block:: xml
 
@@ -1758,9 +1761,12 @@ middleware and *only* include your own:
 
             <framework:config>
                 <framework:messenger>
+                    <!-- default-middleware: disable the default middleware -->
+                    <framework:bus name="messenger.bus.default" default-middleware="false"/>
+
+                    <!-- and/or add your own -->
                     <framework:middleware id="App\Middleware\MyMiddleware"/>
                     <framework:middleware id="App\Middleware\AnotherMiddleware"/>
-                    <framework:bus name="messenger.bus.default" default-middleware="false"/>
                 </framework:messenger>
             </framework:config>
         </container>
@@ -1772,11 +1778,14 @@ middleware and *only* include your own:
             'messenger' => [
                 'buses' => [
                     'messenger.bus.default' => [
+                        // disable the default middleware
+                        'default_middleware' => false,
+
+                        // and/or add your own
                         'middleware' => [
                             'App\Middleware\MyMiddleware',
                             'App\Middleware\AnotherMiddleware',
                         ],
-                        'default_middleware' => false,
                     ],
                 ],
             ],