diff --git a/doc/04-schema.md b/doc/04-schema.md index 3a40d5d93..fd796a1a1 100644 --- a/doc/04-schema.md +++ b/doc/04-schema.md @@ -754,6 +754,16 @@ The following options are supported: `{"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 rate limiting of their API. + [Read more](articles/troubleshooting.md#api-rate-limit-and-oauth-tokens) + on how to get an OAuth token for GitHub. +* **http-basic:** A list of domain names and username/passwords to authenticate + against them. For example using + `{"example.org": {"username": "alice", "password": "foo"}` as the value of this option will let composer authenticate against example.org. +* **vendor-dir:** Defaults to `vendor`. You can install dependencies into a + different directory if you want to. `$HOME` and `~` will be replaced by your + home directory's path in vendor-dir and all `*-dir` options below. +* **bin-dir:** Defaults to `vendor/bin`. If a project includes binaries, they + will be symlinked into this directory. * **cache-dir:** Defaults to `C:\Users\\AppData\Local\Composer` on Windows, `$XDG_CACHE_HOME/composer` on unix systems that follow the XDG Base Directory Specifications, and `$home/cache` on other unix systems. Stores all the caches diff --git a/src/Composer/Factory.php b/src/Composer/Factory.php index 0c68adf5b..ad37cb594 100644 --- a/src/Composer/Factory.php +++ b/src/Composer/Factory.php @@ -94,8 +94,6 @@ class Factory $xdgCache = $home . '/.cache'; } $cacheDir = $xdgCache . '/composer'; - - } else { $cacheDir = $home . '/cache'; }