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

Merge branch 'master' of github.com:ntoniazzi/composer 

Conflicts:
	doc/04-schema.md
	src/Composer/Factory.php
pull/1407/head
Nicolas Toniazzi 2014-12-03 11:58:49 +01:00
parent 83a1441285 50c6c100fa
commit 75448ff09c
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/04-schema.md
View File

@ -754,6 +754,16 @@ The following options are supported:
`{"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
rate limiting of their API. 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\<user>\AppData\Local\Composer` on Windows, * **cache-dir:** Defaults to `C:\Users\<user>\AppData\Local\Composer` on Windows,
`$XDG_CACHE_HOME/composer` on unix systems that follow the XDG Base Directory `$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 Specifications, and `$home/cache` on other unix systems. Stores all the caches

2
src/Composer/Factory.php
View File

@ -94,8 +94,6 @@ class Factory
$xdgCache = $home . '/.cache'; $xdgCache = $home . '/.cache';
} }
$cacheDir = $xdgCache . '/composer'; $cacheDir = $xdgCache . '/composer';
} else { } else {
$cacheDir = $home . '/cache'; $cacheDir = $home . '/cache';
} }