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

Remove some state

pull/4146/merge
Jordi Boggiano 2015-06-18 11:12:57 +01:00
parent 460f2f438e
commit b025d0982b
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Composer/Command/ArchiveCommand.php
View File

@ -14,6 +14,7 @@ namespace Composer\Command;
use Composer\Factory; use Composer\Factory;
use Composer\IO\IOInterface; use Composer\IO\IOInterface;
use Composer\Config;
use Composer\DependencyResolver\Pool; use Composer\DependencyResolver\Pool;
use Composer\Repository\CompositeRepository; use Composer\Repository\CompositeRepository;
use Composer\Script\ScriptEvents; use Composer\Script\ScriptEvents;
@ -33,18 +34,16 @@ use Symfony\Component\Console\Output\OutputInterface;
*/ */
class ArchiveCommand extends Command class ArchiveCommand extends Command
{ {
private $config;
protected function configure() protected function configure()
{ {
$this->config = Factory::createConfig();
$this $this
->setName('archive') ->setName('archive')
->setDescription('Create an archive of this composer package') ->setDescription('Create an archive of this composer package')
->setDefinition(array( ->setDefinition(array(
new InputArgument('package', InputArgument::OPTIONAL, 'The package to archive instead of the current project'), new InputArgument('package', InputArgument::OPTIONAL, 'The package to archive instead of the current project'),
new InputArgument('version', InputArgument::OPTIONAL, 'A version constraint to find the package to archive'), new InputArgument('version', InputArgument::OPTIONAL, 'A version constraint to find the package to archive'),
new InputOption('format', 'f', InputOption::VALUE_OPTIONAL, 'Format of the resulting archive: tar or zip', null), new InputOption('format', 'f', InputOption::VALUE_OPTIONAL, 'Format of the resulting archive: tar or zip'),
new InputOption('dir', false, InputOption::VALUE_OPTIONAL, 'Write the archive to this directory', null), new InputOption('dir', false, InputOption::VALUE_OPTIONAL, 'Write the archive to this directory'),
)) ))
->setHelp(<<<EOT ->setHelp(<<<EOT
The <info>archive</info> command creates an archive of the specified format The <info>archive</info> command creates an archive of the specified format
@ -60,27 +59,28 @@ EOT
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$config = Factory::createConfig();
$composer = $this->getComposer(false); $composer = $this->getComposer(false);
if ($composer) { if ($composer) {
$commandEvent = new CommandEvent(PluginEvents::COMMAND, 'archive', $input, $output); $commandEvent = new CommandEvent(PluginEvents::COMMAND, 'archive', $input, $output);
$composer->getEventDispatcher()->dispatch($commandEvent->getName(), $commandEvent); $composer->getEventDispatcher()->dispatch($commandEvent->getName(), $commandEvent);
$composer->getEventDispatcher()->dispatchScript(ScriptEvents::PRE_ARCHIVE_CMD); $composer->getEventDispatcher()->dispatchScript(ScriptEvents::PRE_ARCHIVE_CMD);
} }
$format = $input->getOption('format');
$dir = $input->getOption('dir'); if (null === $input->getOption('format')) {
if ($format==null) { $input->setOption('format', $config->get('archive-format'));
$format = $this->config->get('archive-format');
} }
if ($dir==null) { if (null === $input->getOption('dir')) {
$dir = $this->config->get('archive-dir'); $input->setOption('dir', $config->get('archive-dir'));
} }
$returnCode = $this->archive( $returnCode = $this->archive(
$this->getIO(), $this->getIO(),
$config,
$input->getArgument('package'), $input->getArgument('package'),
$input->getArgument('version'), $input->getArgument('version'),
$format, $input->getOption('format'),
$dir $input->getOption('dir')
); );
if (0 === $returnCode && $composer) { if (0 === $returnCode && $composer) {
@ -90,11 +90,11 @@ EOT
return $returnCode; return $returnCode;
} }
protected function archive(IOInterface $io, $packageName = null, $version = null, $format = 'tar', $dest = '.') protected function archive(IOInterface $io, Config $config, $packageName = null, $version = null, $format = 'tar', $dest = '.')
{ {
$factory = new Factory; $factory = new Factory;
$downloadManager = $factory->createDownloadManager($io, $this->config); $downloadManager = $factory->createDownloadManager($io, $config);
$archiveManager = $factory->createArchiveManager($this->config, $downloadManager); $archiveManager = $factory->createArchiveManager($config, $downloadManager);
if ($packageName) { if ($packageName) {
$package = $this->selectPackage($io, $packageName, $version); $package = $this->selectPackage($io, $packageName, $version);