Merge branch '8.5' into 9.6

Author: sebastianbergmann

tests/end-to-end/generic/phar-extension-suppressed.phpt

@@ -15,4 +15,4 @@ $_SERVER['argv'][] = '--no-extensions';
 require_once __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
-Fatal error: Trait %sPHPUnit\ExampleExtension\TestCaseTrait%s not found in %A
+Fatal error:%sTrait %sPHPUnit\ExampleExtension\TestCaseTrait%s not found in %A