Skip to content

Commit c2d059b

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: run composer update for compatibility with PHPUnit versions shipping composer.lock [AssetMapper] Upgrade asset mapper to 6.4 fails due to invalid entries "downloaded_to" and "preload" add parameter types in query builder
2 parents 5092bc7 + cca5373 commit c2d059b

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
@@ -263,7 +263,7 @@
263263
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
264264
$q = '\\' === \DIRECTORY_SEPARATOR && \PHP_VERSION_ID < 80000 ? '"' : '';
265265
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
266-
$exit = proc_close(proc_open("$q$COMPOSER install --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));
266+
$exit = proc_close(proc_open("$q$COMPOSER update --no-dev --prefer-dist --no-progress $q", [], $p, getcwd()));
267267
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
268268
if ($prevCacheDir) {
269269
putenv("COMPOSER_CACHE_DIR=$prevCacheDir");

0 commit comments

Comments
 (0)