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

Fix feedback, refs #3199

pull/4207/merge
Jordi Boggiano 2016-02-29 15:32:49 +00:00
parent d24ea66892
commit a0de19f74d
3 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/Composer/IO/ConsoleIO.php
View File

@ -219,17 +219,11 @@ class ConsoleIO extends BaseIO
*/
public function ask($question, $default = null)
{
$output = $this->output;
if ($output instanceof ConsoleOutputInterface) {
$output = $output->getErrorOutput();
}
/** @var \Symfony\Component\Console\Helper\QuestionHelper $helper */
$helper = $this->helperSet->get('question');
$question = new Question($question, $default);
return $helper->ask($this->input, $output, $question);
return $helper->ask($this->input, $this->getErrorOutput(), $question);
}
/**
@ -237,17 +231,11 @@ class ConsoleIO extends BaseIO
*/
public function askConfirmation($question, $default = true)
{
$output = $this->output;
if ($output instanceof ConsoleOutputInterface) {
$output = $output->getErrorOutput();
}
/** @var \Symfony\Component\Console\Helper\QuestionHelper $helper */
$helper = $this->helperSet->get('question');
$question = new ConfirmationQuestion($question, $default);
return $helper->ask($this->input, $output, $question);
return $helper->ask($this->input, $this->getErrorOutput(), $question);
}
/**
@ -255,19 +243,13 @@ class ConsoleIO extends BaseIO
*/
public function askAndValidate($question, $validator, $attempts = null, $default = null)
{
$output = $this->output;
if ($output instanceof ConsoleOutputInterface) {
$output = $output->getErrorOutput();
}
/** @var \Symfony\Component\Console\Helper\QuestionHelper $helper */
$helper = $this->helperSet->get('question');
$question = new Question($question, $default);
$question->setValidator($validator);
$question->setMaxAttempts($attempts);
return $helper->ask($this->input, $output, $question);
return $helper->ask($this->input, $this->getErrorOutput(), $question);
}
/**
@ -283,8 +265,21 @@ class ConsoleIO extends BaseIO
/**
* {@inheritDoc}
*/
public function select($question, $choices, $default = null, $attempts = false, $errorMessage = 'Value "%s" is invalid', $multiselect = false)
public function select($question, $choices, $default, $attempts = false, $errorMessage = 'Value "%s" is invalid', $multiselect = false)
{
return $this->helperSet->get('dialog')->select($this->output, $question, $choices, $default, $attempts, $errorMessage, $multiselect);
if ($this->isInteractive()) {
return $this->helperSet->get('dialog')->select($this->getErrorOutput(), $question, $choices, $default, $attempts, $errorMessage, $multiselect);
}
return $default;
}
private function getErrorOutput()
{
if ($this->output instanceof ConsoleOutputInterface) {
return $this->output->getErrorOutput();
}
return $this->output;
}
}

2
src/Composer/IO/IOInterface.php
View File

@ -163,7 +163,7 @@ interface IOInterface
*
* @throws \InvalidArgumentException
*/
public function select($question, $choices, $default = null, $attempts = false, $errorMessage = 'Value "%s" is invalid', $multiselect = false);
public function select($question, $choices, $default, $attempts = false, $errorMessage = 'Value "%s" is invalid', $multiselect = false);
/**
* Get all authentication information entered.

2
src/Composer/IO/NullIO.php
View File

@ -122,7 +122,7 @@ class NullIO extends BaseIO
/**
* {@inheritDoc}
*/
public function select($question, $choices, $default = null, $attempts = false, $errorMessage = 'Value "%s" is invalid', $multiselect = false)
public function select($question, $choices, $default, $attempts = false, $errorMessage = 'Value "%s" is invalid', $multiselect = false)
{
return $default;
}