Skip to content

Commit 361106a

Browse files
Merge branch '2.8' into 3.4
* 2.8: update test for Twig performance optimizations [WebProfilerBundle] Increase retry delays between toolbarAction ajax calls support sapi_windows_vt100_support for php 7.2+ bumped Symfony version to 2.8.35 updated VERSION for 2.8.34 updated CHANGELOG for 2.8.34 bumped Symfony version to 2.7.42 updated VERSION for 2.7.41 update CONTRIBUTORS for 2.7.41 updated CHANGELOG for 2.7.41 [HttpFoundation] Added "null" type on Request::create docblock Allow trans filter to be safe
2 parents 26b6f41 + f169804 commit 361106a

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Output/StreamOutput.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ protected function hasColorSupport()
9292
{
9393
if (DIRECTORY_SEPARATOR === '\\') {
9494
return
95-
'10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
95+
function_exists('sapi_windows_vt100_support') && sapi_windows_vt100_support($this->stream)
96+
|| '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
9697
|| false !== getenv('ANSICON')
9798
|| 'ON' === getenv('ConEmuANSI')
9899
|| 'xterm' === getenv('TERM');

0 commit comments

Comments
 (0)