Check the option names for values never and always

kick-the-bucket · kick-the-bucket · commit 9063c5a7935d · 2020-06-09T12:18:15.000+03:00
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -72,9 +72,9 @@ if (false === $COMPOSER = \getenv('COMPOSER_BINARY')) {
         ? (file_get_contents($COMPOSER, false, null, 0, 18) === '#!/usr/bin/env php' ? $PHP : '').' '.escapeshellarg($COMPOSER) // detect shell wrappers by looking at the shebang
         : 'composer';
 }
-if (in_array('never', $argv, true) || in_array('--colors=never', $argv, true)) {
+if (in_array('--colors=never', $argv, true) || ($argv[array_search('never', $argv, true) - 1] ?? '') === '--colors') {
     $COMPOSER .= ' --no-ansi';
-} elseif (in_array('always', $argv, true) || in_array('colors=always', $argv, true)) {
+} elseif (in_array('--colors=always', $argv, true) || ($argv[array_search('always', $argv, true) - 1] ?? '') === '--colors') {
     $COMPOSER .= ' --ansi';
 }
 

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,9 @@ if (false === $COMPOSER = \getenv('COMPOSER_BINARY')) {`
`72`	`72`	`? (file_get_contents($COMPOSER, false, null, 0, 18) === '#!/usr/bin/env php' ? $PHP : '').' '.escapeshellarg($COMPOSER) // detect shell wrappers by looking at the shebang`
`73`	`73`	`: 'composer';`
`74`	`74`	`}`
`75`		`-if (in_array('never', $argv, true) \|\| in_array('--colors=never', $argv, true)) {`
	`75`	`+if (in_array('--colors=never', $argv, true) \|\| ($argv[array_search('never', $argv, true) - 1] ?? '') === '--colors') {`
`76`	`76`	`$COMPOSER .= ' --no-ansi';`
`77`		`-} elseif (in_array('always', $argv, true) \|\| in_array('colors=always', $argv, true)) {`
	`77`	`+} elseif (in_array('--colors=always', $argv, true) \|\| ($argv[array_search('always', $argv, true) - 1] ?? '') === '--colors') {`
`78`	`78`	`$COMPOSER .= ' --ansi';`
`79`	`79`	`}`
`80`	`80`