Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit c24bec99f02b · 2023-06-02T17:36:41.000+02:00
* 5.4:
  Fix Doctrine deprecations
  [Validator] Remove internal from methods on non-internal interfaces
  [PhpUnitBridge] Fix support for the NO_COLOR env var
diff --git a/bin/simple-phpunit.php b/bin/simple-phpunit.php
@@ -368,7 +368,7 @@ class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\Bla
     }
 }
 
-$cmd[0] = sprintf('%s %s --colors=always', $PHP, escapeshellarg("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit"));
+$cmd[0] = sprintf('%s %s --colors=%s', $PHP, escapeshellarg("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit"), false === $getEnvVar('NO_COLOR') ? 'always' : 'never');
 $cmd = str_replace('%', '%%', implode(' ', $cmd)).' %1$s';
 
 if ('\\' === \DIRECTORY_SEPARATOR) {
@@ -435,7 +435,7 @@ class SymfonyExcludeListSimplePhpunit
         {
         }
     }
-    array_splice($argv, 1, 0, ['--colors=always']);
+    array_splice($argv, 1, 0, ['--colors='.(false === $getEnvVar('NO_COLOR') ? 'always' : 'never')]);
     $_SERVER['argv'] = $argv;
     $_SERVER['argc'] = ++$argc;
     include "$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit";

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ class_exists(\SymfonyExcludeListSimplePhpunit::class, false) && PHPUnit\Util\Bla`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`
`371`		`-$cmd[0] = sprintf('%s %s --colors=always', $PHP, escapeshellarg("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit"));`
	`371`	`+$cmd[0] = sprintf('%s %s --colors=%s', $PHP, escapeshellarg("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit"), false === $getEnvVar('NO_COLOR') ? 'always' : 'never');`
`372`	`372`	`$cmd = str_replace('%', '%%', implode(' ', $cmd)).' %1$s';`
`373`	`373`
`374`	`374`	`if ('\\' === \DIRECTORY_SEPARATOR) {`
`@@ -435,7 +435,7 @@ class SymfonyExcludeListSimplePhpunit`
`435`	`435`	`{`
`436`	`436`	`}`
`437`	`437`	`}`
`438`		`- array_splice($argv, 1, 0, ['--colors=always']);`
	`438`	`+ array_splice($argv, 1, 0, ['--colors='.(false === $getEnvVar('NO_COLOR') ? 'always' : 'never')]);`
`439`	`439`	`$_SERVER['argv'] = $argv;`
`440`	`440`	`$_SERVER['argc'] = ++$argc;`
`441`	`441`	`include "$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit";`