Revert "Closes #6499"

This reverts commit 717c56a.

Author: sebastianbergmann

ChangeLog-13.1.md

@@ -8,8 +8,4 @@ All notable changes of the PHPUnit 13.1 release series are documented in this fi
 
 * [#6501](https://github.com/sebastianbergmann/phpunit/issues/6501): Include unexpected test output in Open Test Reporting (OTR) XML logfile
 
-### Deprecated
-
-* [#6499](https://github.com/sebastianbergmann/phpunit/issues/6499): Support for logging test results in JUnit XML
-
 [13.1.0]: https://github.com/sebastianbergmann/phpunit/compare/13.0...main

src/TextUI/Application.php

@@ -607,15 +607,6 @@ private function registerLogfileWriters(Configuration $configuration): void
         }
 
         if ($configuration->hasLogfileJunit()) {
-            EventFacade::emitter()->testRunnerTriggeredPhpunitDeprecation(
-                <<<'EOT'
-Support for logging test results in JUnit XML format has been deprecated.
-This feature will be removed in PHPUnit 14.
-Either migrate from consuming JUnit XML to consuming Open Test Reporting (OTR) XML,
-or convert the OTR XML that PHPUnit generates to JUnit XML.
-EOT
-            );
-
             try {
                 new JunitXmlLogger(
                     OutputFacade::printerFor($configuration->logfileJunit()),

src/TextUI/Help.php

@@ -281,7 +281,7 @@ private function elements(): array
             ],
 
             'Logging' => [
-                ['arg' => '--log-junit <file>', 'desc' => 'Write test results in JUnit XML format to file (deprecated)'],
+                ['arg' => '--log-junit <file>', 'desc' => 'Write test results in JUnit XML format to file'],
                 ['arg' => '--log-otr <file>', 'desc' => 'Write test results in Open Test Reporting XML format to file'],
                 ['arg' => '--include-git-information', 'desc' => 'Include Git information in Open Test Reporting XML logfile'],
                 ['arg' => '--log-teamcity <file>', 'desc' => 'Write test results in TeamCity format to file'],

tests/end-to-end/_files/output-cli-help-color.txt

@@ -184,7 +184,7 @@
 Logging:
 
   --log-junit <file>                   Write test results in JUnit XML format
-                                       to file (deprecated)
+                                       to file
   --log-otr <file>                     Write test results in Open Test
                                        Reporting XML format to file
   --include-git-information            Include Git information in Open Test

tests/end-to-end/_files/output-cli-usage.txt

@@ -122,7 +122,7 @@ Reporting:
 
 Logging:
 
-  --log-junit <file>                   Write test results in JUnit XML format to file (deprecated)
+  --log-junit <file>                   Write test results in JUnit XML format to file
   --log-otr <file>                     Write test results in Open Test Reporting XML format to file
   --include-git-information            Include Git information in Open Test Reporting XML logfile
   --log-teamcity <file>                Write test results in TeamCity format to file

tests/end-to-end/logging/junit/invalid-path.phpt

@@ -4,7 +4,6 @@ Test runner emits warning when --log-junit is used with an invalid target path
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--display-phpunit-deprecations';
 $_SERVER['argv'][] = '--log-junit';
 $_SERVER['argv'][] = '';
 $_SERVER['argv'][] = __DIR__ . '/../../_files/basic/SuccessTest.php';
@@ -25,14 +24,5 @@ There was 1 PHPUnit test runner warning:
 
 1) Cannot log test results in JUnit XML format to "": Directory "" does not exist and could not be created
 
---
-
-There was 1 PHPUnit test runner deprecation:
-
-1) Support for logging test results in JUnit XML format has been deprecated.
-This feature will be removed in PHPUnit 14.
-Either migrate from consuming JUnit XML to consuming Open Test Reporting (OTR) XML,
-or convert the OTR XML that PHPUnit generates to JUnit XML.
-
 OK, but there were issues!
-Tests: 1, Assertions: 1, PHPUnit Warnings: 1, PHPUnit Deprecations: 1.
+Tests: 1, Assertions: 1, PHPUnit Warnings: 1.

tests/end-to-end/logging/junit/invalid-socket.phpt

@@ -4,7 +4,6 @@ Test runner emits warning when --log-junit is used with an invalid socket
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = '--display-phpunit-deprecations';
 $_SERVER['argv'][] = '--log-junit';
 $_SERVER['argv'][] = 'socket://hostname:port:wrong';
 $_SERVER['argv'][] = __DIR__ . '/../../_files/basic/SuccessTest.php';
@@ -25,14 +24,5 @@ There was 1 PHPUnit test runner warning:
 
 1) Cannot log test results in JUnit XML format to "socket://hostname:port:wrong": "socket://hostname:port:wrong" does not match "socket://hostname:port" format
 
---
-
-There was 1 PHPUnit test runner deprecation:
-
-1) Support for logging test results in JUnit XML format has been deprecated.
-This feature will be removed in PHPUnit 14.
-Either migrate from consuming JUnit XML to consuming Open Test Reporting (OTR) XML,
-or convert the OTR XML that PHPUnit generates to JUnit XML.
-
 OK, but there were issues!
-Tests: 1, Assertions: 1, PHPUnit Warnings: 1, PHPUnit Deprecations: 1.
+Tests: 1, Assertions: 1, PHPUnit Warnings: 1.

tests/end-to-end/logging/junit/with-progress-with-errors.phpt

@@ -12,7 +12,6 @@ $logfile = tempnam(sys_get_temp_dir(), __FILE__);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--do-not-report-useless-tests';
-$_SERVER['argv'][] = '--display-phpunit-deprecations';
 $_SERVER['argv'][] = '--log-junit';
 $_SERVER['argv'][] = $logfile;
 $_SERVER['argv'][] = __DIR__ . '/../_files/TypeErrorTest.php';
@@ -33,15 +32,6 @@ E                                                                   1 / 1 (100%)
 
 Time: %s, Memory: %s
 
-There was 1 PHPUnit test runner deprecation:
-
-1) Support for logging test results in JUnit XML format has been deprecated.
-This feature will be removed in PHPUnit 14.
-Either migrate from consuming JUnit XML to consuming Open Test Reporting (OTR) XML,
-or convert the OTR XML that PHPUnit generates to JUnit XML.
-
---
-
 There was 1 error:
 
 1) PHPUnit\TestFixture\TypeErrorTest::testMe
@@ -50,7 +40,7 @@ TypeError: Cannot assign DateTime to property PHPUnit\TestFixture\TypeErrorTest:
 %sTypeErrorTest.php:%d
 
 ERRORS!
-Tests: 1, Assertions: 0, Errors: 1, PHPUnit Deprecations: 1.
+Tests: 1, Assertions: 0, Errors: 1.
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
   <testsuite name="PHPUnit\TestFixture\TypeErrorTest" file="%sTypeErrorTest.php" tests="1" assertions="0" errors="1" failures="0" skipped="0" time="%f">

tests/end-to-end/regression/5258.phpt

@@ -26,8 +26,8 @@ Runtime: %s
 
 Time: %s, Memory: %s MB
 
-OK, but there were issues!
-Tests: 2, Assertions: 1, PHPUnit Deprecations: 1, Skipped: 1.
+OK, but some tests were skipped!
+Tests: 2, Assertions: 1, Skipped: 1.
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
   <testsuite name="PHPUnit\TestFixture\Issue5258\Issue5258Test" file="%sIssue5258Test.php" tests="2" assertions="1" errors="0" failures="0" skipped="1" time="%f">