Skip to content

Commit e505247

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: skip interactive questions asked by Composer [SecurityBundle] Remove `AnonymousFactory` leftovers [Translation] Validate of pt_BR translation by a native speaker
2 parents 4b4ddb7 + 7a4a92d commit e505247

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

bin/simple-phpunit.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@
240240
$passthruOrFail("$COMPOSER require --no-update --no-interaction ".$SYMFONY_PHPUNIT_REQUIRE);
241241
}
242242
if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
243-
$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
243+
$passthruOrFail("$COMPOSER require --no-update --no-interaction phpunit/phpunit-mock-objects \"~3.1.0\"");
244244
}
245245

246246
if (preg_match('{\^((\d++\.)\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[2].'99', \PHP_VERSION, '<')) {
@@ -256,13 +256,13 @@
256256
if (realpath($p) === realpath($path)) {
257257
$path = $p;
258258
}
259-
$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
259+
$passthruOrFail("$COMPOSER require --no-update --no-interaction symfony/phpunit-bridge \"*@dev\"");
260260
$passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', \DIRECTORY_SEPARATOR, $path)));
261261
if ('\\' === \DIRECTORY_SEPARATOR) {
262262
file_put_contents('composer.json', preg_replace('/^( {8})"phpunit-bridge": \{$/m', "$0\n$1 ".'"options": {"symlink": false},', file_get_contents('composer.json')));
263263
}
264264
} else {
265-
$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*\"");
265+
$passthruOrFail("$COMPOSER require --no-update --no-interaction symfony/phpunit-bridge \"*\"");
266266
}
267267
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
268268
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");

0 commit comments

Comments
 (0)