Merge branch '7.4' into 8.0

* 7.4:
  Tweaks
  [Testing] fix phpunit.dist.xml code example

Author: javiereguiluz

testing/end_to_end.rst

@@ -76,12 +76,16 @@ When using the extension in conjunction with the ``PANTHER_ERROR_SCREENSHOT_DIR`
 environment variable, tests using the Panther client that fail or error (after the
 client is created) will automatically get a screenshot taken to help debugging.
 
-To register the Panther extension, add the following lines to ``phpunit.xml.dist``:
+To register the Panther extension, add the following lines to ``phpunit.dist.xml``
+(in legacy PHPUnit versions older than 10, the file is named ``phpunit.xml.dist``):
 
 .. code-block:: xml
 
-    <!-- phpunit.xml.dist -->
+    <!-- phpunit.dist.xml -->
     <extensions>
+        <!-- use this with PHPUnit 10 or newer -->
+        <bootstrap class="Symfony\Component\Panther\ServerExtension"/>
+        <!-- use this with legacy PHPUnit versions older than 10 -->
         <extension class="Symfony\Component\Panther\ServerExtension"/>
     </extensions>