From f9eb2905c7e8820c35ab87559e3e8bb53dff0132 Mon Sep 17 00:00:00 2001 From: Raileanu Nicolaie Alexandru Date: Wed, 19 Oct 2022 17:51:26 +0300 Subject: [PATCH] Fix #218: Respect composer lock --- src/MergePlugin.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/MergePlugin.php b/src/MergePlugin.php index a9af5b6..d776b1d 100644 --- a/src/MergePlugin.php +++ b/src/MergePlugin.php @@ -370,7 +370,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()) { // setUpdateWhitelist() only exists in composer 1.x. Configure as to run phan against composer 2.x