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

Merge branch '1.0'

pull/5267/head
Jordi Boggiano 2016-04-28 19:54:11 +01:00
parent fd5f90989f 84ecabed3f
commit 35fbf9bc14
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/03-cli.md
View File

@ -234,17 +234,21 @@ directory.
This is merely a helper to manage a project stored in a central location that
can hold CLI tools or Composer plugins that you want to have available everywhere.
This can be used to install CLI utilities globally and if you add
`$COMPOSER_HOME/vendor/bin` to your `$PATH` environment variable. Here is an
example:
This can be used to install CLI utilities globally. Here is an example:
```sh
php composer.phar global require fabpot/php-cs-fixer:dev-master
php composer.phar global require fabpot/php-cs-fixer
```
Now the `php-cs-fixer` binary is available globally (assuming you adjusted
your PATH). If you wish to update the binary later on you can just run a
global update:
Now the `php-cs-fixer` binary is available globally. Just make sure your global
[vendor binaries](articles/vendor-binaries.md) directory is in your `$PATH`
environment variable, you can get its location with the following command :
```sh
php composer.phar global config bin-dir --absolute
```
If you wish to update the binary later on you can just run a global update:
```sh
php composer.phar global update

2
src/Composer/Console/Application.php
View File

@ -146,7 +146,7 @@ class Application extends BaseApplication
if ($commandName !== 'self-update' && $commandName !== 'selfupdate') {
$io->writeError('<warning>Running composer as root/super user is highly discouraged as packages, plugins and scripts cannot always be trusted</warning>');
}
if ($uid = getenv('SUDO_UID')) {
if ($uid = (int) getenv('SUDO_UID')) {
// Silently clobber any sudo credentials on the invoking user to avoid privilege escalations later on
// ref. https://github.com/composer/composer/issues/5119
Silencer::call('exec', "sudo -u \\#{$uid} sudo -K > /dev/null 2>&1");

2
src/Composer/Repository/Vcs/GitLabDriver.php
View File

@ -326,7 +326,7 @@ class GitLabDriver extends VcsDriver
return $this->attemptCloneFallback();
}
$this->io->writeError('<warning>Failed to download ' . $this->owner . '/' . $this->repository . ':' . $e->getMessage() . '</warning>');
$gitLabUtil->authorizeOAuthInteractively($this->originUrl, 'Your credentials are required to fetch private repository metadata (<info>'.$this->url.'</info>)');
$gitLabUtil->authorizeOAuthInteractively($this->scheme, $this->originUrl, 'Your credentials are required to fetch private repository metadata (<info>'.$this->url.'</info>)');
return parent::getContents($url);