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

Merge branch '2.7'

pull/12086/head
Jordi Boggiano 2024-09-18 11:00:51 +02:00
parent 8f455d7c0c 07248f4323
commit 8bc8c4383a
No known key found for this signature in database
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,10 +561,16 @@ EOT
} }
$lockFile = Factory::getLockFile($this->json->getPath()); $lockFile = Factory::getLockFile($this->json->getPath());
if (file_exists($lockFile)) { if (file_exists($lockFile)) {
$stabilityFlags = RootPackageLoader::extractStabilityFlags($requirements, $composer->getPackage()->getMinimumStability(), []);
$lockMtime = filemtime($lockFile); $lockMtime = filemtime($lockFile);
$lock = new JsonFile($lockFile); $lock = new JsonFile($lockFile);
$lockData = $lock->read(); $lockData = $lock->read();
$lockData['content-hash'] = Locker::getContentHash($contents); $lockData['content-hash'] = Locker::getContentHash($contents);
foreach ($stabilityFlags as $packageName => $flag) {
$lockData['stability-flags'][$packageName] = $flag;
}
ksort($lockData['stability-flags']);
$lock->write($lockData); $lock->write($lockData);
if (is_int($lockMtime)) { if (is_int($lockMtime)) {
@touch($lockFile, $lockMtime); @touch($lockFile, $lockMtime);

2
src/Composer/Package/Locker.php
View File

@ -373,6 +373,8 @@ class Locker
'prefer-lowest' => $preferLowest, 'prefer-lowest' => $preferLowest,
]; ];
ksort($lock['stability-flags']);
$lock['packages'] = $this->lockPackages($packages); $lock['packages'] = $this->lockPackages($packages);
if (null !== $devPackages) { if (null !== $devPackages) {
$lock['packages-dev'] = $this->lockPackages($devPackages); $lock['packages-dev'] = $this->lockPackages($devPackages);