enable colors for windows ConEmu user

http://conemu.github.io/ This is used in Cmder for example.
cakephp · Jul 22, 2015 · bfa1cd0 · bfa1cd0
1 parent 2bb3880
commit bfa1cd0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Console/ConsoleOutput.php b/src/Console/ConsoleOutput.php
@@ -154,16 +154,16 @@ class ConsoleOutput
     /**
      * Construct the output object.
      *
-     * Checks for a pretty console environment. Ansicon allows pretty consoles
-     * on windows, and is supported.
+     * Checks for a pretty console environment. Ansicon and ConEmu allows
+     *  pretty consoles on windows, and is supported.
      *
      * @param string $stream The identifier of the stream to write output to.
      */
     public function __construct($stream = 'php://stdout')
     {
         $this->_output = fopen($stream, 'w');
 
-        if ((DS === '\\' && !(bool)env('ANSICON')) ||
+        if ((DS === '\\' && !(bool)env('ANSICON') && env('ConEmuANSI') !== 'ON') ||
             (function_exists('posix_isatty') && !posix_isatty($this->_output))
         ) {
             $this->_outputAs = self::PLAIN;

diff --git a/src/Log/Engine/ConsoleLog.php b/src/Log/Engine/ConsoleLog.php
@@ -57,7 +57,7 @@ class ConsoleLog extends BaseLog
      */
     public function __construct(array $config = [])
     {
-        if ((DS === '\\' && !(bool)env('ANSICON')) ||
+        if ((DS === '\\' && !(bool)env('ANSICON') && env('ConEmuANSI') !== 'ON') ||
             (function_exists('posix_isatty') && !posix_isatty($this->_output))
         ) {
             $this->_defaultConfig['outputAs'] = ConsoleOutput::PLAIN;

diff --git a/tests/TestCase/Log/Engine/ConsoleLogTest.php b/tests/TestCase/Log/Engine/ConsoleLogTest.php
@@ -68,7 +68,7 @@ public function testlogToFileStream()
      */
     public function testDefaultOutputAs()
     {
-        if ((DS === '\\' && !(bool)env('ANSICON')) ||
+        if ((DS === '\\' && !(bool)env('ANSICON') && env('ConEmuANSI') !== 'ON') ||
             (function_exists('posix_isatty') && !posix_isatty(null))
         ) {
             $expected = ConsoleOutput::PLAIN;