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

Merge pull request #1655 from miklosm/iss1653 

Fix for #1653
pull/1658/merge
Jordi Boggiano 2013-03-04 08:24:25 -08:00
parent a32aa1a305 40c9584746
commit 0535473c6b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,8 @@ EOT
$output->writeln('No composer.json found in the current directory, showing available packages from ' . implode(', ', array_keys($defaultRepos)));
}
} elseif ($composer = $this->getComposer(false)) {
$localRepo = $composer = $this->getComposer()->getRepositoryManager()->getLocalRepository();
$composer = $this->getComposer();
$localRepo = $composer->getRepositoryManager()->getLocalRepository();
$installedRepo = new CompositeRepository(array($localRepo, $platformRepo));
$repos = new CompositeRepository(array_merge(array($installedRepo), $composer->getRepositoryManager()->getRepositories()));
} else {