Merge branch '5.0' into 5.1

nicolas-grekas · nicolas-grekas · commit f1f8b04b7b5d · 2020-05-21T00:29:05.000+02:00
* 5.0:
  fix merge
diff --git a/bin/simple-phpunit.php b/bin/simple-phpunit.php
@@ -165,7 +165,7 @@
     }
 
     $info = [];
-    foreach (explode("\n", `$COMPOSER info -a -n phpunit/phpunit "$PHPUNIT_VERSION.*"`) as $line) {
+    foreach (explode("\n", `$COMPOSER info --no-ansi -a -n phpunit/phpunit "$PHPUNIT_VERSION.*"`) as $line) {
         $line = rtrim($line);
 
         if (!$info && preg_match('/^versions +: /', $line)) {

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`$info = [];`
`168`		- foreach (explode("\n", `$COMPOSER info -a -n phpunit/phpunit "$PHPUNIT_VERSION.*"`) as $line) {
	`168`	+ foreach (explode("\n", `$COMPOSER info --no-ansi -a -n phpunit/phpunit "$PHPUNIT_VERSION.*"`) as $line) {
`169`	`169`	`$line = rtrim($line);`
`170`	`170`
`171`	`171`	`if (!$info && preg_match('/^versions +: /', $line)) {`