From 9a99e86ebce36c8deef396c60dbbb5ed8750d36a Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 3 Nov 2017 14:35:04 +0100 Subject: [PATCH] Rename NonRoot to Transitive, refs #6674 --- src/Composer/Command/RemoveCommand.php | 2 +- src/Composer/Command/RequireCommand.php | 2 +- src/Composer/Command/UpdateCommand.php | 2 +- src/Composer/Installer.php | 31 +++++++++++++++---------- tests/Composer/Test/InstallerTest.php | 2 +- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/Composer/Command/RemoveCommand.php b/src/Composer/Command/RemoveCommand.php index 493c6481f..46dc0b108 100644 --- a/src/Composer/Command/RemoveCommand.php +++ b/src/Composer/Command/RemoveCommand.php @@ -131,7 +131,7 @@ EOT ->setApcuAutoloader($apcu) ->setUpdate(true) ->setUpdateWhitelist($packages) - ->setWhitelistNonRootDependencies(!$input->getOption('no-update-with-dependencies')) + ->setWhitelistTransitiveDependencies(!$input->getOption('no-update-with-dependencies')) ->setIgnorePlatformRequirements($input->getOption('ignore-platform-reqs')) ->setRunScripts(!$input->getOption('no-scripts')) ; diff --git a/src/Composer/Command/RequireCommand.php b/src/Composer/Command/RequireCommand.php index 4ec17bef5..5c6c14798 100644 --- a/src/Composer/Command/RequireCommand.php +++ b/src/Composer/Command/RequireCommand.php @@ -170,7 +170,7 @@ EOT ->setApcuAutoloader($apcu) ->setUpdate(true) ->setUpdateWhitelist(array_keys($requirements)) - ->setWhitelistNonRootDependencies($input->getOption('update-with-dependencies')) + ->setWhitelistTransitiveDependencies($input->getOption('update-with-dependencies')) ->setWhitelistAllDependencies($input->getOption('update-with-all-dependencies')) ->setIgnorePlatformRequirements($input->getOption('ignore-platform-reqs')) ->setPreferStable($input->getOption('prefer-stable')) diff --git a/src/Composer/Command/UpdateCommand.php b/src/Composer/Command/UpdateCommand.php index 986137f16..1610d2872 100644 --- a/src/Composer/Command/UpdateCommand.php +++ b/src/Composer/Command/UpdateCommand.php @@ -147,7 +147,7 @@ EOT ->setApcuAutoloader($apcu) ->setUpdate(true) ->setUpdateWhitelist($input->getOption('lock') ? array('lock') : $packages) - ->setWhitelistNonRootDependencies($input->getOption('with-dependencies')) + ->setWhitelistTransitiveDependencies($input->getOption('with-dependencies')) ->setWhitelistAllDependencies($input->getOption('with-all-dependencies')) ->setIgnorePlatformRequirements($input->getOption('ignore-platform-reqs')) ->setPreferStable($input->getOption('prefer-stable')) diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index 0bfe450f5..648212c51 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -125,7 +125,7 @@ class Installer * @var array|null */ protected $updateWhitelist = null; - protected $whitelistNonRootDependencies = false; + protected $whitelistDependencies = false; // TODO 2.0 rename to whitelistTransitiveDependencies protected $whitelistAllDependencies = false; /** @@ -1307,9 +1307,9 @@ class Installer $skipPackages = array(); if (!$this->whitelistAllDependencies) { - foreach ($rootRequires as $require) { - $skipPackages[$require->getTarget()] = TRUE; - } + foreach ($rootRequires as $require) { + $skipPackages[$require->getTarget()] = true; + } } $pool = new Pool('dev'); @@ -1354,7 +1354,7 @@ class Installer $seen[$package->getId()] = true; $this->updateWhitelist[$package->getName()] = true; - if (!$this->whitelistNonRootDependencies && !$this->whitelistAllDependencies) { + if (!$this->whitelistDependencies && !$this->whitelistAllDependencies) { continue; } @@ -1655,18 +1655,25 @@ class Installer } /** - * Should indirect dependencies of whitelisted packages be updated? + * @deprecated use setWhitelistTransitiveDependencies instead + */ + public function setWhitelistDependencies($updateDependencies = true) + { + return $this->setWhitelistTransitiveDependencies($updateDependencies); + } + + /** + * Should dependencies of whitelisted packages (but not direct dependencies) be updated? * * This will NOT whitelist any dependencies that are also directly defined * in the root package. * - * @param bool $updateNonRootDependencies - * + * @param bool $updateTransitiveDependencies * @return Installer */ - public function setWhitelistNonRootDependencies($updateNonRootDependencies = true) + public function setWhitelistTransitiveDependencies($updateTransitiveDependencies = true) { - $this->whitelistNonRootDependencies = (bool) $updateNonRootDependencies; + $this->whitelistDependencies = (bool) $updateTransitiveDependencies; return $this; } @@ -1674,8 +1681,8 @@ class Installer /** * Should all dependencies of whitelisted packages be updated recursively? * - * This will NOT whitelist any dependencies that are also defined in the - * root package. + * This will whitelist any dependencies of the whitelisted packages, including + * those defined in the root package. * * @param bool $updateAllDependencies * @return Installer diff --git a/tests/Composer/Test/InstallerTest.php b/tests/Composer/Test/InstallerTest.php index 9d900095a..76fb8817d 100644 --- a/tests/Composer/Test/InstallerTest.php +++ b/tests/Composer/Test/InstallerTest.php @@ -224,7 +224,7 @@ class InstallerTest extends TestCase ->setUpdate(true) ->setDryRun($input->getOption('dry-run')) ->setUpdateWhitelist($input->getArgument('packages')) - ->setWhitelistNonRootDependencies($input->getOption('with-dependencies')) + ->setWhitelistTransitiveDependencies($input->getOption('with-dependencies')) ->setWhitelistAllDependencies($input->getOption('with-all-dependencies')) ->setPreferStable($input->getOption('prefer-stable')) ->setPreferLowest($input->getOption('prefer-lowest'))