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

Merge branch '1.5'

pull/6864/head
Jordi Boggiano 2017-11-30 17:08:38 +01:00
parent 92e8a99ed2 eab705d057
commit 6a08755c25
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,6 +158,10 @@ EOT
$repos = new CompositeRepository(array_merge(array($installedRepo), $defaultRepos)); $repos = new CompositeRepository(array_merge(array($installedRepo), $defaultRepos));
} else { } else {
$repos = $installedRepo = $this->getComposer()->getRepositoryManager()->getLocalRepository(); $repos = $installedRepo = $this->getComposer()->getRepositoryManager()->getLocalRepository();
$rootPkg = $this->getComposer()->getPackage();
if (!$installedRepo->getPackages() && ($rootPkg->getRequires() || $rootPkg->getDevRequires())) {
$io->writeError('<warning>No dependencies installed. Try running composer install or update.</warning>');
}
} }
if ($composer) { if ($composer) {

2
src/Composer/Repository/ComposerRepository.php
View File

@ -677,7 +677,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
} }
// TODO use scarier wording once we know for sure it doesn't do false positives anymore // TODO use scarier wording once we know for sure it doesn't do false positives anymore
throw new RepositorySecurityException('The contents of '.$filename.' do not match its signature. This should indicate a man-in-the-middle attack. Try running composer again and report this if you think it is a mistake.'); throw new RepositorySecurityException('The contents of '.$filename.' do not match its signature. This could indicate a man-in-the-middle attack. Try running composer again and report this if you think it is a mistake.');
} }
$data = JsonFile::parseJson($json, $filename); $data = JsonFile::parseJson($json, $filename);