Disable CLI color for Windows 10 greater than 10.0.10586

mlocati · nicolas-grekas · commit 255c59f67057 · 2016-08-19T08:41:18.000+02:00
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -161,7 +161,7 @@ private static function hasColorSupport()
     {
         if ('\\' === DIRECTORY_SEPARATOR) {
             return
-                0 >= version_compare('10.0.10586', PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD)
+                '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
                 || 'xterm' === getenv('TERM');
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -83,7 +83,7 @@ protected function doWrite($message, $newline)
      *
      * Colorization is disabled if not supported by the stream:
      *
-     *  -  Windows before 10.0.10586 without Ansicon, ConEmu or Mintty
+     *  -  Windows != 10.0.10586 without Ansicon, ConEmu or Mintty
      *  -  non tty consoles
      *
      * @return bool true if the stream supports colorization, false otherwise
@@ -92,7 +92,7 @@ protected function hasColorSupport()
     {
         if (DIRECTORY_SEPARATOR === '\\') {
             return
-                0 >= version_compare('10.0.10586', PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD)
+                '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
                 || 'xterm' === getenv('TERM');
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -449,7 +449,7 @@ protected function supportsColors()
 
         if ('\\' === DIRECTORY_SEPARATOR) {
             static::$defaultColors = @(
-                0 >= version_compare('10.0.10586', PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD)
+                '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
                 || 'xterm' === getenv('TERM')

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ private static function hasColorSupport()`
`161`	`161`	`{`
`162`	`162`	`if ('\\' === DIRECTORY_SEPARATOR) {`
`163`	`163`	`return`
`164`		`- 0 >= version_compare('10.0.10586', PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD)`
	`164`	`+ '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD`
`165`	`165`	`\|\| false !== getenv('ANSICON')`
`166`	`166`	`\|\| 'ON' === getenv('ConEmuANSI')`
`167`	`167`	`\|\| 'xterm' === getenv('TERM');`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ protected function doWrite($message, $newline)`
`83`	`83`	`*`
`84`	`84`	`* Colorization is disabled if not supported by the stream:`
`85`	`85`	`*`
`86`		`- * - Windows before 10.0.10586 without Ansicon, ConEmu or Mintty`
	`86`	`+ * - Windows != 10.0.10586 without Ansicon, ConEmu or Mintty`
`87`	`87`	`* - non tty consoles`
`88`	`88`	`*`
`89`	`89`	`* @return bool true if the stream supports colorization, false otherwise`
`@@ -92,7 +92,7 @@ protected function hasColorSupport()`
`92`	`92`	`{`
`93`	`93`	`if (DIRECTORY_SEPARATOR === '\\') {`
`94`	`94`	`return`
`95`		`- 0 >= version_compare('10.0.10586', PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD)`
	`95`	`+ '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD`
`96`	`96`	`\|\| false !== getenv('ANSICON')`
`97`	`97`	`\|\| 'ON' === getenv('ConEmuANSI')`
`98`	`98`	`\|\| 'xterm' === getenv('TERM');`