Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit 81ae1a49e842 · 2024-02-08T15:08:19.000+01:00
* 5.4:
  [PhpUnitBridge][VarDumper] fix color detection
  [CI] Make sure we preserve file-&gt;header when we run sync-translations.php
  Review validators.sl.xlf
diff --git a/Dumper/CliDumper.php b/Dumper/CliDumper.php
@@ -627,7 +627,7 @@ private function hasColorSupport(mixed $stream): 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)) {
-            return true;
+            return false;
         }
 
         if ('\\' === \DIRECTORY_SEPARATOR && @sapi_windows_vt100_support($stream)) {

Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,7 @@ private function hasColorSupport(mixed $stream): bool`
`627`	`627`	`// Detect msysgit/mingw and assume this is a tty because detection`
`628`	`628`	`// does not work correctly, see https://github.com/composer/composer/issues/9690`
`629`	`629`	`if (!@stream_isatty($stream) && !\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {`
`630`		`- return true;`
	`630`	`+ return false;`
`631`	`631`	`}`
`632`	`632`
`633`	`633`	`if ('\\' === \DIRECTORY_SEPARATOR && @sapi_windows_vt100_support($stream)) {`