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

Updating var names.

pull/6674/head
Matthew Grasmick 2017-09-11 11:47:33 -04:00
parent 21722f6e42
commit ad465aa769
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Installer.php
View File

@ -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;
}

2
tests/Composer/Test/Fixtures/installer/update-with-all-dependencies.test
View File

@ -18,7 +18,7 @@ When `with-all-dependencies` is used, Composer\Installer::whitelistUpdateDepende
}
],
"require": {
"a": "^1.0",
"a": "~1.0",
"b": "~1.0"
}
}