Merge branch '8.5' into 9.6

Author: sebastianbergmann

src/Framework/TestResult.php

@@ -955,7 +955,7 @@ function_exists('xdebug_start_function_monitor');
                 $test,
                 new OutputError(
                     sprintf(
-                        'This test printed output: %s',
+                        'Test code or tested code printed unexpected output: %s',
                         $test->getActualOutput(),
                     ),
                 ),