Merge branch '7.0' into 7.1

nicolas-grekas · nicolas-grekas · commit 87186b2c6956 · 2024-02-07T18:52:35.000+01:00
* 7.0:
  Fix merge
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -402,7 +402,7 @@ private static function hasColorSupport(): bool
 
         // Detect msysgit/mingw and assume this is a tty because detection
         // does not work correctly, see https://github.com/composer/composer/issues/9690
-        if (!@stream_isatty($stream) && !\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {
+        if (!@stream_isatty(\STDOUT) && !\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {
             return true;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -402,7 +402,7 @@ private static function hasColorSupport(): bool`
`402`	`402`
`403`	`403`	`// Detect msysgit/mingw and assume this is a tty because detection`
`404`	`404`	`// does not work correctly, see https://github.com/composer/composer/issues/9690`
`405`		`- if (!@stream_isatty($stream) && !\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {`
	`405`	`+ if (!@stream_isatty(\STDOUT) && !\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {`
`406`	`406`	`return true;`
`407`	`407`	`}`
`408`	`408`