Skip to content

Fix #218: Respect composer lock #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix #218: Respect composer lock #232

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5a3da1
Fix wikimedia#218: Respect composer lock
raileanunalexandru Jun 17, 2022
b118130
Merge pull request #1 from raileanunalexandru/raileanunalexandru-patc…
raileanunalexandru Oct 19, 2022
aec879f
Merge pull request #3 from raileanunalexandru/bugfix/respect_composer…
raileanunalexandru Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/MergePlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down