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

Avoid use of refs and avoid a false path when showing the root package, refs #8545

pull/8575/head
Jordi Boggiano 2020-01-28 13:52:22 +01:00
parent 9db08f9883
commit 94dce37424
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Composer/Command/ShowCommand.php
View File

@ -766,8 +766,8 @@ EOT
'names' => $package->getNames()
);
$this->appendVersions($json, $versions);
$this->appendLicenses($json, $package);
$json = $this->appendVersions($json, $versions);
$json = $this->appendLicenses($json, $package);
if ($latestPackage) {
$json['latest'] = $latestPackage->getPrettyVersion();
@ -793,6 +793,9 @@ EOT
if ($installedRepo->hasPackage($package)) {
$json['path'] = realpath($this->getComposer()->getInstallationManager()->getInstallPath($package));
if ($json['path'] === false) {
unset($json['path']);
}
}
if ($latestPackage->isAbandoned()) {
@ -807,25 +810,27 @@ EOT
$json['support'] = $package->getSupport();
}
$this->appendAutoload($json, $package);
$json = $this->appendAutoload($json, $package);
if ($package->getIncludePaths()) {
$json['include_path'] = $package->getIncludePaths();
}
$this->appendLinks($json, $package);
$json = $this->appendLinks($json, $package);
$this->getIO()->write(JsonFile::encode($json));
}
protected function appendVersions(&$json, array $versions)
private function appendVersions($json, array $versions)
{
uasort($versions, 'version_compare');
$versions = array_keys(array_reverse($versions));
$json['versions'] = $versions;
return $json;
}
protected function appendLicenses(&$json, CompletePackageInterface $package)
private function appendLicenses($json, CompletePackageInterface $package)
{
if ($licenses = $package->getLicense()) {
$spdxLicenses = new SpdxLicenses();
@ -844,9 +849,11 @@ EOT
);
}, $licenses);
}
return $json;
}
protected function appendAutoload(&$json, CompletePackageInterface $package)
private function appendAutoload($json, CompletePackageInterface $package)
{
if ($package->getAutoload()) {
$autoload = array();
@ -871,16 +878,20 @@ EOT
$json['autoload'] = $autoload;
}
return $json;
}
protected function appendLinks(&$json, CompletePackageInterface $package)
private function appendLinks($json, CompletePackageInterface $package)
{
foreach (array('requires', 'devRequires', 'provides', 'conflicts', 'replaces') as $linkType) {
$this->appendLink($json, $package, $linkType);
$json = $this->appendLink($json, $package, $linkType);
}
return $json;
}
protected function appendLink(&$json, CompletePackageInterface $package, $linkType)
private function appendLink($json, CompletePackageInterface $package, $linkType)
{
$links = $package->{'get' . ucfirst($linkType)}();
@ -891,6 +902,8 @@ EOT
$json[$linkType][$link->getTarget()] = $link->getPrettyConstraint();
}
}
return $json;
}
/**