From 3a5d09a8b0b22adb1efa78237114cd503ec4eedc Mon Sep 17 00:00:00 2001 From: Justin Rainbow Date: Sun, 8 Jan 2012 15:55:12 -0700 Subject: [PATCH] Removing the 'writeSection' method from 'DialogHelper' --- src/Composer/Command/Helper/DialogHelper.php | 34 ++++++++++++++------ src/Composer/Command/InitCommand.php | 7 +++- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/Composer/Command/Helper/DialogHelper.php b/src/Composer/Command/Helper/DialogHelper.php index a0c034116..674b03800 100644 --- a/src/Composer/Command/Helper/DialogHelper.php +++ b/src/Composer/Command/Helper/DialogHelper.php @@ -1,5 +1,15 @@ + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + namespace Composer\Command\Helper; use Symfony\Component\Console\Helper\DialogHelper as BaseDialogHelper; @@ -7,17 +17,21 @@ use Symfony\Component\Console\Output\OutputInterface; class DialogHelper extends BaseDialogHelper { - public function writeSection(OutputInterface $output, $text, $style = 'bg=blue;fg=white') - { - $output->writeln(array( - '', - $this->getHelperSet()->get('formatter')->formatBlock($text, $style, true), - '', - )); - } - + /** + * Build text for asking a question. For example: + * + * "Do you want to continue [yes]:" + * + * @param string $question The question you want to ask + * @param mixed $default Default value to add to message, if false no default will be shown + * @param string $sep Separation char for between message and user input + * + * @return string + */ public function getQuestion($question, $default, $sep = ':') { - return $default ? sprintf('%s [%s]%s ', $question, $default, $sep) : sprintf('%s%s ', $question, $sep); + return $default ? + sprintf('%s [%s]%s ', $question, $default, $sep) : + sprintf('%s%s ', $question, $sep); } } \ No newline at end of file diff --git a/src/Composer/Command/InitCommand.php b/src/Composer/Command/InitCommand.php index d20fdedaa..93023d2ad 100644 --- a/src/Composer/Command/InitCommand.php +++ b/src/Composer/Command/InitCommand.php @@ -125,7 +125,12 @@ EOT $git = $this->getGitConfig(); $dialog = $this->getHelperSet()->get('dialog'); - $dialog->writeSection($output, 'Welcome to the Composer config generator'); + $formatter = $this->getHelperSet()->get('formatter'); + $output->writeln(array( + '', + $formatter->formatBlock('Welcome to the Composer config generator', 'bg=blue;fg=white', true), + '' + )); // namespace $output->writeln(array(