Merge branch '9.6' into 10.5

.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;

src/Runner/Baseline/Reader.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Runner\Baseline;
 
+use const DIRECTORY_SEPARATOR;
 use function assert;
 use function dirname;
 use function file_exists;

src/Runner/Extension/ExtensionBootstrapper.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Runner\Extension;
 
+use const PHP_EOL;
 use function assert;
 use function class_exists;
 use function class_implements;

src/Runner/ResultCache/DefaultResultCache.php

@@ -10,6 +10,7 @@
 namespace PHPUnit\Runner\ResultCache;
 
 use const DIRECTORY_SEPARATOR;
+use const LOCK_EX;
 use function array_keys;
 use function assert;
 use function dirname;

src/TextUI/Application.php

@@ -10,6 +10,7 @@
 namespace PHPUnit\TextUI;
 
 use const PHP_EOL;
+use const PHP_VERSION;
 use function is_file;
 use function is_readable;
 use function printf;

src/TextUI/Command/Commands/GenerateConfigurationCommand.php

@@ -9,6 +9,8 @@
  */
 namespace PHPUnit\TextUI\Command;
 
+use const PHP_EOL;
+use const STDIN;
 use function fgets;
 use function file_put_contents;
 use function getcwd;

src/TextUI/Command/Commands/ListGroupsCommand.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\Command;
 
+use const PHP_EOL;
 use function sort;
 use function sprintf;
 use function str_starts_with;

src/TextUI/Command/Commands/ListTestSuitesCommand.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\Command;
 
+use const PHP_EOL;
 use function sprintf;
 use PHPUnit\TextUI\Configuration\Registry;
 use PHPUnit\TextUI\Configuration\TestSuiteCollection;

src/TextUI/Command/Commands/ListTestsAsTextCommand.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\Command;
 
+use const PHP_EOL;
 use function sprintf;
 use function str_replace;
 use PHPUnit\Framework\TestCase;

src/TextUI/Command/Commands/ListTestsAsXmlCommand.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\Command;
 
+use const PHP_EOL;
 use function file_put_contents;
 use function implode;
 use function sprintf;

src/TextUI/Command/Commands/MigrateConfigurationCommand.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\Command;
 
+use const PHP_EOL;
 use function copy;
 use function file_put_contents;
 use function sprintf;

src/TextUI/Command/Commands/VersionCheckCommand.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\Command;
 
+use const PHP_EOL;
 use function file_get_contents;
 use function sprintf;
 use function version_compare;

src/TextUI/Configuration/Cli/Builder.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\CliArguments;
 
+use const DIRECTORY_SEPARATOR;
 use function array_map;
 use function basename;
 use function explode;

src/TextUI/Configuration/Merger.php

@@ -10,6 +10,7 @@
 namespace PHPUnit\TextUI\Configuration;
 
 use const DIRECTORY_SEPARATOR;
+use const PATH_SEPARATOR;
 use function array_diff;
 use function assert;
 use function dirname;

src/TextUI/Configuration/TestSuiteBuilder.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\Configuration;
 
+use const PHP_EOL;
 use function assert;
 use function count;
 use function is_dir;

src/TextUI/Configuration/Xml/Validator/ValidationResult.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\XmlConfiguration;
 
+use const PHP_EOL;
 use function sprintf;
 use function trim;
 use LibXMLError;

src/TextUI/Output/Facade.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\Output;
 
+use const PHP_EOL;
 use function assert;
 use PHPUnit\Event\EventFacadeIsSealedException;
 use PHPUnit\Event\Facade as EventFacade;

src/TextUI/Output/SummaryPrinter.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TextUI\Output;
 
+use const PHP_EOL;
 use function sprintf;
 use PHPUnit\TestRunner\TestResult\TestResult;
 use PHPUnit\Util\Color;

src/Util/ExcludeList.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Util;
 
+use const PHP_OS_FAMILY;
 use function class_exists;
 use function defined;
 use function dirname;

src/Util/Filesystem.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Util;
 
+use const DIRECTORY_SEPARATOR;
 use function basename;
 use function dirname;
 use function is_dir;

src/Util/Xml/Loader.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\Util\Xml;
 
+use const PHP_OS_FAMILY;
 use function chdir;
 use function dirname;
 use function error_reporting;

tests/end-to-end/_files/baseline/generate-baseline-no-baseline-configured/tests/Test.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Baseline;
 
+use const E_USER_DEPRECATED;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 

tests/end-to-end/_files/baseline/generate-baseline-suppressed-with-ignored-suppression/tests/Test.php

@@ -9,6 +9,9 @@
  */
 namespace PHPUnit\TestFixture\Baseline;
 
+use const E_USER_DEPRECATED;
+use const E_USER_NOTICE;
+use const E_USER_WARNING;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 use Serializable;

tests/end-to-end/_files/baseline/generate-baseline-suppressed/tests/Test.php

@@ -9,6 +9,9 @@
  */
 namespace PHPUnit\TestFixture\Baseline;
 
+use const E_USER_DEPRECATED;
+use const E_USER_NOTICE;
+use const E_USER_WARNING;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 use Serializable;

tests/end-to-end/_files/baseline/generate-baseline/tests/Test.php

@@ -9,6 +9,9 @@
  */
 namespace PHPUnit\TestFixture\Baseline;
 
+use const E_USER_DEPRECATED;
+use const E_USER_NOTICE;
+use const E_USER_WARNING;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 use Serializable;

tests/end-to-end/_files/baseline/invalid-baseline/tests/Test.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Baseline;
 
+use const E_USER_DEPRECATED;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 

tests/end-to-end/_files/baseline/unsupported-baseline/tests/Test.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Baseline;
 
+use const E_USER_DEPRECATED;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 

tests/end-to-end/_files/baseline/use-baseline/baseline.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <files version="1">
  <file path="tests/Test.php">
- <line number="19" hash="a1022fb62c4705938dd2c6df5ff35b2621f9e97d">
+ <line number="20" hash="a1022fb62c4705938dd2c6df5ff35b2621f9e97d">
  <issue><![CDATA[deprecation]]></issue>
  </line>
  </file>

tests/end-to-end/_files/baseline/use-baseline/tests/Test.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Baseline;
 
+use const E_USER_DEPRECATED;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 

tests/end-to-end/_files/stop-on-fail-on/DeprecationTest.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\TestRunnerStopping;
 
+use const E_USER_DEPRECATED;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 

tests/end-to-end/_files/stop-on-fail-on/NoticeTest.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\TestRunnerStopping;
 
+use const E_USER_NOTICE;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 

tests/end-to-end/_files/stop-on-fail-on/WarningTest.php

@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\TestRunnerStopping;
 
+use const E_USER_WARNING;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 

tests/end-to-end/baseline/generate-baseline-suppressed-with-ignored-suppression.phpt

@@ -36,19 +36,19 @@ Baseline written to %sbaseline.xml.
 <?xml version="1.0"?>
 <files version="1">
  <file path="tests/Test.php">
- <line number="20" hash="d830ec28e59b9f13d697e91ea3944db52a4aa5c8">
+ <line number="23" hash="d830ec28e59b9f13d697e91ea3944db52a4aa5c8">
  <issue><![CDATA[deprecation]]></issue>
  </line>
- <line number="27" hash="e2e96bace350722203be87b5c9990c68149e7880">
+ <line number="30" hash="e2e96bace350722203be87b5c9990c68149e7880">
  <issue><![CDATA[notice]]></issue>
  </line>
- <line number="34" hash="53788ca16bdbb84598d44aa0efc6c022e02e9525">
+ <line number="37" hash="53788ca16bdbb84598d44aa0efc6c022e02e9525">
  <issue><![CDATA[warning]]></issue>
  </line>
- <line number="41" hash="0c40db3a94679d19bdb71313ad8987f6a7df542f">
+ <line number="44" hash="0c40db3a94679d19bdb71313ad8987f6a7df542f">
  <issue><![CDATA[Serializable@anonymous implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary)]]></issue>
  </line>
- <line number="62" hash="2c83752a707cb31226e122e9f697a7e69773903e">
+ <line number="65" hash="2c83752a707cb31226e122e9f697a7e69773903e">
  <issue><![CDATA[Accessing static property class@anonymous::$a as non static]]></issue>
  <issue><![CDATA[Undefined property: class@anonymous::$a]]></issue>
  </line>

tests/end-to-end/baseline/generate-baseline.phpt

@@ -36,19 +36,19 @@ Baseline written to %sbaseline.xml.
 <?xml version="1.0"?>
 <files version="1">
  <file path="tests/Test.php">
- <line number="20" hash="a1022fb62c4705938dd2c6df5ff35b2621f9e97d">
+ <line number="23" hash="a1022fb62c4705938dd2c6df5ff35b2621f9e97d">
  <issue><![CDATA[deprecation]]></issue>
  </line>
- <line number="27" hash="fff8be75c2fbcbc4d395247e58fbbe6541189cf0">
+ <line number="30" hash="fff8be75c2fbcbc4d395247e58fbbe6541189cf0">
  <issue><![CDATA[notice]]></issue>
  </line>
- <line number="34" hash="a5b91c0a182bedb089007e5bc0d0f462637bc904">
+ <line number="37" hash="a5b91c0a182bedb089007e5bc0d0f462637bc904">
  <issue><![CDATA[warning]]></issue>
  </line>
- <line number="41" hash="76474d8e27ebd1f5fd11fcf0cbb60a777576df9a">
+ <line number="44" hash="76474d8e27ebd1f5fd11fcf0cbb60a777576df9a">
  <issue><![CDATA[Serializable@anonymous implements the Serializable interface, which is deprecated. Implement __serialize() and __unserialize() instead (or in addition, if support for old PHP versions is necessary)]]></issue>
  </line>
- <line number="62" hash="653ed54b2a16d4fa980fde9f70c38edbab099477">
+ <line number="65" hash="653ed54b2a16d4fa980fde9f70c38edbab099477">
  <issue><![CDATA[Accessing static property class@anonymous::$a as non static]]></issue>
  <issue><![CDATA[Undefined property: class@anonymous::$a]]></issue>
  </line>