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

Fix lock file being more recent than vendor dir when require guesses the constraint after resolution, fixes #11405

pull/11455/head
Jordi Boggiano 2023-05-05 14:14:26 +02:00
parent 766628a8d4
commit 2d2d22d0ec
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Command/RequireCommand.php
View File

@ -551,10 +551,15 @@ EOT
if (false === $contents) { if (false === $contents) {
throw new \RuntimeException('Unable to read '.$this->json->getPath().' contents to update the lock file hash.'); throw new \RuntimeException('Unable to read '.$this->json->getPath().' contents to update the lock file hash.');
} }
$lock = new JsonFile(Factory::getLockFile($this->json->getPath())); $lockFile = Factory::getLockFile($this->json->getPath());
$lockMtime = filemtime($lockFile);
$lock = new JsonFile($lockFile);
$lockData = $lock->read(); $lockData = $lock->read();
$lockData['content-hash'] = Locker::getContentHash($contents); $lockData['content-hash'] = Locker::getContentHash($contents);
$lock->write($lockData); $lock->write($lockData);
if (is_int($lockMtime)) {
@touch($lockFile, $lockMtime);
}
} }
} }