Skip to content

Commit

Permalink
Merge branch '5.4' into 6.4
Browse files Browse the repository at this point in the history
* 5.4:
  [PhpUnitBridge][VarDumper] fix color detection
  [CI] Make sure we preserve file->header when we run sync-translations.php
  Review validators.sl.xlf
  • Loading branch information
nicolas-grekas committed Feb 8, 2024
2 parents f9db2cc + 760a863 commit 81ae1a4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Dumper/CliDumper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit 81ae1a4

Please sign in to comment.