bug #57815 [Console][PhpUnitBridge][VarDumper] Fix NO_COLOR empty value handling (alexandre-daubois)

nicolas-grekas · nicolas-grekas · commit d4c681c4f624 · 2024-07-26T14:23:09.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Console][PhpUnitBridge][VarDumper] Fix `NO_COLOR` empty value handling | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | #57777 (comment) | License | MIT `NO_COLOR` must be non-empty in order to be considered enabled (https://no-color.org/): > when present and not an empty string (regardless of its value) Commits ------- 6a96ff9 [Console][PhpUnitBridge][VarDumper] Fix `NO_COLOR` empty value handling
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -410,7 +410,7 @@ private static function hasColorSupport()
         }
 
         // Follow https://no-color.org/
-        if (isset($_SERVER['NO_COLOR']) || false !== getenv('NO_COLOR')) {
+        if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
             return false;
         }
 
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -368,7 +368,7 @@ class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\Bla
     }
 }
 
-$cmd[0] = sprintf('%s %s --colors=%s', $PHP, escapeshellarg("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit"), false === $getEnvVar('NO_COLOR') ? 'always' : 'never');
+$cmd[0] = sprintf('%s %s --colors=%s', $PHP, escapeshellarg("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit"), '' === $getEnvVar('NO_COLOR', '') ? 'always' : 'never');
 $cmd = str_replace('%', '%%', implode(' ', $cmd)).' %1$s';
 
 if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -458,7 +458,7 @@ class SymfonyExcludeListSimplePhpunit
         {
         }
     }
-    array_splice($argv, 1, 0, ['--colors='.(false === $getEnvVar('NO_COLOR') ? 'always' : 'never')]);
+    array_splice($argv, 1, 0, ['--colors='.('' === $getEnvVar('NO_COLOR', '') ? 'always' : 'never')]);
     $_SERVER['argv'] = $argv;
     $_SERVER['argc'] = ++$argc;
     include "$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit";
diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php
@@ -91,7 +91,7 @@ protected function doWrite(string $message, bool $newline)
     protected function hasColorSupport()
     {
         // Follow https://no-color.org/
-        if (isset($_SERVER['NO_COLOR']) || false !== getenv('NO_COLOR')) {
+        if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
             return false;
         }
 
diff --git a/src/Symfony/Component/VarDumper/Dumper/CliDumper.php b/src/Symfony/Component/VarDumper/Dumper/CliDumper.php
@@ -606,7 +606,7 @@ private function hasColorSupport($stream): bool
         }
 
         // Follow https://no-color.org/
-        if (isset($_SERVER['NO_COLOR']) || false !== getenv('NO_COLOR')) {
+        if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
             return false;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ private static function hasColorSupport()`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`// Follow https://no-color.org/`
`413`		`- if (isset($_SERVER['NO_COLOR']) \|\| false !== getenv('NO_COLOR')) {`
	`413`	`+ if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {`
`414`	`414`	`return false;`
`415`	`415`	`}`
`416`	`416`
Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\Bla`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`
`371`		`-$cmd[0] = sprintf('%s %s --colors=%s', $PHP, escapeshellarg("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit"), false === $getEnvVar('NO_COLOR') ? 'always' : 'never');`
	`371`	`+$cmd[0] = sprintf('%s %s --colors=%s', $PHP, escapeshellarg("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit"), '' === $getEnvVar('NO_COLOR', '') ? 'always' : 'never');`
`372`	`372`	`$cmd = str_replace('%', '%%', implode(' ', $cmd)).' %1$s';`
`373`	`373`
`374`	`374`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`@@ -458,7 +458,7 @@ class SymfonyExcludeListSimplePhpunit`
`458`	`458`	`{`
`459`	`459`	`}`
`460`	`460`	`}`
`461`		`- array_splice($argv, 1, 0, ['--colors='.(false === $getEnvVar('NO_COLOR') ? 'always' : 'never')]);`
	`461`	`+ array_splice($argv, 1, 0, ['--colors='.('' === $getEnvVar('NO_COLOR', '') ? 'always' : 'never')]);`
`462`	`462`	`$_SERVER['argv'] = $argv;`
`463`	`463`	`$_SERVER['argc'] = ++$argc;`
`464`	`464`	`include "$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit";`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ protected function doWrite(string $message, bool $newline)`
`91`	`91`	`protected function hasColorSupport()`
`92`	`92`	`{`
`93`	`93`	`// Follow https://no-color.org/`
`94`		`- if (isset($_SERVER['NO_COLOR']) \|\| false !== getenv('NO_COLOR')) {`
	`94`	`+ if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {`
`95`	`95`	`return false;`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,7 @@ private function hasColorSupport($stream): bool`
`606`	`606`	`}`
`607`	`607`
`608`	`608`	`// Follow https://no-color.org/`
`609`		`- if (isset($_SERVER['NO_COLOR']) \|\| false !== getenv('NO_COLOR')) {`
	`609`	`+ if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {`
`610`	`610`	`return false;`
`611`	`611`	`}`
`612`	`612`