diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index 932b220e2..a88d16777 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -125,7 +125,7 @@ class Installer * @var array|null */ protected $updateWhitelist = null; - protected $whitelistDependencies = false; + protected $whitelistIndirectDependencies = false; protected $whitelistAllDependencies = false; /** @@ -1352,7 +1352,7 @@ class Installer $seen[$package->getId()] = true; $this->updateWhitelist[$package->getName()] = true; - if (!$this->whitelistDependencies && !$this->whitelistAllDependencies) { + if (!$this->whitelistIndirectDependencies && !$this->whitelistAllDependencies) { continue; } @@ -1663,7 +1663,7 @@ class Installer */ public function setIndirectWhitelistDependencies($updateDependencies = true) { - $this->whitelistDependencies = (bool) $updateDependencies; + $this->whitelistIndirectDependencies = (bool) $updateDependencies; return $this; } diff --git a/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test b/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test index 552cad0e1..7e2573f9c 100644 --- a/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test +++ b/tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test @@ -18,7 +18,7 @@ When `with-all-dependencies` is used, Composer\Installer::whitelistUpdateDepende } ], "require": { - "a": "^1.0", + "a": "~1.0", "b": "~1.0" } }