|
|
|
@ -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)
|
|
|
|
|
*
|
|
|
|
|