Merge pull request #9821 from Seldaek/output_on_upd_mirrors
Fix output listing some updates that do not really happen when updating mirrors/--lockpull/9828/head
commit
de112c519e
|
@ -93,13 +93,14 @@ 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() &&
|
|
||||||
$presentPackage->getSourceType() === $package->getSourceType()
|
|
||||||
) {
|
|
||||||
$package->setSourceDistReferences($presentPackage->getSourceReference());
|
$package->setSourceDistReferences($presentPackage->getSourceReference());
|
||||||
}
|
}
|
||||||
|
if ($presentPackage->getReleaseDate()) {
|
||||||
|
$package->setReleaseDate($presentPackage->getReleaseDate());
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$packages[] = $package;
|
$packages[] = $package;
|
||||||
|
|
|
@ -446,6 +446,15 @@ class Installer
|
||||||
$installsUpdates[] = $operation;
|
$installsUpdates[] = $operation;
|
||||||
$installNames[] = $operation->getPackage()->getPrettyName().':'.$operation->getPackage()->getFullPrettyVersion();
|
$installNames[] = $operation->getPackage()->getPrettyName().':'.$operation->getPackage()->getFullPrettyVersion();
|
||||||
} elseif ($operation instanceof UpdateOperation) {
|
} elseif ($operation instanceof UpdateOperation) {
|
||||||
|
// when mirrors/metadata from a package gets updated we do not want to list it as an
|
||||||
|
// update in the output as it is only an internal lock file metadata update
|
||||||
|
if ($this->updateMirrors
|
||||||
|
&& $operation->getInitialPackage()->getName() == $operation->getTargetPackage()->getName()
|
||||||
|
&& $operation->getInitialPackage()->getVersion() == $operation->getTargetPackage()->getVersion()
|
||||||
|
) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
$installsUpdates[] = $operation;
|
$installsUpdates[] = $operation;
|
||||||
$updateNames[] = $operation->getTargetPackage()->getPrettyName().':'.$operation->getTargetPackage()->getFullPrettyVersion();
|
$updateNames[] = $operation->getTargetPackage()->getPrettyName().':'.$operation->getTargetPackage()->getFullPrettyVersion();
|
||||||
} elseif ($operation instanceof UninstallOperation) {
|
} elseif ($operation instanceof UninstallOperation) {
|
||||||
|
|
|
@ -17,7 +17,8 @@ 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": "2222222222222222222222222222222222222222", "url": "https://github.com/a/newa", "type": "git" },
|
"source": { "reference": "2222222222222222222222222222222222222222", "url": "https://github.com/a/newa", "type": "git" },
|
||||||
"dist": { "reference": "2222222222222222222222222222222222222222", "url": "https://api.github.com/repos/a/newa/zipball/2222222222222222222222222222222222222222", "type": "zip" }
|
"dist": { "reference": "2222222222222222222222222222222222222222", "url": "https://api.github.com/repos/a/newa/zipball/2222222222222222222222222222222222222222", "type": "zip" },
|
||||||
|
"time": "2021-03-27T14:32:16+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "b/b", "version": "2.0.3",
|
"name": "b/b", "version": "2.0.3",
|
||||||
|
@ -67,7 +68,8 @@ 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/a", "type": "git" },
|
"source": { "reference": "1111111111111111111111111111111111111111", "url": "https://github.com/a/a", "type": "git" },
|
||||||
"dist": { "reference": "1111111111111111111111111111111111111111", "url": "https://api.github.com/repos/a/a/zipball/1111111111111111111111111111111111111111", "type": "zip" }
|
"dist": { "reference": "1111111111111111111111111111111111111111", "url": "https://api.github.com/repos/a/a/zipball/1111111111111111111111111111111111111111", "type": "zip" },
|
||||||
|
"time": "2021-03-14T16:24:37+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "b/b", "version": "2.0.3",
|
"name": "b/b", "version": "2.0.3",
|
||||||
|
@ -102,6 +104,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/a", "type": "git" },
|
"source": { "reference": "1111111111111111111111111111111111111111", "url": "https://github.com/a/a", "type": "git" },
|
||||||
"dist": { "reference": "1111111111111111111111111111111111111111", "url": "https://api.github.com/repos/a/a/zipball/1111111111111111111111111111111111111111", "type": "zip" },
|
"dist": { "reference": "1111111111111111111111111111111111111111", "url": "https://api.github.com/repos/a/a/zipball/1111111111111111111111111111111111111111", "type": "zip" },
|
||||||
|
"time": "2021-03-14T16:24:37+00:00",
|
||||||
"type": "library"
|
"type": "library"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -151,6 +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-14T16:24:37+00:00",
|
||||||
"type": "library"
|
"type": "library"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -202,3 +206,12 @@ g/g is dev and installed in a different ref than the #ref, so it gets updated an
|
||||||
--RUN--
|
--RUN--
|
||||||
update mirrors
|
update mirrors
|
||||||
--EXPECT--
|
--EXPECT--
|
||||||
|
|
||||||
|
--EXPECT-OUTPUT--
|
||||||
|
Loading composer repositories with package information
|
||||||
|
Updating dependencies
|
||||||
|
Lock file operations: 0 installs, 0 updates, 0 removals
|
||||||
|
Writing lock file
|
||||||
|
Installing dependencies from lock file (including require-dev)
|
||||||
|
Nothing to install, update or remove
|
||||||
|
Generating autoload files
|
||||||
|
|
Loading…
Reference in New Issue