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

Not skipping root packages.

pull/6674/head
Matthew Grasmick 2017-09-11 12:30:48 -04:00
parent 6db92eae92
commit 2e4afaa941
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Composer/Installer.php
View File

@ -1284,7 +1284,7 @@ class Installer
* *
* Packages which are listed as requirements in the root package will be * Packages which are listed as requirements in the root package will be
* skipped including their dependencies, unless they are listed in the * skipped including their dependencies, unless they are listed in the
* update whitelist themselves. * update whitelist themselves or `with-all-dependencies` is used.
* *
* @param RepositoryInterface $localOrLockRepo Use the locked repo if available, otherwise installed repo will do * @param RepositoryInterface $localOrLockRepo Use the locked repo if available, otherwise installed repo will do
* As we want the most accurate package list to work with, and installed * As we want the most accurate package list to work with, and installed
@ -1306,8 +1306,10 @@ class Installer
} }
$skipPackages = array(); $skipPackages = array();
foreach ($rootRequires as $require) { if (!$this->whitelistAllDependencies) {
$skipPackages[$require->getTarget()] = true; foreach ($rootRequires as $require) {
$skipPackages[$require->getTarget()] = TRUE;
}
} }
$pool = new Pool('dev'); $pool = new Pool('dev');
@ -1366,7 +1368,7 @@ class Installer
continue; continue;
} }
if (!$this->whitelistAllDependencies && isset($skipPackages[$requirePackage->getName()])) { if (isset($skipPackages[$requirePackage->getName()])) {
$this->io->writeError('<warning>Dependency "' . $requirePackage->getName() . '" is also a root requirement, but is not explicitly whitelisted. Ignoring.</warning>'); $this->io->writeError('<warning>Dependency "' . $requirePackage->getName() . '" is also a root requirement, but is not explicitly whitelisted. Ignoring.</warning>');
continue; continue;
} }