Merge branch '12.1'

Author: sebastianbergmann

src/Framework/TestCase.php

@@ -1268,6 +1268,13 @@ private function runTest(): mixed
                 print preg_replace('/\[.+\] /', '', $errorLogOutput);
             }
         } catch (Throwable $exception) {
+            if (!$this->expectErrorLog) {
+                $errorLogOutput = stream_get_contents($capture);
+
+                // strip date from logged error, see https://github.com/php/php-src/blob/c696087e323263e941774ebbf902ac249774ec9f/main/main.c#L905
+                print preg_replace('/\[.+\] /', '', $errorLogOutput);
+            }
+
             if (!$this->shouldExceptionExpectationsBeVerified($exception)) {
                 throw $exception;
             }

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

@@ -0,0 +1,31 @@
+--TEST--
+https://github.com/sebastianbergmann/phpunit/issues/6173
+--FILE--
+<?php declare(strict_types=1);
+$_SERVER['argv'][] = '--do-not-cache-result';
+$_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = __DIR__ . '/6173/Issue6173Test.php';
+
+require_once __DIR__ . '/../../bootstrap.php';
+
+(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime: %s
+
+hello, success!
+.hello, fail!
+F                                                                  2 / 2 (100%)
+
+Time: %s, Memory: %s
+
+There was 1 failure:
+
+1) PHPUnit\TestFixture\Issue6173\Issue6173Test::test_log_fail
+Failed asserting that false is true.
+
+%sIssue6173Test.php:%d
+
+FAILURES!
+Tests: 2, Assertions: 2, Failures: 1.

tests/end-to-end/regression/6173/Issue6173Test.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\TestFixture\Issue6173;
+
+use function error_log;
+use PHPUnit\Framework\TestCase;
+
+final class Issue6173Test extends TestCase
+{
+    public function test_log_success(): void
+    {
+        error_log('hello, success!');
+        $this->assertTrue(true);
+    }
+
+    public function test_log_fail(): void
+    {
+        error_log('hello, fail!');
+        $this->assertTrue(false);
+    }
+}