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

Reverse new config-file changes

pull/6743/head
Zachary Flower 2017-11-13 12:58:07 -07:00
parent 9ed0a2d35f
commit 8d6f8a6f42
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Composer/Config.php
View File

@ -84,7 +84,6 @@ class Config
private $configSource; private $configSource;
/** @var ConfigSourceInterface */ /** @var ConfigSourceInterface */
private $authConfigSource; private $authConfigSource;
private $defaultsConfigSource;
private $useEnvironment; private $useEnvironment;
private $warnedHosts = array(); private $warnedHosts = array();
@ -121,16 +120,6 @@ class Config
return $this->authConfigSource; return $this->authConfigSource;
} }
public function setDefaultsConfigSource(ConfigSourceInterface $source)
{
$this->defaultsConfigSource = $source;
}
public function getDefaultsConfigSource()
{
return $this->defaultsConfigSource;
}
/** /**
* Merges new config values with the existing ones (overriding) * Merges new config values with the existing ones (overriding)
* *

10
src/Composer/Factory.php
View File

@ -200,16 +200,6 @@ class Factory
} }
$config->setAuthConfigSource(new JsonConfigSource($file, true)); $config->setAuthConfigSource(new JsonConfigSource($file, true));
// load global auth file
$file = new JsonFile($config->get('home').'/defaults.json');
if ($file->exists()) {
if ($io && $io->isDebug()) {
$io->writeError('Loading config file ' . $file->getPath());
}
$config->merge(array('config' => $file->read()));
}
$config->setDefaultsConfigSource(new JsonConfigSource($file, true));
// load COMPOSER_AUTH environment variable if set // load COMPOSER_AUTH environment variable if set
if ($composerAuthEnv = getenv('COMPOSER_AUTH')) { if ($composerAuthEnv = getenv('COMPOSER_AUTH')) {
$authData = json_decode($composerAuthEnv, true); $authData = json_decode($composerAuthEnv, true);