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

Shorten ternary and reuse config file instead of the null argument to figure out path to auth.json

pull/4345/head
Jordi Boggiano 2015-08-10 00:56:55 +01:00
parent cdeb7621ba
commit b16c5fbeb9
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/Command/ConfigCommand.php
View File

@ -139,7 +139,7 @@ EOT
// passed in a file to use
$configFile = $input->getOption('global')
? ($this->config->get('home') . '/config.json')
: ($input->getOption('file') ?: (trim(getenv('COMPOSER')) ? trim(getenv('COMPOSER')) : 'composer.json'));
: ($input->getOption('file') ?: trim(getenv('COMPOSER')) ?: 'composer.jsonw');
// create global composer.json if this was invoked using `composer global config`
if ($configFile === 'composer.json' && !file_exists($configFile) && realpath(getcwd()) === realpath($this->config->get('home'))) {
@ -151,7 +151,7 @@ EOT
$authConfigFile = $input->getOption('global')
? ($this->config->get('home') . '/auth.json')
: dirname(realpath($input->getOption('file'))) . '/auth.json';
: dirname(realpath($configFile)) . '/auth.json';
$this->authConfigFile = new JsonFile($authConfigFile);
$this->authConfigSource = new JsonConfigSource($this->authConfigFile, true);