Merge branch '10.5' into 11.5

Author: sebastianbergmann

ChangeLog-11.5.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 11.5 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [11.5.4] - 2025-MM-DD
+
+### Fixed
+
+* [#6103](https://github.com/sebastianbergmann/phpunit/issues/6103): Output from test run in separate process is printed twice
+
 ## [11.5.3] - 2025-01-13
 
 ### Added
@@ -59,6 +65,7 @@ All notable changes of the PHPUnit 11.5 release series are documented in this fi
 * [#6055](https://github.com/sebastianbergmann/phpunit/issues/6055): `assertNotContainsOnly()` (use `assertContainsNotOnlyArray()`, `assertContainsNotOnlyBool()`, `assertContainsNotOnlyCallable()`, `assertContainsNotOnlyFloat()`, `assertContainsNotOnlyInt()`, `assertContainsNotOnlyIterable()`, `assertContainsNotOnlyNumeric()`, `assertContainsNotOnlyObject()`, `assertContainsNotOnlyResource()`, `assertContainsNotOnlyClosedResource()`, `assertContainsNotOnlyScalar()`, or `assertContainsNotOnlyString()` instead)
 * [#6059](https://github.com/sebastianbergmann/phpunit/issues/6059): `containsOnly()` (use `containsOnlyArray()`, `containsOnlyBool()`, `containsOnlyCallable()`, `containsOnlyFloat()`, `containsOnlyInt()`, `containsOnlyIterable()`, `containsOnlyNumeric()`, `containsOnlyObject()`, `containsOnlyResource()`, `containsOnlyClosedResource()`, `containsOnlyScalar()`, or `containsOnlyString()` instead)
 
+[11.5.4]: https://github.com/sebastianbergmann/phpunit/compare/11.5.3...11.5
 [11.5.3]: https://github.com/sebastianbergmann/phpunit/compare/11.5.2...11.5.3
 [11.5.2]: https://github.com/sebastianbergmann/phpunit/compare/11.5.1...11.5.2
 [11.5.1]: https://github.com/sebastianbergmann/phpunit/compare/11.5.0...11.5.1

src/Framework/TestRunner/SeparateProcessTestRunner.php

@@ -248,10 +248,6 @@ static function (int $errno, string $errstr, string $errfile, int $errline): nev
         }
 
         if ($childResult !== false) {
-            if (!empty($childResult['output'])) {
-                $output = $childResult['output'];
-            }
-
             Facade::instance()->forward($childResult['events']);
             PassedTests::instance()->import($childResult['passedTests']);
 
@@ -266,10 +262,6 @@ static function (int $errno, string $errstr, string $errfile, int $errline): nev
                 );
             }
         }
-
-        if (!empty($output)) {
-            print $output;
-        }
     }
 
     /**

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

@@ -13,7 +13,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
 
 Runtime: %s
 
-1.2.                                                                  2 / 2 (100%)2
+1.2.                                                                  2 / 2 (100%)
 
 Time: %s, Memory: %s
 

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

@@ -0,0 +1,21 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/6103
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/6103/Issue6103Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+*.                                                                   1 / 1 (100%)
+
+Time: %s, Memory: %s
+
+OK (1 test, 1 assertion)

tests/end-to-end/regression/6103/Issue6103Test.php

@@ -0,0 +1,24 @@
+<?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\Issue6103;
+
+use PHPUnit\Framework\Attributes\RunInSeparateProcess;
+use PHPUnit\Framework\TestCase;
+
+final class Issue6103Test extends TestCase
+{
+    #[RunInSeparateProcess]
+    public function testOne(): void
+    {
+        print '*';
+
+        $this->assertTrue(true);
+    }
+}