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

Merge pull request #9469 from Seldaek/fix-aliases-2 

Make sure root aliases are marked as such also when loaded from lock file
pull/9473/head
Nils Adermann 2020-11-13 11:03:10 +01:00 committed by GitHub
parent e1ead6027f 6ace5bb651
commit 8936f724d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,7 +431,7 @@ class AliasPackage extends BasePackage implements CompletePackageInterface
public function __toString()
{
return parent::__toString().' (alias of '.$this->aliasOf->getVersion().')';
return parent::__toString().' ('.($this->rootPackageAlias ? 'root ':''). 'alias of '.$this->aliasOf->getVersion().')';
}
public function setDistUrl($url)

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

@ -187,7 +187,9 @@ class Locker
if (isset($lockData['aliases'])) {
foreach ($lockData['aliases'] as $alias) {
if (isset($packageByName[$alias['package']])) {
$packages->addPackage(new AliasPackage($packageByName[$alias['package']], $alias['alias_normalized'], $alias['alias']));
$aliasPkg = new AliasPackage($packageByName[$alias['package']], $alias['alias_normalized'], $alias['alias']);
$aliasPkg->setRootPackageAlias(true);
$packages->addPackage($aliasPkg);
}
}
}