Merge branch '8.5' into 9.6

Author: sebastianbergmann

.phive/phars.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpab" version="^1.29" installed="1.29.3" location="./tools/phpab" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.80" installed="3.82.1" location="./tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.80" installed="3.82.2" location="./tools/php-cs-fixer" copy="true"/>
   <phar name="psalm" version="^5.26" installed="5.26.1" location="./tools/psalm" copy="true"/>
   <phar name="humbug/php-scoper" version="^0.18" installed="0.18.17" location="./tools/php-scoper" copy="true"/>
   <phar name="composer" version="^2.8" installed="2.8.9" location="./tools/composer" copy="true"/>

phpunit.xml

@@ -2,10 +2,11 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="phpunit.xsd"
          bootstrap="tests/bootstrap.php"
+         cacheResultFile=".phpunit.cache/test-results"
+         beStrictAboutOutputDuringTests="true"
          convertDeprecationsToExceptions="true"
          colors="true"
          verbose="true"
-         cacheResultFile=".phpunit.cache/test-results"
          failOnRisky="true"
          failOnWarning="true">
     <testsuites>