From 8d6f8a6f421e45960d354136ee519fa4a0b368d6 Mon Sep 17 00:00:00 2001 From: Zachary Flower Date: Mon, 13 Nov 2017 12:58:07 -0700 Subject: [PATCH] Reverse new config-file changes --- src/Composer/Config.php | 11 ----------- src/Composer/Factory.php | 10 ---------- 2 files changed, 21 deletions(-) diff --git a/src/Composer/Config.php b/src/Composer/Config.php index aaad6574c..a7fca2988 100644 --- a/src/Composer/Config.php +++ b/src/Composer/Config.php @@ -84,7 +84,6 @@ class Config private $configSource; /** @var ConfigSourceInterface */ private $authConfigSource; - private $defaultsConfigSource; private $useEnvironment; private $warnedHosts = array(); @@ -121,16 +120,6 @@ class Config 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) * diff --git a/src/Composer/Factory.php b/src/Composer/Factory.php index fe5102b81..23eaaab09 100644 --- a/src/Composer/Factory.php +++ b/src/Composer/Factory.php @@ -200,16 +200,6 @@ class Factory } $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 if ($composerAuthEnv = getenv('COMPOSER_AUTH')) { $authData = json_decode($composerAuthEnv, true);