bug #52940 [Console] Fix color support check on non-Windows platforms (theofidry)

fabpot · fabpot · commit 712139741208 · 2023-12-08T15:15:02.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Console] Fix color support check on non-Windows platforms | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #45917 | License | MIT Currently checking the color support based on `ANSICON`, `ConEmuANSI=ON` or `TERM=xTerm` is done only for Widows. I could not find any reason as to why and it does not make much sense as it is. Especially if we consider that `TERM=xTerm` is a term check and we do another one (not Widows specific) which is `TERM_PROGRAM=Hyper`. This potentially fixes #45917. This also looks more in line with the intent (based on the title) of #27831 and #27794. Commits ------- 285518d detect colors on not windows
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -95,15 +95,17 @@ protected function hasColorSupport()
             return false;
         }
 
-        if (\DIRECTORY_SEPARATOR === '\\') {
-            return (\function_exists('sapi_windows_vt100_support')
-                && @sapi_windows_vt100_support($this->stream))
-                || false !== getenv('ANSICON')
-                || 'ON' === getenv('ConEmuANSI')
-                || str_starts_with((string) getenv('TERM'), 'xterm');
+        if (\DIRECTORY_SEPARATOR === '\\'
+            && \function_exists('sapi_windows_vt100_support')
+            && @sapi_windows_vt100_support($this->stream)
+        ) {
+            return true;
         }
 
         return 'Hyper' === getenv('TERM_PROGRAM')
+            || false !== getenv('ANSICON')
+            || 'ON' === getenv('ConEmuANSI')
+            || str_starts_with((string) getenv('TERM'), 'xterm')
             || stream_isatty($this->stream);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -95,15 +95,17 @@ protected function hasColorSupport()`
`95`	`95`	`return false;`
`96`	`96`	`}`
`97`	`97`
`98`		`- if (\DIRECTORY_SEPARATOR === '\\') {`
`99`		`- return (\function_exists('sapi_windows_vt100_support')`
`100`		`- && @sapi_windows_vt100_support($this->stream))`
`101`		`- \|\| false !== getenv('ANSICON')`
`102`		`- \|\| 'ON' === getenv('ConEmuANSI')`
`103`		`- \|\| str_starts_with((string) getenv('TERM'), 'xterm');`
	`98`	`+ if (\DIRECTORY_SEPARATOR === '\\'`
	`99`	`+ && \function_exists('sapi_windows_vt100_support')`
	`100`	`+ && @sapi_windows_vt100_support($this->stream)`
	`101`	`+ ) {`
	`102`	`+ return true;`
`104`	`103`	`}`
`105`	`104`
`106`	`105`	`return 'Hyper' === getenv('TERM_PROGRAM')`
	`106`	`+ \|\| false !== getenv('ANSICON')`
	`107`	`+ \|\| 'ON' === getenv('ConEmuANSI')`
	`108`	`+ \|\| str_starts_with((string) getenv('TERM'), 'xterm')`
`107`	`109`	`\|\| stream_isatty($this->stream);`
`108`	`110`	`}`
`109`	`111`	`}`