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

Fix invalid call to array_merge

pull/7926/head
Sascha Egerer 2018-12-12 17:27:26 +01:00 committed by Jordi Boggiano
parent 50cb5fe3da
commit dc59af555a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Installer.php
View File

@ -1323,7 +1323,7 @@ class Installer
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)];
$nameMatchesRequiredPackage = in_array($packageName, $requiredPackageNames, true); $nameMatchesRequiredPackage = in_array($packageName, $requiredPackageNames, true);
@ -1332,12 +1332,14 @@ class Installer
$whitelistPatternRegexp = BasePackage::packageNameToRegexp($packageName); $whitelistPatternRegexp = BasePackage::packageNameToRegexp($packageName);
foreach ($rootRequiredPackageNames as $rootRequiredPackageName) { foreach ($rootRequiredPackageNames as $rootRequiredPackageName) {
if (preg_match($whitelistPatternRegexp, $rootRequiredPackageName)) { if (preg_match($whitelistPatternRegexp, $rootRequiredPackageName)) {
$depPackages = array_merge($pool->whatProvides($rootRequiredPackageName)); $depPackages[] = $pool->whatProvides($rootRequiredPackageName);
$nameMatchesRequiredPackage = true; $nameMatchesRequiredPackage = true;
} }
} }
} }
$depPackages = array_merge(...$depPackages);
if (count($depPackages) == 0 && !$nameMatchesRequiredPackage && !in_array($packageName, array('nothing', 'lock', 'mirrors'))) { if (count($depPackages) == 0 && !$nameMatchesRequiredPackage && !in_array($packageName, array('nothing', 'lock', 'mirrors'))) {
$this->io->writeError('<warning>Package "' . $packageName . '" listed for update is not installed. Ignoring.</warning>'); $this->io->writeError('<warning>Package "' . $packageName . '" listed for update is not installed. Ignoring.</warning>');
} }