8000 !fixup [PhpUnitBridge] Search for composer.phar in git root folder · symfony/symfony@dfd1f18 · GitHub
[go: up one dir, main page]

Skip to content

Commit dfd1f18

Browse files
authored
!fixup [PhpUnitBridge] Search for composer.phar in git root folder
Add separate call for Windows that redirects stderr to `NUL` instead of `/dev/null`
1 parent 22cd89c commit dfd1f18

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
$COMPOSER = file_exists($COMPOSER = $oldPwd.'/composer.phar')
100100
|| ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer.phar`) : `which composer.phar 2> /dev/null`))
101101
|| ($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? preg_replace('/[\r\n].*/', '', `where.exe composer`) : `which composer 2> /dev/null`))
102-
|| file_exists($COMPOSER = rtrim(`git rev-parse --show-toplevel 2> /dev/null`).DIRECTORY_SEPARATOR.'composer.phar')
102+
|| file_exists($COMPOSER = rtrim('\\' === DIRECTORY_SEPARATOR ? `git rev-parse --show-toplevel 2> NUL` : `git rev-parse --show-toplevel 2> /dev/null`).DIRECTORY_SEPARATOR.'composer.phar')
103103
? $PHP.' '.escapeshellarg($COMPOSER)
104104
: 'composer';
105105

0 commit comments

Comments
 (0)
0