public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 08:32:56 +00:00
Code Activity

Merge remote-tracking branch 'isoroku/fix-misspellings'

Browse source 
Conflicts:
	doc/articles/handling-private-packages-with-satis.md
This commit is contained in:
Jordi Boggiano 2015-04-15 02:21:44 +01:00
commit 6b3178b169
10 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -273,9 +273,9 @@ EOT
$matches[$index] = $package->getId();
}
// select prefered package according to policy rules
if (!$matchedPackage && $matches && $prefered = $policy->selectPreferedPackages($pool, array(), $matches)) {
$matchedPackage = $pool->literalToPackage($prefered[0]);
// select preferred package according to policy rules
if (!$matchedPackage && $matches && $preferred = $policy->selectPreferredPackages($pool, array(), $matches)) {
$matchedPackage = $pool->literalToPackage($preferred[0]);
}
return array($matchedPackage, $versions);