Skip to content

Commit 860206b

Browse files
Merge branch '6.4' into 7.2
* 6.4: [Validator] review cs tran Fix building packages in the CI implicitly run all Composer commands non-interactively [FrameworkBundle] ensureKernelShutdown in tearDownAfterClass
2 parents a8186c5 + 0d26168 commit 860206b

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

bin/simple-phpunit.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@
138138
'COMPOSER' => 'composer.json',
139139
'COMPOSER_VENDOR_DIR' => 'vendor',
140140
'COMPOSER_BIN_DIR' => 'bin',
141+
'COMPOSER_NO_INTERACTION' => '1',
141142
'SYMFONY_SIMPLE_PHPUNIT_BIN_DIR' => __DIR__,
142143
];
143144

@@ -234,13 +235,13 @@
234235
@copy("$PHPUNIT_VERSION_DIR/phpunit.xsd", 'phpunit.xsd');
235236
chdir("$PHPUNIT_VERSION_DIR");
236237
if ($SYMFONY_PHPUNIT_REMOVE) {
237-
$passthruOrFail("$COMPOSER remove --no-update --no-interaction ".$SYMFONY_PHPUNIT_REMOVE);
238+
$passthruOrFail("$COMPOSER remove --no-update ".$SYMFONY_PHPUNIT_REMOVE);
238239
}
239240
if ($SYMFONY_PHPUNIT_REQUIRE) {
240-
$passthruOrFail("$COMPOSER require --no-update --no-interaction ".$SYMFONY_PHPUNIT_REQUIRE);
241+
$passthruOrFail("$COMPOSER require --no-update ".$SYMFONY_PHPUNIT_REQUIRE);
241242
}
242243
if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
243-
$passthruOrFail("$COMPOSER require --no-update --no-interaction phpunit/phpunit-mock-objects \"~3.1.0\"");
244+
$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");
244245
}
245246

246247
if (preg_match('{\^((\d++\.)\d++)[\d\.]*$}', $info['requires']['php'], $phpVersion) && version_compare($phpVersion[2].'99', \PHP_VERSION, '<')) {
@@ -256,13 +257,13 @@
256257
if (realpath($p) === realpath($path)) {
257258
$path = $p;
258259
}
259-
$passthruOrFail("$COMPOSER require --no-update --no-interaction symfony/phpunit-bridge \"*@dev\"");
260+
$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*@dev\"");
260261
$passthruOrFail("$COMPOSER config repositories.phpunit-bridge path ".escapeshellarg(str_replace('/', \DIRECTORY_SEPARATOR, $path)));
261262
if ('\\' === \DIRECTORY_SEPARATOR) {
262263
file_put_contents('composer.json', preg_replace('/^( {8})"phpunit-bridge": \{$/m', "$0\n$1 ".'"options": {"symlink": false},', file_get_contents('composer.json')));
263264
}
264265
} else {
265-
$passthruOrFail("$COMPOSER require --no-update --no-interaction symfony/phpunit-bridge \"*\"");
266+
$passthruOrFail("$COMPOSER require --no-update symfony/phpunit-bridge \"*\"");
266267
}
267268
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
268269
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");

0 commit comments

Comments
 (0)