public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix lock file being parsed when not strictly needed, fixes #9452

pull/9461/head
Jordi Boggiano 2020-11-11 11:57:08 +01:00
parent b8e40f6060
commit 00dfd2c8e1
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Composer/Installer.php
View File

@ -360,8 +360,17 @@ class Installer
$lockedRepository = null;
if ($this->locker->isLocked()) {
$lockedRepository = $this->locker->getLockedRepository(true);
try {
if ($this->locker->isLocked()) {
$lockedRepository = $this->locker->getLockedRepository(true);
}
} catch (\Seld\JsonLint\ParsingException $e) {
if ($this->updateAllowList || $this->updateMirrors) {
// in case we are doing a partial update or updating mirrors, the lock file is needed so we error
throw $e;
}
// otherwise, ignoring parse errors as the lock file will be regenerated from scratch when
// doing a full update
}
if ($this->updateAllowList) {