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

Moved DialogHelper into the base Application

pull/286/head
Justin Rainbow 2012-01-08 15:40:30 -07:00
parent 9ec641659e
commit 7a0a1788e3
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Composer/Command/InitCommand.php
View File

@ -13,7 +13,6 @@
namespace Composer\Command; namespace Composer\Command;
use Composer\Json\JsonFile; use Composer\Json\JsonFile;
use Composer\Command\Helper\DialogHelper;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
@ -70,7 +69,7 @@ EOT
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$dialog = $this->getDialogHelper(); $dialog = $this->getHelperSet()->get('dialog');
$whitelist = array('name', 'description', 'author', 'require'); $whitelist = array('name', 'description', 'author', 'require');
@ -125,7 +124,7 @@ EOT
{ {
$git = $this->getGitConfig(); $git = $this->getGitConfig();
$dialog = $this->getDialogHelper(); $dialog = $this->getHelperSet()->get('dialog');
$dialog->writeSection($output, 'Welcome to the Composer config generator'); $dialog->writeSection($output, 'Welcome to the Composer config generator');
// namespace // namespace
@ -208,16 +207,6 @@ EOT
$input->setOption('require', $requirements); $input->setOption('require', $requirements);
} }
protected function getDialogHelper()
{
$dialog = $this->getHelperSet()->get('dialog');
if (!$dialog || get_class($dialog) !== 'Composer\Command\Helper\DialogHelper') {
$this->getHelperSet()->set($dialog = new DialogHelper());
}
return $dialog;
}
protected function findPackages($name) protected function findPackages($name)
{ {
$composer = $this->getComposer(); $composer = $this->getComposer();
@ -243,7 +232,7 @@ EOT
protected function determineRequirements(InputInterface $input, OutputInterface $output) protected function determineRequirements(InputInterface $input, OutputInterface $output)
{ {
$dialog = $this->getDialogHelper(); $dialog = $this->getHelperSet()->get('dialog');
$prompt = $dialog->getQuestion('Search for a package', false, ':'); $prompt = $dialog->getQuestion('Search for a package', false, ':');
$requires = $input->getOption('require') ?: array(); $requires = $input->getOption('require') ?: array();

13
src/Composer/Console/Application.php
View File

@ -20,6 +20,7 @@ use Symfony\Component\Console\Formatter\OutputFormatter;
use Symfony\Component\Console\Formatter\OutputFormatterStyle; use Symfony\Component\Console\Formatter\OutputFormatterStyle;
use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\Finder;
use Composer\Command; use Composer\Command;
use Composer\Command\Helper\DialogHelper;
use Composer\Composer; use Composer\Composer;
use Composer\Factory; use Composer\Factory;
use Composer\IO\IOInterface; use Composer\IO\IOInterface;
@ -115,4 +116,16 @@ class Application extends BaseApplication
$this->add(new Command\SelfUpdateCommand()); $this->add(new Command\SelfUpdateCommand());
} }
} }
/**
* {@inheritDoc}
*/
protected function getDefaultHelperSet()
{
$helperSet = parent::getDefaultHelperSet();
$helperSet->set(new DialogHelper());
return $helperSet;
}
} }