From 8a221854b19faccfac524d1f810c5e7a3ce0ec28 Mon Sep 17 00:00:00 2001
From: Robert Boloc <robertboloc@gmail.com>
Date: Fri, 17 Jan 2014 14:43:54 +0100
Subject: [PATCH] changed name of the option to optimize-autoloader

---
 doc/04-schema.md                             | 2 +-
 res/composer-schema.json                     | 2 +-
 src/Composer/Command/ConfigCommand.php       | 2 +-
 src/Composer/Command/DumpAutoloadCommand.php | 2 +-
 src/Composer/Config.php                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/04-schema.md b/doc/04-schema.md
index 811acfba0..3dfff0b05 100644
--- a/doc/04-schema.md
+++ b/doc/04-schema.md
@@ -710,7 +710,7 @@ The following options are supported:
   interoperability issues with other autoloaders.
 * **autoloader-suffix:** Defaults to `null`. String to be used as a suffix for
   the generated Composer autoloader. When null a random one will be generated.
-* **autoloader-optimize-always** Defaults to `false`. Always optimize when dumping
+* **optimize-autoloader** Defaults to `false`. Always optimize when dumping
   the autoloader.
 * **github-domains:** Defaults to `["github.com"]`. A list of domains to use in
   github mode. This is used for GitHub Enterprise setups.
diff --git a/res/composer-schema.json b/res/composer-schema.json
index 746e6ca76..905199247 100644
--- a/res/composer-schema.json
+++ b/res/composer-schema.json
@@ -180,7 +180,7 @@
                     "type": "string",
                     "description": "Optional string to be used as a suffix for the generated Composer autoloader. When null a random one will be generated."
                 },
-                "autoloader-optimize-always": {
+                "optimize-autoloader": {
                     "type": "boolean",
                     "description": "Always optimize when dumping the autoloader"
                 },
diff --git a/src/Composer/Command/ConfigCommand.php b/src/Composer/Command/ConfigCommand.php
index 96c8b3ad6..bcd3beeab 100644
--- a/src/Composer/Command/ConfigCommand.php
+++ b/src/Composer/Command/ConfigCommand.php
@@ -283,7 +283,7 @@ EOT
                 }
             ),
             'autoloader-suffix' => array('is_string', function ($val) { return $val === 'null' ? null : $val; }),
-            'autoloader-optimize-always' => array($booleanValidator, $booleanNormalizer),
+            'optimize-autoloader' => array($booleanValidator, $booleanNormalizer),
             'prepend-autoloader' => array($booleanValidator, $booleanNormalizer),
         );
         $multiConfigValues = array(
diff --git a/src/Composer/Command/DumpAutoloadCommand.php b/src/Composer/Command/DumpAutoloadCommand.php
index 3902828b0..d228fb150 100644
--- a/src/Composer/Command/DumpAutoloadCommand.php
+++ b/src/Composer/Command/DumpAutoloadCommand.php
@@ -51,7 +51,7 @@ EOT
         $package = $composer->getPackage();
         $config = $composer->getConfig();
 
-        $optimize = $input->getOption('optimize') || $config->get('autoloader-optimize-always');
+        $optimize = $input->getOption('optimize') || $config->get('optimize-autoloader');
 
         if ($optimize) {
             $output->writeln('<info>Generating optimized autoload files</info>');
diff --git a/src/Composer/Config.php b/src/Composer/Config.php
index 9e695094e..087949ef8 100644
--- a/src/Composer/Config.php
+++ b/src/Composer/Config.php
@@ -36,7 +36,7 @@ class Config
         'cache-files-maxsize' => '300MiB',
         'discard-changes' => false,
         'autoloader-suffix' => null,
-        'autoloader-optimize-always' => false,
+        'optimize-autoloader' => false,
         'prepend-autoloader' => true,
         'github-domains' => array('github.com'),
     );