Skip to content

Commit d5f4330

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: bumped Symfony version to 2.8.46 updated VERSION for 2.8.45 update CONTRIBUTORS for 2.8.45 updated CHANGELOG for 2.8.45 [PhpUnitBridge] keep compat with composer 1.0 Instantiate $offset and $maxlen at definition
2 parents 94512ff + f4fde1e commit d5f4330

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
@@ -130,7 +130,8 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
130130
}
131131
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
132132
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
133-
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-suggest --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
133+
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
134+
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
134135
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
135136
if ($exit) {
136137
exit($exit);

0 commit comments

Comments
 (0)