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

Doc tweaks, refs #2682

pull/2705/head
Jordi Boggiano 2014-02-13 16:23:53 +01:00
parent 245461d8ed
commit 9896abeb38
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/04-schema.md
View File

@ -676,10 +676,10 @@ The following options are supported:
* **preferred-install:** Defaults to `auto` and can be any of `source`, `dist` or * **preferred-install:** Defaults to `auto` and can be any of `source`, `dist` or
`auto`. This option allows you to set the install method Composer will prefer to `auto`. This option allows you to set the install method Composer will prefer to
use. use.
* **github-protocols:** Defaults to `["git", "https"]`. A list of protocols to * **github-protocols:** Defaults to `["git", "https", "ssh"]`. A list of protocols to
use when cloning from github.com, in priority order. You can reconfigure it to use when cloning from github.com, in priority order. You can reconfigure it to
prioritize the https protocol if you are behind a proxy or have somehow bad for example prioritize the https protocol if you are behind a proxy or have somehow
performances with the git protocol. bad performances with the git protocol.
* **github-oauth:** A list of domain names and oauth keys. For example using * **github-oauth:** A list of domain names and oauth keys. For example using
`{"github.com": "oauthtoken"}` as the value of this option will use `oauthtoken` `{"github.com": "oauthtoken"}` as the value of this option will use `oauthtoken`
to access private repositories on github and to circumvent the low IP-based to access private repositories on github and to circumvent the low IP-based

2
src/Composer/Config.php
View File

@ -206,7 +206,7 @@ class Config
case 'github-protocols': case 'github-protocols':
if (reset($this->config['github-protocols']) === 'http') { if (reset($this->config['github-protocols']) === 'http') {
throw new \RuntimeException('The http protocol for github is not available anymore, update your config\'s github-protocols to use "https" or "git" or "ssh"'); throw new \RuntimeException('The http protocol for github is not available anymore, update your config\'s github-protocols to use "https", "git" or "ssh"');
} }
return $this->config[$key]; return $this->config[$key];