Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1c7c730

Browse filesBrowse files
committed
bug #53576 [Console] Only execute additional checks for color support if the output (theofidry)
This PR was merged into the 5.4 branch. Discussion ---------- [Console] Only execute additional checks for color support if the output is a TTY | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #53460 | License | MIT As reported in #53460, the modifications done in #52940 are incorrect as it results in detecting that the stream can support colors despite not being a TTY. Rather than doing a simple revert which would re-introduce the pre-existing issue that #52940 attempted to fix, this PR checks if the output is a TTY based on Composer's code and does this check before anything else. Indeed a TTY only means that colors _may_ be supported, so the various checks that we were doing do make sense to be done but should be done after this TTY (so `Hyper` is not an exception, it can be a TTY or not). Commits ------- 2e96b22 [Console] Only execute additional checks for color support if the output is a TTY
2 parents c7bafc2 + 2e96b22 commit 1c7c730
Copy full SHA for 1c7c730

File tree

1 file changed

+35
-2
lines changed
Filter options

1 file changed

+35
-2
lines changed

‎src/Symfony/Component/Console/Output/StreamOutput.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Output/StreamOutput.php
+35-2Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ protected function hasColorSupport()
9595
return false;
9696
}
9797

98+
if (!$this->isTty()) {
99+
return false;
100+
}
101+
98102
if (\DIRECTORY_SEPARATOR === '\\'
99103
&& \function_exists('sapi_windows_vt100_support')
100104
&& @sapi_windows_vt100_support($this->stream)
@@ -105,7 +109,36 @@ protected function hasColorSupport()
105109
return 'Hyper' === getenv('TERM_PROGRAM')
106110
|| false !== getenv('ANSICON')
107111
|| 'ON' === getenv('ConEmuANSI')
108-
|| str_starts_with((string) getenv('TERM'), 'xterm')
109-
|| stream_isatty($this->stream);
112+
|| str_starts_with((string) getenv('TERM'), 'xterm');
113+
}
114+
115+
/**
116+
* Checks if the stream is a TTY, i.e; whether the output stream is connected to a terminal.
117+
*
118+
* Reference: Composer\Util\Platform::isTty
119+
* https://github.com/composer/composer
120+
*/
121+
private function isTty(): bool
122+
{
123+
// Detect msysgit/mingw and assume this is a tty because detection
124+
// does not work correctly, see https://github.com/composer/composer/issues/9690
125+
if (\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {
126+
return true;
127+
}
128+
129+
// Modern cross-platform function, includes the fstat fallback so if it is present we trust it
130+
if (\function_exists('stream_isatty')) {
131+
return stream_isatty($this->stream);
132+
}
133+
134+
// Only trusting this if it is positive, otherwise prefer fstat fallback.
135+
if (\function_exists('posix_isatty') && posix_isatty($this->stream)) {
136+
return true;
137+
}
138+
139+
$stat = @fstat($this->stream);
140+
141+
// Check if formatted mode is S_IFCHR
142+
return $stat ? 0020000 === ($stat['mode'] & 0170000) : false;
110143
}
111144
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.