Skip to content

Commit ca73e92

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: [String] Skip a test when an issue is detected in PCRE2 [Mailer] Stop using the (local) AWS shared configuration in the PHPUnit tests. detect colors on not windows fix xterm detection refactor: hyper check Missing translations for Slovak (sk) #51954 properly handle SYMFONY_DOTENV_VARS being the empty string Avoid incompatibility with symfony/console 7 bug #45057 [Messenger] Avoid reconnecting active Redis connections. [Serializer] fix regression where nullable int cannot be serialized do not overwrite an application's default serialization context
2 parents 0566dbd + 4b4d8cd commit ca73e92

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

Output/StreamOutput.php

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,18 +96,17 @@ protected function hasColorSupport(): bool
9696
return false;
9797
}
9898

99-
if ('Hyper' === getenv('TERM_PROGRAM')) {
99+
if (\DIRECTORY_SEPARATOR === '\\'
100+
&& \function_exists('sapi_windows_vt100_support')
101+
&& @sapi_windows_vt100_support($this->stream)
102+
) {
100103
return true;
101104
}
102105

103-
if (\DIRECTORY_SEPARATOR === '\\') {
104-
return (\function_exists('sapi_windows_vt100_support')
105-
&& @sapi_windows_vt100_support($this->stream))
106-
|| false !== getenv('ANSICON')
107-
|| 'ON' === getenv('ConEmuANSI')
108-
|| 'xterm' === getenv('TERM');
109-
}
110-
111-
return stream_isatty($this->stream);
106+
return 'Hyper' === getenv('TERM_PROGRAM')
107+
|| false !== getenv('ANSICON')
108+
|| 'ON' === getenv('ConEmuANSI')
109+
|| str_starts_with((string) getenv('TERM'), 'xterm')
110+
|| stream_isatty($this->stream);
112111
}
113112
}

0 commit comments

Comments
 (0)