From 76c4b7fe74cc2e91d14d7cb6f20410c049e19b99 Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 16 Jan 2021 14:13:07 +0700 Subject: [PATCH] [ticket/16650] Fix composer 2 compatibility issues PHPBB3-16650 --- phpBB/phpbb/composer/installer.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 9b356a5257..9910cb5a08 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -14,6 +14,7 @@ namespace phpbb\composer; use Composer\Composer; +use Composer\DependencyResolver\Request as composer_request; use Composer\Factory; use Composer\IO\IOInterface; use Composer\IO\NullIO; @@ -159,7 +160,7 @@ class installer $composer = Factory::create($io, $this->get_composer_ext_json_filename(), false); $install = \Composer\Installer::create($io, $composer); - $composer->getDownloadManager()->setOutputProgress(false); + $composer->getInstallationManager()->setOutputProgress(false); $install ->setVerbose(true) @@ -167,8 +168,8 @@ class installer ->setPreferDist(true) ->setDevMode(false) ->setUpdate(true) - ->setUpdateWhitelist($whitelist) - ->setWhitelistDependencies(false) + ->setUpdateAllowList($whitelist) + ->setUpdateAllowTransitiveDependencies(composer_request::UPDATE_ONLY_LISTED) ->setIgnorePlatformRequirements(false) ->setOptimizeAutoloader(true) ->setDumpAutoloader(true)