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

Merge pull request #4659 from mishak87/patch-1 

Could not configure gitlab-oauth via CLI #3765
pull/4670/head
Rob 2015-12-03 11:43:39 +01:00
parent c74fa483d8 7517a99b1c
commit dc5f8cfbaa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Config/JsonConfigSource.php
View File

@ -79,7 +79,7 @@ class JsonConfigSource implements ConfigSourceInterface
public function addConfigSetting($name, $value) public function addConfigSetting($name, $value)
{ {
$this->manipulateJson('addConfigSetting', $name, $value, function (&$config, $key, $val) { $this->manipulateJson('addConfigSetting', $name, $value, function (&$config, $key, $val) {
if (preg_match('{^(github-oauth|http-basic|platform)\.}', $key)) { if (preg_match('{^(gitlab-oauth|github-oauth|http-basic|platform)\.}', $key)) {
list($key, $host) = explode('.', $key, 2); list($key, $host) = explode('.', $key, 2);
if ($this->authConfig) { if ($this->authConfig) {
$config[$key][$host] = $val; $config[$key][$host] = $val;
@ -98,7 +98,7 @@ class JsonConfigSource implements ConfigSourceInterface
public function removeConfigSetting($name) public function removeConfigSetting($name)
{ {
$this->manipulateJson('removeConfigSetting', $name, function (&$config, $key) { $this->manipulateJson('removeConfigSetting', $name, function (&$config, $key) {
if (preg_match('{^(github-oauth|http-basic|platform)\.}', $key)) { if (preg_match('{^(gitlab-oauth|github-oauth|http-basic|platform)\.}', $key)) {
list($key, $host) = explode('.', $key, 2); list($key, $host) = explode('.', $key, 2);
if ($this->authConfig) { if ($this->authConfig) {
unset($config[$key][$host]); unset($config[$key][$host]);