Check for Hyper terminal on all operating systems.

azjezz · nicolas-grekas · commit 196e708b68a1 · 2018-07-04T17:34:47.000+02:00
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -226,13 +226,16 @@ private static 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(STDOUT))
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
-                || 'xterm' === getenv('TERM')
-                || 'Hyper' === getenv('TERM_PROGRAM');
+                || 'xterm' === getenv('TERM');
         }
 
         if (function_exists('stream_isatty')) {
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -93,13 +93,16 @@ protected function doWrite($message, $newline)
      */
     protected function hasColorSupport()
     {
+        if ('Hyper' === getenv('TERM_PROGRAM')) {
+            return true;
+        }
+
         if (DIRECTORY_SEPARATOR === '\\') {
             return (function_exists('sapi_windows_vt100_support')
                 && @sapi_windows_vt100_support($this->stream))
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
-                || 'xterm' === getenv('TERM')
-                || 'Hyper' === getenv('TERM_PROGRAM');
+                || 'xterm' === getenv('TERM');
         }
 
         if (function_exists('stream_isatty')) {
diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php
@@ -271,7 +271,7 @@ public function createProgressBar($max = 0)
     {
         $progressBar = parent::createProgressBar($max);
 
-        if ('\\' !== DIRECTORY_SEPARATOR ||  'Hyper' === getenv('TERM_PROGRAM')) {
+        if ('\\' !== DIRECTORY_SEPARATOR || 'Hyper' === getenv('TERM_PROGRAM')) {
             $progressBar->setEmptyBarCharacter('░'); // light shade character \u2591
             $progressBar->setProgressCharacter('');
             $progressBar->setBarCharacter('▓'); // dark shade character \u2593
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -479,13 +479,16 @@ private function hasColorSupport($stream)
             return false;
         }
 
+        if ('Hyper' === getenv('TERM_PROGRAM')) {
+            return true;
+        }
+
         if (DIRECTORY_SEPARATOR === '\\') {
             return (function_exists('sapi_windows_vt100_support')
                 && @sapi_windows_vt100_support($stream))
                 || false !== getenv('ANSICON')
                 || 'ON' === getenv('ConEmuANSI')
-                || 'xterm' === getenv('TERM')
-                || 'Hyper' === getenv('TERM_PROGRAM');
+                || 'xterm' === getenv('TERM');
         }
 
         if (function_exists('stream_isatty')) {

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ public function createProgressBar($max = 0)`
`271`	`271`	`{`
`272`	`272`	`$progressBar = parent::createProgressBar($max);`
`273`	`273`
`274`		`- if ('\\' !== DIRECTORY_SEPARATOR \|\| 'Hyper' === getenv('TERM_PROGRAM')) {`
	`274`	`+ if ('\\' !== DIRECTORY_SEPARATOR \|\| 'Hyper' === getenv('TERM_PROGRAM')) {`
`275`	`275`	`$progressBar->setEmptyBarCharacter('░'); // light shade character \u2591`
`276`	`276`	`$progressBar->setProgressCharacter('');`
`277`	`277`	`$progressBar->setBarCharacter('▓'); // dark shade character \u2593`