From 095dc6129550de93cd98170c8e6c6ccd4558e983 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 29 Dec 2014 20:29:13 +0000 Subject: [PATCH] Rename runAutoloader to dumpAutoloader, refs #3453 --- src/Composer/Command/InstallCommand.php | 2 +- src/Composer/Command/UpdateCommand.php | 2 +- src/Composer/Installer.php | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Composer/Command/InstallCommand.php b/src/Composer/Command/InstallCommand.php index c1de25ce7..98cd21b9f 100644 --- a/src/Composer/Command/InstallCommand.php +++ b/src/Composer/Command/InstallCommand.php @@ -114,7 +114,7 @@ EOT ->setPreferSource($preferSource) ->setPreferDist($preferDist) ->setDevMode(!$input->getOption('no-dev')) - ->setRunAutoloader(!$input->getOption('no-autoloader')) + ->setDumpAutoloader(!$input->getOption('no-autoloader')) ->setRunScripts(!$input->getOption('no-scripts')) ->setOptimizeAutoloader($optimize) ->setIgnorePlatformRequirements($input->getOption('ignore-platform-reqs')) diff --git a/src/Composer/Command/UpdateCommand.php b/src/Composer/Command/UpdateCommand.php index cb3b50209..10fa26987 100644 --- a/src/Composer/Command/UpdateCommand.php +++ b/src/Composer/Command/UpdateCommand.php @@ -118,7 +118,7 @@ EOT ->setPreferSource($preferSource) ->setPreferDist($preferDist) ->setDevMode(!$input->getOption('no-dev')) - ->setRunAutoloader(!$input->getOption('no-autoloader')) + ->setDumpAutoloader(!$input->getOption('no-autoloader')) ->setRunScripts(!$input->getOption('no-scripts')) ->setOptimizeAutoloader($optimize) ->setUpdate(true) diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index 041a2f6c9..3594336e3 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -105,7 +105,7 @@ class Installer protected $dryRun = false; protected $verbose = false; protected $update = false; - protected $runAutoloader = true; + protected $dumpAutoloader = true; protected $runScripts = true; protected $ignorePlatformReqs = false; protected $preferStable = false; @@ -318,14 +318,14 @@ class Installer } } - if ($this->runAutoloader) { + if ($this->dumpAutoloader) { // write autoloader if ($this->optimizeAutoloader) { $this->io->write('Generating optimized autoload files'); } else { $this->io->write('Generating autoload files'); } - + $this->autoloadGenerator->setDevMode($this->devMode); $this->autoloadGenerator->dump($this->config, $localRepo, $this->package, $this->installationManager, 'composer', $this->optimizeAutoloader); } @@ -1169,14 +1169,14 @@ class Installer /** * set whether to run autoloader or not - * - * @param boolean $runAutoloader + * + * @param boolean $dumpAutoloader * @return Installer */ - public function setRunAutoloader($runAutoloader = true) + public function setDumpAutoloader($dumpAutoloader = true) { - $this->runAutoloader = (boolean) $runAutoloader; - + $this->dumpAutoloader = (boolean) $dumpAutoloader; + return $this; }