From f3bfeb36089c2e4674982e74b01f0bad8b40b10e Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 24 Oct 2012 17:33:31 +0200 Subject: [PATCH] Rename --optimize-autoloaders to --optimize-autoloader since there is just one --- src/Composer/Command/InstallCommand.php | 4 ++-- src/Composer/Command/UpdateCommand.php | 4 ++-- src/Composer/Installer.php | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Composer/Command/InstallCommand.php b/src/Composer/Command/InstallCommand.php index 98f240423..d31dbdce7 100644 --- a/src/Composer/Command/InstallCommand.php +++ b/src/Composer/Command/InstallCommand.php @@ -37,7 +37,7 @@ class InstallCommand extends Command new InputOption('no-custom-installers', null, InputOption::VALUE_NONE, 'Disables all custom installers.'), new InputOption('no-scripts', null, InputOption::VALUE_NONE, 'Skips the execution of all scripts defined in composer.json file.'), new InputOption('verbose', 'v', InputOption::VALUE_NONE, 'Shows more details including new commits pulled in when updating packages.'), - new InputOption('optimize-autoloaders', 'o', InputOption::VALUE_NONE, 'Optimize autoloaders during autoloader dump') + new InputOption('optimize-autoloader', 'o', InputOption::VALUE_NONE, 'Optimize autoloader during autoloader dump') )) ->setHelp(<<install command reads the composer.lock file from @@ -65,7 +65,7 @@ EOT ->setPreferDist($input->getOption('prefer-dist')) ->setDevMode($input->getOption('dev')) ->setRunScripts(!$input->getOption('no-scripts')) - ->setOptimizeAutoloaders($input->getOption('optimize-autoloaders')) + ->setOptimizeAutoloader($input->getOption('optimize-autoloader')) ; if ($input->getOption('no-custom-installers')) { diff --git a/src/Composer/Command/UpdateCommand.php b/src/Composer/Command/UpdateCommand.php index de485b47a..1cbc654b9 100644 --- a/src/Composer/Command/UpdateCommand.php +++ b/src/Composer/Command/UpdateCommand.php @@ -37,7 +37,7 @@ class UpdateCommand extends Command new InputOption('no-custom-installers', null, InputOption::VALUE_NONE, 'Disables all custom installers.'), new InputOption('no-scripts', null, InputOption::VALUE_NONE, 'Skips the execution of all scripts defined in composer.json file.'), new InputOption('verbose', 'v', InputOption::VALUE_NONE, 'Shows more details including new commits pulled in when updating packages.'), - new InputOption('optimize-autoloaders', 'o', InputOption::VALUE_NONE, 'Optimize autoloaders during autoloader dump') + new InputOption('optimize-autoloader', 'o', InputOption::VALUE_NONE, 'Optimize autoloader during autoloader dump') )) ->setHelp(<<update command reads the composer.json file from the @@ -68,7 +68,7 @@ EOT ->setPreferDist($input->getOption('prefer-dist')) ->setDevMode($input->getOption('dev')) ->setRunScripts(!$input->getOption('no-scripts')) - ->setOptimizeAutoloaders($input->getOption('optimize-autoloaders')) + ->setOptimizeAutoloader($input->getOption('optimize-autoloader')) ->setUpdate(true) ->setUpdateWhitelist($input->getArgument('packages')) ; diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index 6ad27959a..a3898a95e 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -92,7 +92,7 @@ class Installer protected $preferSource = false; protected $preferDist = false; - protected $optimizeAutoloaders = false; + protected $optimizeAutoloader = false; protected $devMode = false; protected $dryRun = false; protected $verbose = false; @@ -222,7 +222,7 @@ class Installer // write autoloader $this->io->write('Generating autoload files'); $localRepos = new CompositeRepository($this->repositoryManager->getLocalRepositories()); - $this->autoloadGenerator->dump($this->config, $localRepos, $this->package, $this->installationManager, 'composer', $this->optimizeAutoloaders); + $this->autoloadGenerator->dump($this->config, $localRepos, $this->package, $this->installationManager, 'composer', $this->optimizeAutoloader); if ($this->runScripts) { // dispatch post event @@ -747,14 +747,14 @@ class Installer } /** - * Wether or not generated autoloaders are optimized + * Wether or not generated autoloader are optimized * - * @param bool $optimizeAutoloaders + * @param bool $optimizeAutoloader * @return Installer */ - public function setOptimizeAutoloaders($optimizeAutoloaders = false) + public function setOptimizeAutoloader($optimizeAutoloader = false) { - $this->optimizeAutoloaders = (boolean) $optimizeAutoloaders; + $this->optimizeAutoloader = (boolean) $optimizeAutoloader; return $this; }