Merge branch '3.4' into 4.3
* 3.4: [Console][SymfonyQuestionHelper] Handle multibytes question choices keys and custom prompt
This commit is contained in:
commit
91016348ba
@ -162,15 +162,9 @@ class QuestionHelper extends Helper
|
||||
$message = $question->getQuestion();
|
||||
|
||||
if ($question instanceof ChoiceQuestion) {
|
||||
$maxWidth = max(array_map([$this, 'strlen'], array_keys($question->getChoices())));
|
||||
|
||||
$messages = (array) $question->getQuestion();
|
||||
foreach ($question->getChoices() as $key => $value) {
|
||||
$width = $maxWidth - $this->strlen($key);
|
||||
$messages[] = ' [<info>'.$key.str_repeat(' ', $width).'</info>] '.$value;
|
||||
}
|
||||
|
||||
$output->writeln($messages);
|
||||
$output->writeln(array_merge([
|
||||
$question->getQuestion(),
|
||||
], $this->formatChoiceQuestionChoices($question, 'info')));
|
||||
|
||||
$message = $question->getPrompt();
|
||||
}
|
||||
@ -178,6 +172,26 @@ class QuestionHelper extends Helper
|
||||
$output->write($message);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $tag
|
||||
*
|
||||
* @return string[]
|
||||
*/
|
||||
protected function formatChoiceQuestionChoices(ChoiceQuestion $question, $tag)
|
||||
{
|
||||
$messages = [];
|
||||
|
||||
$maxWidth = max(array_map('self::strlen', array_keys($choices = $question->getChoices())));
|
||||
|
||||
foreach ($choices as $key => $value) {
|
||||
$padding = str_repeat(' ', $maxWidth - self::strlen($key));
|
||||
|
||||
$messages[] = sprintf(" [<$tag>%s$padding</$tag>] %s", $key, $value);
|
||||
}
|
||||
|
||||
return $messages;
|
||||
}
|
||||
|
||||
/**
|
||||
* Outputs an error message.
|
||||
*/
|
||||
|
@ -68,15 +68,15 @@ class SymfonyQuestionHelper extends QuestionHelper
|
||||
|
||||
$output->writeln($text);
|
||||
|
||||
$prompt = ' > ';
|
||||
|
||||
if ($question instanceof ChoiceQuestion) {
|
||||
$width = max(array_map('strlen', array_keys($question->getChoices())));
|
||||
$output->writeln($this->formatChoiceQuestionChoices($question, 'comment'));
|
||||
|
||||
foreach ($question->getChoices() as $key => $value) {
|
||||
$output->writeln(sprintf(" [<comment>%-${width}s</comment>] %s", $key, $value));
|
||||
}
|
||||
$prompt = $question->getPrompt();
|
||||
}
|
||||
|
||||
$output->write(' > ');
|
||||
$output->write($prompt);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -130,6 +130,49 @@ class SymfonyQuestionHelperTest extends AbstractQuestionHelperTest
|
||||
$dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), new Question('What\'s your name?'));
|
||||
}
|
||||
|
||||
public function testChoiceQuestionPadding()
|
||||
{
|
||||
$choiceQuestion = new ChoiceQuestion('qqq', [
|
||||
'foo' => 'foo',
|
||||
'żółw' => 'bar',
|
||||
'łabądź' => 'baz',
|
||||
]);
|
||||
|
||||
(new SymfonyQuestionHelper())->ask(
|
||||
$this->createStreamableInputInterfaceMock($this->getInputStream("foo\n")),
|
||||
$output = $this->createOutputInterface(),
|
||||
$choiceQuestion
|
||||
);
|
||||
|
||||
$this->assertOutputContains(<<<EOT
|
||||
qqq:
|
||||
[foo ] foo
|
||||
[żółw ] bar
|
||||
[łabądź] baz
|
||||
>
|
||||
EOT
|
||||
, $output);
|
||||
}
|
||||
|
||||
public function testChoiceQuestionCustomPrompt()
|
||||
{
|
||||
$choiceQuestion = new ChoiceQuestion('qqq', ['foo']);
|
||||
$choiceQuestion->setPrompt(' >ccc> ');
|
||||
|
||||
(new SymfonyQuestionHelper())->ask(
|
||||
$this->createStreamableInputInterfaceMock($this->getInputStream("foo\n")),
|
||||
$output = $this->createOutputInterface(),
|
||||
$choiceQuestion
|
||||
);
|
||||
|
||||
$this->assertOutputContains(<<<EOT
|
||||
qqq:
|
||||
[0] foo
|
||||
>ccc>
|
||||
EOT
|
||||
, $output);
|
||||
}
|
||||
|
||||
protected function getInputStream($input)
|
||||
{
|
||||
$stream = fopen('php://memory', 'r+', false);
|
||||
|
Reference in New Issue
Block a user