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

Make sure update mirrors/--lock keeps the release date of the original reference when dev versions have newer commits, refs #9812

pull/9821/head
Jordi Boggiano 2021-04-08 11:54:39 +02:00
parent 0ab4013788
commit e6cede4a61
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Composer/DependencyResolver/LockTransaction.php
View File

@ -93,12 +93,13 @@ class LockTransaction extends Transaction
// we do not reset references if the currently present package didn't have any, or if the type of VCS has changed // we do not reset references if the currently present package didn't have any, or if the type of VCS has changed
if ($updateMirrors && !isset($this->presentMap[spl_object_hash($package)])) { if ($updateMirrors && !isset($this->presentMap[spl_object_hash($package)])) {
foreach ($this->presentMap as $presentPackage) { foreach ($this->presentMap as $presentPackage) {
if ($package->getName() == $presentPackage->getName() && if ($package->getName() == $presentPackage->getName() && $package->getVersion() == $presentPackage->getVersion()) {
$package->getVersion() == $presentPackage->getVersion() && if ($presentPackage->getSourceReference() && $presentPackage->getSourceType() === $package->getSourceType()) {
$presentPackage->getSourceReference() && $package->setSourceDistReferences($presentPackage->getSourceReference());
$presentPackage->getSourceType() === $package->getSourceType() }
) { if ($presentPackage->getReleaseDate()) {
$package->setSourceDistReferences($presentPackage->getSourceReference()); $package->setReleaseDate($presentPackage->getReleaseDate());
}
} }
} }
} }

2
tests/Composer/Test/Fixtures/installer/update-mirrors-changes-url.test
View File

@ -154,7 +154,7 @@ g/g is dev and installed in a different ref than the #ref, so it gets updated an
"name": "a/a", "version": "dev-master", "name": "a/a", "version": "dev-master",
"source": { "reference": "1111111111111111111111111111111111111111", "url": "https://github.com/a/newa", "type": "git" }, "source": { "reference": "1111111111111111111111111111111111111111", "url": "https://github.com/a/newa", "type": "git" },
"dist": { "reference": "1111111111111111111111111111111111111111", "url": "https://api.github.com/repos/a/newa/zipball/1111111111111111111111111111111111111111", "type": "zip" }, "dist": { "reference": "1111111111111111111111111111111111111111", "url": "https://api.github.com/repos/a/newa/zipball/1111111111111111111111111111111111111111", "type": "zip" },
"time": "2021-03-27T14:32:16+00:00", "time": "2021-03-14T16:24:37+00:00",
"type": "library" "type": "library"
}, },
{ {