From d7898243cb940d6eb62ca1a1f38592fa1837440b Mon Sep 17 00:00:00 2001 From: Oscaner Miao Date: Thu, 10 Jun 2021 17:15:10 +0800 Subject: [PATCH] Fix #218: Respect composer lock, no force update any packages during package install. --- src/MergePlugin.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/MergePlugin.php b/src/MergePlugin.php index f6cccf3..e9b959c 100644 --- a/src/MergePlugin.php +++ b/src/MergePlugin.php @@ -366,7 +366,14 @@ public function onPostInstallOrUpdate(ScriptEvent $event) $this->state->shouldOptimizeAutoloader() ); - $installer->setUpdate(true); + if ($this->state->forceUpdate()) { + // Force update mode so that new packages are processed rather + // than just telling the user that composer.json and + // composer.lock don't match. + $installer->setUpdate(true); + } else { + $this->logger->log('You may need to manually run composer update to apply merge settings'); + } if ($this->state->isComposer1()) { $installer->setUpdateWhitelist($requirements);