minor #52942 Refactor hyper check location (theofidry)

fabpot · fabpot · commit 4496b59be419 · 2023-12-08T14:13:24.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- Refactor hyper check location | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | None | License | MIT Extracted from #52940 to reduce the noise of that PR. There is no logic change, only a potentially a performance (I assume non-existent given it's a if check of a constant). If it is a concern however, this could be checked _before_ the windows specific checks. Commits ------- 9c09e16 refactor: hyper check
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -98,10 +98,6 @@ protected function hasColorSupport()
             return false;
         }
 
-        if ('Hyper' === getenv('TERM_PROGRAM')) {
-            return true;
-        }
-
         if (\DIRECTORY_SEPARATOR === '\\') {
             return (\function_exists('sapi_windows_vt100_support')
                 && @sapi_windows_vt100_support($this->stream))
@@ -110,6 +106,7 @@ protected function hasColorSupport()
                 || 'xterm' === getenv('TERM');
         }
 
-        return stream_isatty($this->stream);
+        return 'Hyper' === getenv('TERM_PROGRAM')
+            || stream_isatty($this->stream);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,6 @@ protected function hasColorSupport()`
`98`	`98`	`return false;`
`99`	`99`	`}`
`100`	`100`
`101`		`- if ('Hyper' === getenv('TERM_PROGRAM')) {`
`102`		`- return true;`
`103`		`- }`
`104`		`-`
`105`	`101`	`if (\DIRECTORY_SEPARATOR === '\\') {`
`106`	`102`	`return (\function_exists('sapi_windows_vt100_support')`
`107`	`103`	`&& @sapi_windows_vt100_support($this->stream))`
`@@ -110,6 +106,7 @@ protected function hasColorSupport()`
`110`	`106`	`\|\| 'xterm' === getenv('TERM');`
`111`	`107`	`}`
`112`	`108`
`113`		`- return stream_isatty($this->stream);`
	`109`	`+ return 'Hyper' === getenv('TERM_PROGRAM')`
	`110`	`+ \|\| stream_isatty($this->stream);`
`114`	`111`	`}`
`115`	`112`	`}`