Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit 16ed5bdfd18e · 2024-02-08T15:08:19.000+01:00
* 5.4:
  [PhpUnitBridge][VarDumper] fix color detection
  [CI] Make sure we preserve file-&gt;header when we run sync-translations.php
  Review validators.sl.xlf
diff --git a/DeprecationErrorHandler.php b/DeprecationErrorHandler.php
@@ -412,13 +412,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;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -412,13 +412,10 @@ private static function hasColorSupport()`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`if (!self::isTty()) {`
`415`		`- return true;`
	`415`	`+ return false;`
`416`	`416`	`}`
`417`	`417`
`418`		`- if ('\\' === \DIRECTORY_SEPARATOR`
`419`		`- && \function_exists('sapi_windows_vt100_support')`
`420`		`- && @sapi_windows_vt100_support(\STDOUT)`
`421`		`- ) {`
	`418`	`+ if ('\\' === \DIRECTORY_SEPARATOR && \function_exists('sapi_windows_vt100_support') && @sapi_windows_vt100_support(\STDOUT)) {`
`422`	`419`	`return true;`
`423`	`420`	`}`
`424`	`421`