Browse Source

CS fixes, refs #2750

Jordi Boggiano 11 years ago
parent
commit
234be0b5e3
1 changed files with 5 additions and 5 deletions
  1. 5 5
      src/Composer/Installer.php

+ 5 - 5
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)) {