Skip to content

Commit 1b7f8aa

Browse files
committed
Merge branch '5.4' into 6.3
* 5.4: run composer update for compatibility with PHPUnit versions shipping composer.lock add parameter types in query builder
2 parents 4561090 + f1428fe commit 1b7f8aa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Diff for: bin/simple-phpunit.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@
265265
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
266266
$q = '\\' === \DIRECTORY_SEPARATOR && \PHP_VERSION_ID < 80000 ? '"' : '';
267267
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
268-
$exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));
268+
$exit = proc_close(proc_open("$q$COMPOSER update --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));
269269
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
270270
if ($prevCacheDir) {
271271
putenv("COMPOSER_CACHE_DIR=$prevCacheDir");

0 commit comments

Comments
 (0)