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 5f3e4ab + c4d9785 commit 16ed5bd
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions DeprecationErrorHandler.php
Expand Up @@ -412,13 +412,10 @@ private static function hasColorSupport()
}

if (!self::isTty()) {
return true;
return false;
}

if ('\\' === \DIRECTORY_SEPARATOR
&& \function_exists('sapi_windows_vt100_support')
&& @sapi_windows_vt100_support(\STDOUT)
) {
if ('\\' === \DIRECTORY_SEPARATOR && \function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(\STDOUT)) {
return true;
}

Expand Down

0 comments on commit 16ed5bd

Please sign in to comment.