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

CS fixes, refs #2750

pull/2696/merge
Jordi Boggiano 2014-02-24 12:49:09 +01:00
parent d607432c75
commit 234be0b5e3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Composer/Installer.php
View File

@ -802,14 +802,14 @@ class Installer
/** /**
* Build a regexp from a package name, expanding * globs as required * Build a regexp from a package name, expanding * globs as required
* *
* @param $whiteListedPattern * @param string $whiteListedPattern
* @return string * @return string
*/ */
private function packageNameToRegexp($whiteListedPattern) private function packageNameToRegexp($whiteListedPattern)
{ {
$cleanedWhiteListedPattern = str_replace('\\*', '.*', preg_quote($whiteListedPattern)); $cleanedWhiteListedPattern = str_replace('\\*', '.*', preg_quote($whiteListedPattern));
$patternRegexp = "{^" . $cleanedWhiteListedPattern . "$}i";
return $patternRegexp; return "{^" . $cleanedWhiteListedPattern . "$}i";
} }
private function extractPlatformRequirements($links) private function extractPlatformRequirements($links)
@ -868,10 +868,10 @@ class Installer
$depPackages = $pool->whatProvides($packageName); $depPackages = $pool->whatProvides($packageName);
$nameMatchesRequiredPackage = in_array($packageName, $requiredPackageNames); $nameMatchesRequiredPackage = in_array($packageName, $requiredPackageNames, true);
// check if the name is a glob pattern that did not match directly
if (!$nameMatchesRequiredPackage) { if (!$nameMatchesRequiredPackage) {
//maybe the name is a glob or similar that won't match directly
$whitelistPatternRegexp = $this->packageNameToRegexp($packageName); $whitelistPatternRegexp = $this->packageNameToRegexp($packageName);
foreach ($rootRequiredPackageNames as $rootRequiredPackageName) { foreach ($rootRequiredPackageNames as $rootRequiredPackageName) {
if (preg_match($whitelistPatternRegexp, $rootRequiredPackageName)) { if (preg_match($whitelistPatternRegexp, $rootRequiredPackageName)) {