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

Changed config key order

pull/3704/head
Kocsis Máté 2015-02-04 19:40:50 +01:00
parent 63b3bc61b2
commit d7437f19ad
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Command/ConfigCommand.php
View File

@ -303,10 +303,6 @@ EOT
'notify-on-install' => array($booleanValidator, $booleanNormalizer),
'vendor-dir' => array('is_string', function ($val) { return $val; }),
'bin-dir' => array('is_string', function ($val) { return $val; }),
'bin-compat' => array(
function ($val) { return in_array($val, array('auto', 'nosymlink', 'full')); },
function ($val) { return $val; }
),
'cache-dir' => array('is_string', function ($val) { return $val; }),
'cache-files-dir' => array('is_string', function ($val) { return $val; }),
'cache-repo-dir' => array('is_string', function ($val) { return $val; }),
@ -317,6 +313,10 @@ EOT
function ($val) { return preg_match('/^\s*([0-9.]+)\s*(?:([kmg])(?:i?b)?)?\s*$/i', $val) > 0; },
function ($val) { return $val; }
),
'bin-compat' => array(
function ($val) { return in_array($val, array('auto', 'nosymlink', 'full')); },
function ($val) { return $val; }
),
'discard-changes' => array(
function ($val) { return in_array($val, array('stash', 'true', 'false', '1', '0'), true); },
function ($val) {

2
src/Composer/Config.php
View File

@ -29,7 +29,6 @@ class Config
'github-protocols' => array('git', 'https', 'ssh'),
'vendor-dir' => 'vendor',
'bin-dir' => '{$vendor-dir}/bin',
'bin-compat' => 'auto',
'cache-dir' => '{$home}/cache',
'cache-files-dir' => '{$cache-dir}/files',
'cache-repo-dir' => '{$cache-dir}/repo',
@ -37,6 +36,7 @@ class Config
'cache-ttl' => 15552000, // 6 months
'cache-files-ttl' => null, // fallback to cache-ttl
'cache-files-maxsize' => '300MiB',
'bin-compat' => 'auto',
'discard-changes' => false,
'autoloader-suffix' => null,
'optimize-autoloader' => false,