Skip to content

Commit 80f9ffa

Browse files
Merge branch '3.4' into 4.2
* 3.4: [PhpUnitBridge] fix running simple-phpunit on Windows fixed phpdocs
2 parents 16bfa2d + 8f1f27c commit 80f9ffa

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

bin/simple-phpunit

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
126126
}
127127
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
128128
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
129+
$q = '\\' === DIRECTORY_SEPARATOR ? '"' : '';
129130
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
130-
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd()));
131+
$exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress --ansi$q", array(), $p, getcwd()));
131132
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
132133
if ($exit) {
133134
exit($exit);

0 commit comments

Comments
 (0)