Skip to content

Commit c6e6a81

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Backport changes to prepare typed properties Cast ini_get to an integer to match expected type Add no-interaction for SYMFONY_PHPUNIT_REMOVE Add no-interaction for SYMFONY_PHPUNIT_REQUIRE on prophecy Fix deps [Mailer] Added OhMySMTP Bridge [Notifier] Add Esendex message ID to SentMessage object Remove indices in messenger table on MySQL to prevent deadlocks while removing messages when running multiple consumers autoconfigure chatter.transport_factory Handle ignoreExtraKeys in config builder
2 parents 48b0bbc + d768afa commit c6e6a81

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

bin/simple-phpunit.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@
224224
@copy("$PHPUNIT_VERSION_DIR/phpunit.xsd", 'phpunit.xsd');
225225
chdir("$PHPUNIT_VERSION_DIR");
226226
if ($SYMFONY_PHPUNIT_REMOVE) {
227-
$passthruOrFail("$COMPOSER remove --no-update ".$SYMFONY_PHPUNIT_REMOVE);
227+
$passthruOrFail("$COMPOSER remove --no-update --no-interaction ".$SYMFONY_PHPUNIT_REMOVE);
228228
}
229229
if ($SYMFONY_PHPUNIT_REQUIRE) {
230-
$passthruOrFail("$COMPOSER require --no-update ".$SYMFONY_PHPUNIT_REQUIRE);
230+
$passthruOrFail("$COMPOSER require --no-update --no-interaction ".$SYMFONY_PHPUNIT_REQUIRE);
231231
}
232232
if (5.1 <= $PHPUNIT_VERSION && $PHPUNIT_VERSION < 5.4) {
233233
$passthruOrFail("$COMPOSER require --no-update phpunit/phpunit-mock-objects \"~3.1.0\"");

0 commit comments

Comments
 (0)