Merge branch '8.5' into 9.6

Author: sebastianbergmann

.php-cs-fixer.dist.php

@@ -133,7 +133,7 @@
         'modernize_types_casting' => true,
         'multiline_comment_opening_closing' => true,
         'multiline_whitespace_before_semicolons' => true,
-        'native_constant_invocation' => false,
+        'native_constant_invocation' => true,
         'native_function_casing' => false,
         'native_function_invocation' => [
             'include' => [

src/Util/Log/TeamCity.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Util\Log;
 
+use const PHP_EOL;
 use function class_exists;
 use function count;
 use function explode;

src/Util/Xml/ValidationResult.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Util\Xml;
 
+use const PHP_EOL;
 use function sprintf;
 use function trim;