bug #57997 [Console][PhpUnitBridge][VarDumper] Fix handling NO_COLOR env var (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit faa8ebdd86a1 · 2024-08-13T16:25:05.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Console][PhpUnitBridge][VarDumper] Fix handling NO_COLOR env var | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT https://no-color.org/ stipulates that only the empty string should be considered as false. The current code also accepts `0` erroneously. Commits ------- 4ae8384 [PhpUnitBridge][Console][VarDumper] Fix handling NO_COLOR env var
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 ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
+        if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {
             return false;
         }
 
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 ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
+        if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {
             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 ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
+        if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {
             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 ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {`
	`413`	`+ if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {`
`414`	`414`	`return false;`
`415`	`415`	`}`
`416`	`416`
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 ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {`
	`94`	`+ if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {`
`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 ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {`
	`609`	`+ if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {`
`610`	`610`	`return false;`
`611`	`611`	`}`
`612`	`612`