Skip to content

Commit 3982863

Browse files
Merge branch '10.5' into 11.0
2 parents 0ee5efe + f8941b6 commit 3982863

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

ChangeLog-11.0.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes of the PHPUnit 11.0 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
44

5+
## [11.0.9] - 2024-MM-DD
6+
7+
### Fixed
8+
9+
* [#5570](https://github.com/sebastianbergmann/phpunit/pull/5570): Windows does not support exclusive locks on stdout
10+
511
## [11.0.8] - 2024-03-22
612

713
### Fixed
@@ -149,6 +155,7 @@ All notable changes of the PHPUnit 11.0 release series are documented in this fi
149155
* `PHPUnit\TextUI\Configuration\Configuration::registerMockObjectsFromTestArgumentsRecursively()`
150156
* `PHPUnit\Framework\Constraint\Constraint::exporter()`
151157

158+
[11.0.9]: https://github.com/sebastianbergmann/phpunit/compare/11.0.8...11.0
152159
[11.0.8]: https://github.com/sebastianbergmann/phpunit/compare/11.0.7...11.0.8
153160
[11.0.7]: https://github.com/sebastianbergmann/phpunit/compare/11.0.6...11.0.7
154161
[11.0.6]: https://github.com/sebastianbergmann/phpunit/compare/11.0.5...11.0.6

src/Logging/EventLogger.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,16 @@ public function trace(Event $event): void
4040
$indentation = PHP_EOL . str_repeat(' ', strlen($telemetryInfo));
4141
$lines = preg_split('/\r\n|\r|\n/', $event->asString());
4242

43+
$flags = FILE_APPEND;
44+
45+
if (PHP_OS_FAMILY !== 'Windows' || $this->path !== 'php://stdout') {
46+
$flags |= LOCK_EX;
47+
}
48+
4349
file_put_contents(
4450
$this->path,
4551
$telemetryInfo . implode($indentation, $lines) . PHP_EOL,
46-
FILE_APPEND | LOCK_EX,
52+
$flags,
4753
);
4854
}
4955

0 commit comments

Comments
 (0)