Merge branch 'PHP-7.4'

nikic · nikic · commit 1d0247db7d86 · 2020-01-24T12:28:54.000+01:00
* PHP-7.4:
  Don't use CRLF when generating diffs
diff --git a/run-tests.php b/run-tests.php
@@ -2918,7 +2918,7 @@ function generate_diff($wanted, $wanted_re, $output)
 	$r = is_null($wanted_re) ? $w : explode("\n", $wanted_re);
 	$diff = generate_array_diff($r, $o, !is_null($wanted_re), $w);
 
-	return implode("\r\n", $diff);
+	return implode(PHP_EOL, $diff);
 }
 
 function error($message)

Original file line number	Diff line number	Diff line change
`@@ -2918,7 +2918,7 @@ function generate_diff($wanted, $wanted_re, $output)`
`2918`	`2918`	`$r = is_null($wanted_re) ? $w : explode("\n", $wanted_re);`
`2919`	`2919`	`$diff = generate_array_diff($r, $o, !is_null($wanted_re), $w);`
`2920`	`2920`
`2921`		`- return implode("\r\n", $diff);`
	`2921`	`+ return implode(PHP_EOL, $diff);`
`2922`	`2922`	`}`
`2923`	`2923`
`2924`	`2924`	`function error($message)`