[PhpUnitBridge][VarDumper] Fix color detection #53794
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
theofidry
reviewed
Feb 5, 2024
| } | ||
|
|
||
| // See https://github.com/chalk/supports-color/blob/d4f413efaf8da045c5ab440ed418ef02dbb28bf1/index.js#L157 | ||
| return preg_match('/^((screen|xterm|vt100|vt220|putty|rxvt|ansi|cygwin|linux).*)|(.*-256(color)?(-bce)?)$/', $term); |
There was a problem hiding this comment.
shouldn't it be @\? (not sure if the pcre extension is declared in the composer.json either
There was a problem hiding this comment.
why would it? preg_match doesn't trigger notices unless the regexp is badly formatted, which it isn't
about ext-pcre, we never list it as a requirement - it's one of the builtin extensions.
stof
reviewed
Feb 7, 2024
| @@ -403,27 +403,58 @@ private static function hasColorSupport() | |||
| return false; | |||
| } | |||
|
|
|||
| if ('Hyper' === getenv('TERM_PROGRAM')) { | |||
| if (!self::isTty()) { | |||
| return true; | |||
There was a problem hiding this comment.
this is broken. For not a TTY, it should says false
| if ('Hyper' === getenv('TERM_PROGRAM')) { | ||
| // Detect msysgit/mingw and assume this is a tty because detection | ||
| // does not work correctly, see https://github.com/composer/composer/issues/9690 | ||
| if (!@stream_isatty($stream) && !\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) { | ||
| return true; |
There was a problem hiding this comment.
The logic in this method does not match the logic in the console component. A stream that is not a TTY must not report supporting colors.
nicolas-grekas
added a commit
that referenced
this pull request
Feb 8, 2024
This PR was merged into the 5.4 branch. Discussion ---------- [PhpUnitBridge][VarDumper] fix color detection | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | | License | MIT reworks the logic changes from #53794 Commits ------- 3a09f2f [PhpUnitBridge][VarDumper] fix color detection
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Porting #53707 to VarDumper and tweaking it a bit.
/cc @theofidry FYI