Merge branch '10.5' into 11.5

Author: sebastianbergmann

ChangeLog-11.5.md

@@ -11,6 +11,7 @@ All notable changes of the PHPUnit 11.5 release series are documented in this fi
 ### Fixed
 
 * [#6095](https://github.com/sebastianbergmann/phpunit/issues/6095): Expectation is not counted correctly when a doubled method is called more often than is expected
+* [#6098](https://github.com/sebastianbergmann/phpunit/issues/6098): No `system-out` element in JUnit XML logfile
 
 ## [11.5.2] - 2024-12-21
 

src/Logging/JUnit/JunitXmlLogger.php

@@ -31,6 +31,7 @@
 use PHPUnit\Event\Test\MarkedIncomplete;
 use PHPUnit\Event\Test\PreparationStarted;
 use PHPUnit\Event\Test\Prepared;
+use PHPUnit\Event\Test\PrintedUnexpectedOutput;
 use PHPUnit\Event\Test\Skipped;
 use PHPUnit\Event\TestSuite\Started;
 use PHPUnit\Event\UnknownSubscriberTypeException;
@@ -194,6 +195,16 @@ public function testPrepared(): void
         $this->prepared = true;
     }
 
+    public function testPrintedUnexpectedOutput(PrintedUnexpectedOutput $event): void
+    {
+        $systemOut = $this->document->createElement(
+            'system-out',
+            Xml::prepareString($event->output()),
+        );
+
+        $this->currentTestCase->appendChild($systemOut);
+    }
+
     /**
      * @throws InvalidArgumentException
      */
@@ -288,6 +299,7 @@ private function registerSubscribers(Facade $facade): void
             new TestPreparationStartedSubscriber($this),
             new TestPreparationFailedSubscriber($this),
             new TestPreparedSubscriber($this),
+            new TestPrintedUnexpectedOutputSubscriber($this),
             new TestFinishedSubscriber($this),
             new TestErroredSubscriber($this),
             new TestFailedSubscriber($this),

src/Logging/JUnit/Subscriber/TestPrintedUnexpectedOutputSubscriber.php

@@ -0,0 +1,26 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Logging\JUnit;
+
+use PHPUnit\Event\Test\PrintedUnexpectedOutput;
+use PHPUnit\Event\Test\PrintedUnexpectedOutputSubscriber;
+
+/**
+ * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final readonly class TestPrintedUnexpectedOutputSubscriber extends Subscriber implements PrintedUnexpectedOutputSubscriber
+{
+    public function notify(PrintedUnexpectedOutput $event): void
+    {
+        $this->logger()->testPrintedUnexpectedOutput($event);
+    }
+}

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

@@ -0,0 +1,23 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/6098
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--no-output';
+$_SERVER['argv'][] = '--log-junit';
+$_SERVER['argv'][] = 'php://stdout';
+$_SERVER['argv'][] = __DIR__ . '/6098/Issue6098Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuites>
+  <testsuite name="PHPUnit\TestFixture\Issue6098\Issue6098Test" file="%sIssue6098Test.php" tests="1" assertions="1" errors="0" failures="0" skipped="0" time="%f">
+    <testcase name="testOne" file="%sIssue6098Test.php" line="16" class="PHPUnit\TestFixture\Issue6098\Issue6098Test" classname="PHPUnit.TestFixture.Issue6098.Issue6098Test" assertions="1" time="%f">
+      <system-out>output</system-out>
+    </testcase>
+  </testsuite>
+</testsuites>

tests/end-to-end/regression/6098/Issue6098Test.php

@@ -0,0 +1,22 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue6098;
+
+use PHPUnit\Framework\TestCase;
+
+final class Issue6098Test extends TestCase
+{
+    public function testOne(): void
+    {
+        print 'output';
+
+        $this->assertTrue(true);
+    }
+}