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

Merge remote-tracking branch 'parsingphase/avoidFalseWildcardUpdateWarning'

pull/2696/merge
Jordi Boggiano 2014-02-24 12:45:39 +01:00
parent 5eafcf155a 2c01c9dd05
commit d607432c75
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Composer/Installer.php
View File

@ -105,6 +105,11 @@ class Installer
protected $verbose = false; protected $verbose = false;
protected $update = false; protected $update = false;
protected $runScripts = true; protected $runScripts = true;
/**
* Array of package names/globs flagged for update
*
* @var array|null
*/
protected $updateWhitelist = null; protected $updateWhitelist = null;
protected $whitelistDependencies = false; protected $whitelistDependencies = false;
@ -785,9 +790,8 @@ class Installer
} }
foreach ($this->updateWhitelist as $whiteListedPattern => $void) { foreach ($this->updateWhitelist as $whiteListedPattern => $void) {
$cleanedWhiteListedPattern = str_replace('\\*', '.*', preg_quote($whiteListedPattern)); $patternRegexp = $this->packageNameToRegexp($whiteListedPattern);
if (preg_match($patternRegexp, $package->getName())) {
if (preg_match("{^".$cleanedWhiteListedPattern."$}i", $package->getName())) {
return true; return true;
} }
} }
@ -795,6 +799,19 @@ class Installer
return false; return false;
} }
/**
* Build a regexp from a package name, expanding * globs as required
*
* @param $whiteListedPattern
* @return string
*/
private function packageNameToRegexp($whiteListedPattern)
{
$cleanedWhiteListedPattern = str_replace('\\*', '.*', preg_quote($whiteListedPattern));
$patternRegexp = "{^" . $cleanedWhiteListedPattern . "$}i";
return $patternRegexp;
}
private function extractPlatformRequirements($links) private function extractPlatformRequirements($links)
{ {
$platformReqs = array(); $platformReqs = array();
@ -844,11 +861,27 @@ class Installer
$seen = array(); $seen = array();
$rootRequiredPackageNames = array_keys($rootRequires);
foreach ($this->updateWhitelist as $packageName => $void) { foreach ($this->updateWhitelist as $packageName => $void) {
$packageQueue = new \SplQueue; $packageQueue = new \SplQueue;
$depPackages = $pool->whatProvides($packageName); $depPackages = $pool->whatProvides($packageName);
if (count($depPackages) == 0 && !in_array($packageName, $requiredPackageNames) && !in_array($packageName, array('nothing', 'lock'))) {
$nameMatchesRequiredPackage = in_array($packageName, $requiredPackageNames);
if (!$nameMatchesRequiredPackage) {
//maybe the name is a glob or similar that won't match directly
$whitelistPatternRegexp = $this->packageNameToRegexp($packageName);
foreach ($rootRequiredPackageNames as $rootRequiredPackageName) {
if (preg_match($whitelistPatternRegexp, $rootRequiredPackageName)) {
$nameMatchesRequiredPackage = true;
break;
}
}
}
if (count($depPackages) == 0 && !$nameMatchesRequiredPackage && !in_array($packageName, array('nothing', 'lock'))) {
$this->io->write('<warning>Package "' . $packageName . '" listed for update is not installed. Ignoring.</warning>'); $this->io->write('<warning>Package "' . $packageName . '" listed for update is not installed. Ignoring.</warning>');
} }