merged branch hason/conemu (PR symfony#5498)

fabpot · fabpot · commit ddb8e5c5516f · 2012-09-18T19:29:30.000+02:00
Commits ------- bb2566c [Console] Console colorization is also provided by ConEmu on Windows Discussion ---------- [Console] Console colorization is also provided by ConEmu on Windows Bug fix: no Feature addition: yes Backwards compatibility break: no Symfony2 tests pass: yes License of the code: MIT See http://code.google.com/p/conemu-maximus5/wiki/AnsiEscapeCodes#Переменная_окружения --------------------------------------------------------------------------- by fabpot at 2012-09-16T07:43:55Z Can you add a note about it in the changelog of the component? thanks
diff --git a/src/Symfony/Component/Console/CHANGELOG.md b/src/Symfony/Component/Console/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+2.1.2
+-----
+
+ * added support for colorization on Windows via ConEmu
+
 2.1.0
 -----
 
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -95,7 +95,7 @@ protected function doWrite($message, $newline)
      *
      * Colorization is disabled if not supported by the stream:
      *
-     *  -  windows without ansicon
+     *  -  windows without ansicon and ConEmu
      *  -  non tty consoles
      *
      * @return Boolean true if the stream supports colorization, false otherwise
@@ -104,7 +104,7 @@ protected function hasColorSupport()
     {
         // @codeCoverageIgnoreStart
         if (DIRECTORY_SEPARATOR == '\\') {
-            return false !== getenv('ANSICON');
+            return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
         }
 
         return function_exists('posix_isatty') && @posix_isatty($this->stream);

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ protected function doWrite($message, $newline)`
`95`	`95`	`*`
`96`	`96`	`* Colorization is disabled if not supported by the stream:`
`97`	`97`	`*`
`98`		`- * - windows without ansicon`
	`98`	`+ * - windows without ansicon and ConEmu`
`99`	`99`	`* - non tty consoles`
`100`	`100`	`*`
`101`	`101`	`* @return Boolean true if the stream supports colorization, false otherwise`
`@@ -104,7 +104,7 @@ protected function hasColorSupport()`
`104`	`104`	`{`
`105`	`105`	`// @codeCoverageIgnoreStart`
`106`	`106`	`if (DIRECTORY_SEPARATOR == '\\') {`
`107`		`- return false !== getenv('ANSICON');`
	`107`	`+ return false !== getenv('ANSICON') \|\| 'ON' === getenv('ConEmuANSI');`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`return function_exists('posix_isatty') && @posix_isatty($this->stream);`