Merge branch '9.6' into 10.5

Author: sebastianbergmann

.php-cs-fixer.dist.php

@@ -141,7 +141,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/Event/Dispatcher/DirectDispatcher.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Event;
 
+use const PHP_EOL;
 use function array_key_exists;
 use function dirname;
 use function sprintf;

src/Event/Events/Test/HookMethod/BeforeFirstTestMethodErrored.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Event\Test;
 
+use const PHP_EOL;
 use function sprintf;
 use PHPUnit\Event\Code;
 use PHPUnit\Event\Code\Throwable;

src/Event/Events/Test/PrintedUnexpectedOutput.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Event\Test;
 
+use const PHP_EOL;
 use function sprintf;
 use PHPUnit\Event\Event;
 use PHPUnit\Event\Telemetry;

src/Framework/Constraint/String/IsJson.php

@@ -9,6 +9,12 @@
  */
 namespace PHPUnit\Framework\Constraint;
 
+use const JSON_ERROR_CTRL_CHAR;
+use const JSON_ERROR_DEPTH;
+use const JSON_ERROR_NONE;
+use const JSON_ERROR_STATE_MISMATCH;
+use const JSON_ERROR_SYNTAX;
+use const JSON_ERROR_UTF8;
 use function is_string;
 use function json_decode;
 use function json_last_error;

src/Framework/Constraint/String/StringMatchesFormatDescription.php

@@ -10,6 +10,7 @@
 namespace PHPUnit\Framework\Constraint;
 
 use const DIRECTORY_SEPARATOR;
+use const PHP_EOL;
 use function explode;
 use function implode;
 use function preg_match;

src/Logging/EventLogger.php

@@ -12,6 +12,7 @@
 use const FILE_APPEND;
 use const LOCK_EX;
 use const PHP_EOL;
+use const PHP_OS_FAMILY;
 use function file_put_contents;
 use function implode;
 use function preg_split;

src/Logging/JUnit/JunitXmlLogger.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Logging\JUnit;
 
+use const PHP_EOL;
 use function assert;
 use function basename;
 use function is_int;

src/Metadata/Api/DataProvider.php

@@ -9,6 +9,8 @@
  */
 namespace PHPUnit\Metadata\Api;
 
+use const JSON_ERROR_NONE;
+use const PREG_OFFSET_CAPTURE;
 use function array_key_exists;
 use function assert;
 use function explode;

src/Runner/Baseline/Issue.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Runner\Baseline;
 
+use const FILE_IGNORE_NEW_LINES;
 use function assert;
 use function file;
 use function is_file;