From d7437f19ad330bcc22d30ce465ed12c721934b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kocsis=20M=C3=A1t=C3=A9?= Date: Wed, 4 Feb 2015 19:40:50 +0100 Subject: [PATCH] Changed config key order --- src/Composer/Command/ConfigCommand.php | 8 ++++---- src/Composer/Config.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Composer/Command/ConfigCommand.php b/src/Composer/Command/ConfigCommand.php index 178831142..42a93437a 100644 --- a/src/Composer/Command/ConfigCommand.php +++ b/src/Composer/Command/ConfigCommand.php @@ -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) { diff --git a/src/Composer/Config.php b/src/Composer/Config.php index b4e1c38c2..200f30750 100644 --- a/src/Composer/Config.php +++ b/src/Composer/Config.php @@ -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,