Merge branch '10.5' into 11.1

sebastianbergmann · sebastianbergmann · commit a6d9e2d5dddf · 2024-05-06T08:24:59.000+02:00
diff --git a/src/Logging/EventLogger.php b/src/Logging/EventLogger.php
@@ -42,7 +42,8 @@ public function trace(Event $event): void
 
         $flags = FILE_APPEND;
 
-        if (PHP_OS_FAMILY !== 'Windows' || $this->path !== 'php://stdout') {
+        if (!(PHP_OS_FAMILY === 'Windows' || PHP_OS_FAMILY === 'Darwin') ||
+            $this->path !== 'php://stdout') {
             $flags |= LOCK_EX;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ public function trace(Event $event): void`
`42`	`42`
`43`	`43`	`$flags = FILE_APPEND;`
`44`	`44`
`45`		`- if (PHP_OS_FAMILY !== 'Windows' \|\| $this->path !== 'php://stdout') {`
	`45`	`+ if (!(PHP_OS_FAMILY === 'Windows' \|\| PHP_OS_FAMILY === 'Darwin') \|\|`
	`46`	`+ $this->path !== 'php://stdout') {`
`46`	`47`	`$flags \|= LOCK_EX;`
`47`	`48`	`}`
`48`	`49`