Merge branch '6.4' into 7.0

* 6.4:
  [HttpClient] Explain how to mock `TransportExceptions` that occur before headers are received
  Update DOCtor-RST config
  Fix the version in which AsDoctrineListener was added

Author: javiereguiluz

.doctor-rst.yaml

@@ -99,6 +99,7 @@ whitelist:
         - 'The bin/console Command'
         - '.. _`LDAP injection`: http://projects.webappsec.org/w/page/13246947/LDAP%20Injection'
         - '.. versionadded:: 2.7.2' # Doctrine
+        - '.. versionadded:: 2.8.0' # Doctrine
         - '.. versionadded:: 1.9.0' # Encore
         - '.. versionadded:: 1.18' # Flex in setup/upgrade_minor.rst
         - '.. versionadded:: 1.0.0' # Encore

doctrine/events.rst

@@ -391,9 +391,9 @@ listener in the Symfony application by creating a new service for it and
             ;
         };
 
-.. versionadded:: 2.7.2
+.. versionadded:: 2.8.0
 
-    The `AsDoctrineListener`_ attribute was introduced in DoctrineBundle 2.7.2.
+    The `AsDoctrineListener`_ attribute was introduced in DoctrineBundle 2.8.0.
 
 .. tip::
 
@@ -404,4 +404,4 @@ listener in the Symfony application by creating a new service for it and
 .. _`lifecycle events`: https://www.doctrine-project.org/projects/doctrine-orm/en/current/reference/events.html#lifecycle-events
 .. _`official docs about Doctrine events`: https://www.doctrine-project.org/projects/doctrine-orm/en/current/reference/events.html
 .. _`DoctrineMongoDBBundle documentation`: https://symfony.com/doc/current/bundles/DoctrineMongoDBBundle/index.html
-.. _`AsDoctrineListener`: https://github.com/doctrine/DoctrineBundle/blob/2.10.x/Attribute/AsDoctrineListener.php
+.. _`AsDoctrineListener`: https://github.com/doctrine/DoctrineBundle/blob/2.12.x/src/Attribute/AsDoctrineListener.php

http_client.rst

@@ -2242,7 +2242,26 @@ when making HTTP requests you might face errors at transport level.
 
 That's why it's useful to test how your application behaves in case of a transport
 error. :class:`Symfony\\Component\\HttpClient\\Response\\MockResponse` allows
-you to do so, by yielding the exception from its body::
+you to do so in multiple ways.
+
+In order to test errors that occur before headers have been received,
+set the ``error`` option value when creating the ``MockResponse``.
+Transport errors of this kind occur, for example, when a host name
+cannot be resolved or the host was unreachable. The
+``TransportException`` will be thrown as soon as a method like
+``getStatusCode()`` or ``getHeaders()`` is called.
+
+In order to test errors that occur while a response is being streamed
+(that is, after the headers have already been received), provide the
+exception to ``MockResponse`` as part of the ``body``
+parameter. You can either use an exception directly, or yield the
+exception from a callback. For exceptions of this kind,
+``getStatusCode()`` may indicate a success (200), but accessing
+``getContent()`` fails.
+
+The following example code illustrates all three options.
+
+body::
 
     // ExternalArticleServiceTest.php
     use PHPUnit\Framework\TestCase;
@@ -2257,10 +2276,16 @@ you to do so, by yielding the exception from its body::
         {
             $requestData = ['title' => 'Testing with Symfony HTTP Client'];
             $httpClient = new MockHttpClient([
-                // You can create the exception directly in the body...
+                // Mock a transport level error at a time before
+                // headers have been received (e. g. host unreachable)
+                new MockResponse(info: ['error' => 'host unreachable']),
+
+                // Mock a response with headers indicating
+                // success, but a failure while retrieving the body by
+                // creating the exception directly in the body...
                 new MockResponse([new \RuntimeException('Error at transport level')]),
 
-                // ... or you can yield the exception from a callback
+                // ... or by yielding it from a callback.
                 new MockResponse((static function (): \Generator {
                     yield new TransportException('Error at transport level');
                 })()),