Skip to content

Commit

Permalink
Merge branch '3.4' into 4.0
Browse files Browse the repository at this point in the history
* 3.4:
  [DomCrawler] Fix ChoiceFormField::select() PHPDoc
  [HttpFoundation] add tests for FlashBagInterface::setAll()
  Check for Hyper terminal on all operating systems.
  [DI] Don't show internal service id on binding errors
  Prevent toolbar links color override by css
  • Loading branch information
nicolas-grekas committed Jul 5, 2018
2 parents e3bd95b + 62c8349 commit 7b7a6b8
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions DeprecationErrorHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -311,13 +311,16 @@ private static function hasColorSupport()
return false;
}

if ('Hyper' === getenv('TERM_PROGRAM')) {
return true;
}

if (DIRECTORY_SEPARATOR === '\\') {
return (function_exists('sapi_windows_vt100_support')
&& sapi_windows_vt100_support(STDOUT))
|| false !== getenv('ANSICON')
|| 'ON' === getenv('ConEmuANSI')
|| 'xterm' === getenv('TERM')
|| 'Hyper' === getenv('TERM_PROGRAM');
|| 'xterm' === getenv('TERM');
}

if (function_exists('stream_isatty')) {
Expand Down

0 comments on commit 7b7a6b8

Please sign in to comment.