Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit 8fd821e2ad09 · 2024-08-13T16:27:37.000+02:00
* 5.4:
  Replace external FTP server by a local docker instance
  [PhpUnitBridge][Console][VarDumper] Fix handling NO_COLOR env var
diff --git a/Dumper/CliDumper.php b/Dumper/CliDumper.php
@@ -621,7 +621,7 @@ private function hasColorSupport(mixed $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
`@@ -621,7 +621,7 @@ private function hasColorSupport(mixed $stream): bool`
`621`	`621`	`}`
`622`	`622`
`623`	`623`	`// Follow https://no-color.org/`
`624`		`- if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {`
	`624`	`+ if ('' !== (($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR'))[0] ?? '')) {`
`625`	`625`	`return false;`
`626`	`626`	`}`
`627`	`627`