Merge branch '5.4' into 6.0

* 5.4:
  [PHPUnitBridge] [PHPUnit Bridge] Remove the table that lists PHPUnit versions
  Add functional test chapter to mailer
  Minor tweak
  added example for limit consuming to specific queue / queues

Author: javiereguiluz

components/phpunit_bridge.rst

@@ -881,18 +881,6 @@ configured by the ``SYMFONY_PHPUNIT_DIR`` env var, or in the same directory as
 the ``simple-phpunit`` if it is not provided. It's also possible to set this
 env var in the ``phpunit.xml.dist`` file.
 
-By default, these are the PHPUnit versions used depending on the installed PHP versions:
-
-=====================  ===============================
-Installed PHP version  PHPUnit version used by default
-=====================  ===============================
-PHP <= 5.5             PHPUnit 4.8
-PHP 5.6                PHPUnit 5.7
-PHP 7.0                PHPUnit 6.5
-PHP 7.1                PHPUnit 7.5
-PHP >= 7.2             PHPUnit 8.3
-=====================  ===============================
-
 If you have installed the bridge through Composer, you can run it by calling e.g.:
 
 .. code-block:: terminal
@@ -901,7 +889,7 @@ If you have installed the bridge through Composer, you can run it by calling e.g
 
 .. tip::
 
-    It's possible to change the base version of PHPUnit by setting the
+    It's possible to change the PHPUnit version by setting the
     ``SYMFONY_PHPUNIT_VERSION`` env var in the ``phpunit.xml.dist`` file (e.g.
     ``<server name="SYMFONY_PHPUNIT_VERSION" value="5.5"/>``). This is the
     preferred method as it can be committed to your version control repository.

mailer.rst

@@ -1362,6 +1362,37 @@ a specific address, instead of the *real* address:
             ;
         };
 
+Write a Functional Test
+~~~~~~~~~~~~~~~~~~~~~~~
+
+To functionally test that an email was sent, and even assert the email content or headers,
+you can use the built in assertions::
+
+    // tests/Controller/MailControllerTest.php
+    namespace App\Tests\Controller;
+
+    use Symfony\Bundle\FrameworkBundle\Test\MailerAssertionsTrait;
+    use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+    class MailControllerTest extends WebTestCase
+    {
+        use MailerAssertionsTrait;
+
+        public function testMailIsSentAndContentIsOk()
+        {
+            $client = $this->createClient();
+            $client->request('GET', '/mail/send');
+            $this->assertResponseIsSuccessful();
+
+            $this->assertEmailCount(1);
+
+            $email = $this->getMailerMessage();
+
+            $this->assertEmailHtmlBodyContains($email, 'Welcome');
+            $this->assertEmailTextBodyContains($email, 'Welcome');
+        }
+    }
+
 .. _`high availability`: https://en.wikipedia.org/wiki/High_availability
 .. _`load balancing`: https://en.wikipedia.org/wiki/Load_balancing_(computing)
 .. _`download the foundation-emails.css file`: https://github.com/foundation/foundation-emails/blob/develop/dist/foundation-emails.css

messenger.rst

@@ -606,12 +606,15 @@ transport is always bound to an exchange. By default, the worker consumes from a
 queues attached to the exchange of the specified transport. However, there are use
 cases to want a worker to only consume from specific queues.
 
-You can limit the worker to only process messages from specific queues:
+You can limit the worker to only process messages from specific queue(s):
 
 .. code-block:: terminal
 
     $ php bin/console messenger:consume my_transport --queues=fasttrack
 
+    # you can pass the --queues option more than once to process multiple queues
+    $ php bin/console messenger:consume my_transport --queues=fasttrack1 --queues=fasttrack2
+
 To allow using the ``queues`` option, the receiver must implement the
 :class:`Symfony\\Component\\Messenger\\Transport\\Receiver\\QueueReceiverInterface`.