bug #52941 [Console] Fix xterm detection (theofidry)

fabpot · fabpot · commit 57f60d0758c8 · 2023-12-08T14:29:49.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [Console] Fix xterm detection | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | None reported | License | MIT Currently `StreamOutput::hasColorSupport()` returns `true` if `TERM=xterm`. However xterm may have different values such as `xterm-256color`. Technically I think it would be more correct to check `xterm` or starts with `xterm-`, but I am not convinced there is a need to do so and one may prefer the (tiny) performance advantage? This can easily be changed though. Commits ------- 109c088 fix xterm detection
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -64,9 +64,6 @@ public function getStream()
         return $this->stream;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function doWrite(string $message, bool $newline)
     {
         if ($newline) {
@@ -103,7 +100,7 @@ protected function hasColorSupport()
                 && @sapi_windows_vt100_support($this->stream))
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
-                || 'xterm' === getenv('TERM');
+                || str_starts_with((string) getenv('TERM'), 'xterm');
         }
 
         return 'Hyper' === getenv('TERM_PROGRAM')

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,6 @@ public function getStream()`
`64`	`64`	`return $this->stream;`
`65`	`65`	`}`
`66`	`66`
`67`		`- /**`
`68`		`- * {@inheritdoc}`
`69`		`- */`
`70`	`67`	`protected function doWrite(string $message, bool $newline)`
`71`	`68`	`{`
`72`	`69`	`if ($newline) {`
`@@ -103,7 +100,7 @@ protected function hasColorSupport()`
`103`	`100`	`&& @sapi_windows_vt100_support($this->stream))`
`104`	`101`	`\|\| false !== getenv('ANSICON')`
`105`	`102`	`\|\| 'ON' === getenv('ConEmuANSI')`
`106`		`- \|\| 'xterm' === getenv('TERM');`
	`103`	`+ \|\| str_starts_with((string) getenv('TERM'), 'xterm');`
`107`	`104`	`}`
`108`	`105`
`109`	`106`	`return 'Hyper' === getenv('TERM_PROGRAM')`