minor #53856 [PhpUnitBridge][VarDumper] fix color detection (xabbuh)

nicolas-grekas · nicolas-grekas · commit 0b75c969e708 · 2024-02-08T15:04:20.000+01:00
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
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -404,13 +404,10 @@ private static function hasColorSupport()
         }
 
         if (!self::isTty()) {
-            return true;
+            return false;
         }
 
-        if ('\\' === \DIRECTORY_SEPARATOR
-            && \function_exists('sapi_windows_vt100_support')
-            && @sapi_windows_vt100_support(\STDOUT)
-        ) {
+        if ('\\' === \DIRECTORY_SEPARATOR && \function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(\STDOUT)) {
             return true;
         }
 
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -95,7 +95,9 @@ protected function hasColorSupport()
             return false;
         }
 
-        if (!$this->isTty()) {
+        // 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($this->stream) && !\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {
             return false;
         }
 
@@ -118,21 +120,4 @@ protected function hasColorSupport()
         // 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);
     }
-
-    /**
-     * Checks if the stream is a TTY, i.e; whether the output stream is connected to a terminal.
-     *
-     * Reference: Composer\Util\Platform::isTty
-     * https://github.com/composer/composer
-     */
-    private function isTty(): bool
-    {
-        // Detect msysgit/mingw and assume this is a tty because detection
-        // does not work correctly, see https://github.com/composer/composer/issues/9690
-        if (\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {
-            return true;
-        }
-
-        return @stream_isatty($this->stream);
-    }
 }
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -613,7 +613,7 @@ private function hasColorSupport($stream): bool
         // 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;
+            return false;
         }
 
         if ('\\' === \DIRECTORY_SEPARATOR && @sapi_windows_vt100_support($stream)) {

Original file line number	Diff line number	Diff line change
`@@ -404,13 +404,10 @@ private static function hasColorSupport()`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`if (!self::isTty()) {`
`407`		`- return true;`
	`407`	`+ return false;`
`408`	`408`	`}`
`409`	`409`
`410`		`- if ('\\' === \DIRECTORY_SEPARATOR`
`411`		`- && \function_exists('sapi_windows_vt100_support')`
`412`		`- && @sapi_windows_vt100_support(\STDOUT)`
`413`		`- ) {`
	`410`	`+ if ('\\' === \DIRECTORY_SEPARATOR && \function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(\STDOUT)) {`
`414`	`411`	`return true;`
`415`	`412`	`}`
`416`	`413`
Original file line number	Diff line number	Diff line change
`@@ -613,7 +613,7 @@ private function hasColorSupport($stream): bool`
`613`	`613`	`// Detect msysgit/mingw and assume this is a tty because detection`
`614`	`614`	`// does not work correctly, see https://github.com/composer/composer/issues/9690`
`615`	`615`	`if (!@stream_isatty($stream) && !\in_array(strtoupper((string) getenv('MSYSTEM')), ['MINGW32', 'MINGW64'], true)) {`
`616`		`- return true;`
	`616`	`+ return false;`
`617`	`617`	`}`
`618`	`618`
`619`	`619`	`if ('\\' === \DIRECTORY_SEPARATOR && @sapi_windows_vt100_support($stream)) {`