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

Merge remote-tracking branch 'swumao/master'

pull/6651/merge
Jordi Boggiano 2017-09-11 12:46:39 +02:00
parent a8df30c09b 277f05754d
commit 3a4604ebbc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,7 +222,9 @@ EOT
$io->writeError('Format "json" is only supported for package listings, falling back to format "text"'); $io->writeError('Format "json" is only supported for package listings, falling back to format "text"');
} }
$rootRequires = $this->getRootRequires(); $rootRequires = $this->getRootRequires();
foreach ($installedRepo->getPackages() as $package) { $packages = $installedRepo->getPackages();
usort($packages, 'strcmp');
foreach ($packages as $package) {
if (in_array($package->getName(), $rootRequires, true)) { if (in_array($package->getName(), $rootRequires, true)) {
$this->displayPackageTree($package, $installedRepo, $repos); $this->displayPackageTree($package, $installedRepo, $repos);
} }
@ -703,6 +705,7 @@ EOT
if (is_object($package)) { if (is_object($package)) {
$requires = $package->getRequires(); $requires = $package->getRequires();
ksort($requires);
$treeBar = '├'; $treeBar = '├';
$j = 0; $j = 0;
$total = count($requires); $total = count($requires);
@ -744,6 +747,7 @@ EOT
list($package, $versions) = $this->getPackage($installedRepo, $distantRepos, $name, $package->getPrettyConstraint() === 'self.version' ? $package->getConstraint() : $package->getPrettyConstraint()); list($package, $versions) = $this->getPackage($installedRepo, $distantRepos, $name, $package->getPrettyConstraint() === 'self.version' ? $package->getConstraint() : $package->getPrettyConstraint());
if (is_object($package)) { if (is_object($package)) {
$requires = $package->getRequires(); $requires = $package->getRequires();
ksort($requires);
$treeBar = $previousTreeBar . ' ├'; $treeBar = $previousTreeBar . ' ├';
$i = 0; $i = 0;
$total = count($requires); $total = count($requires);