bug #15915 Detect Mintty for color support on Windows (stof)

fabpot · fabpot · commit 4a8935597c73 · 2015-09-27T11:59:16.000+02:00
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #15915). Discussion ---------- Detect Mintty for color support on Windows | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | symfony/symfony-docs#5726 Mintty is now the default terminal in GitBash, and it supports ANSI colors without the need of ANSICON (it even supports 256 colors rather than the 16 colors supported by ANSICON). I submitted it to 2.8 as it can be considered as a new feature. But it should not be hard to merge it in other branches if we decide to consider it as a bugfix (it just needs to be split because VarDumper does not exist in 2.3) Commits ------- 12743d1 Detect Mintty for color support on Windows
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -89,7 +89,7 @@ protected function doWrite($message, $newline)
      *
      * Colorization is disabled if not supported by the stream:
      *
-     *  -  Windows without Ansicon and ConEmu
+     *  -  Windows without Ansicon, ConEmu or Mintty
      *  -  non tty consoles
      *
      * @return bool true if the stream supports colorization, false otherwise
@@ -98,7 +98,7 @@ protected function hasColorSupport()
     {
         // @codeCoverageIgnoreStart
         if (DIRECTORY_SEPARATOR === '\\') {
-            return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
+            return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI') || 'xterm' === getenv('TERM');
         }
 
         return function_exists('posix_isatty') && @posix_isatty($this->stream);

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ protected function doWrite($message, $newline)`
`89`	`89`	`*`
`90`	`90`	`* Colorization is disabled if not supported by the stream:`
`91`	`91`	`*`
`92`		`- * - Windows without Ansicon and ConEmu`
	`92`	`+ * - Windows without Ansicon, ConEmu or Mintty`
`93`	`93`	`* - non tty consoles`
`94`	`94`	`*`
`95`	`95`	`* @return bool true if the stream supports colorization, false otherwise`
`@@ -98,7 +98,7 @@ protected function hasColorSupport()`
`98`	`98`	`{`
`99`	`99`	`// @codeCoverageIgnoreStart`
`100`	`100`	`if (DIRECTORY_SEPARATOR === '\\') {`
`101`		`- return false !== getenv('ANSICON') \|\| 'ON' === getenv('ConEmuANSI');`
	`101`	`+ return false !== getenv('ANSICON') \|\| 'ON' === getenv('ConEmuANSI') \|\| 'xterm' === getenv('TERM');`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`return function_exists('posix_isatty') && @posix_isatty($this->stream);`