From 234be0b5e31b2e590c69824ac7239b185e42360c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 24 Feb 2014 12:49:09 +0100 Subject: [PATCH] CS fixes, refs #2750 --- src/Composer/Installer.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index 358d35d94..4e4502dfe 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -802,14 +802,14 @@ class Installer /** * Build a regexp from a package name, expanding * globs as required * - * @param $whiteListedPattern + * @param string $whiteListedPattern * @return string */ private function packageNameToRegexp($whiteListedPattern) { $cleanedWhiteListedPattern = str_replace('\\*', '.*', preg_quote($whiteListedPattern)); - $patternRegexp = "{^" . $cleanedWhiteListedPattern . "$}i"; - return $patternRegexp; + + return "{^" . $cleanedWhiteListedPattern . "$}i"; } private function extractPlatformRequirements($links) @@ -868,10 +868,10 @@ class Installer $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) { - //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)) {