10BC0 Added i18n support to ConfirmationQuestion by wouterj · Pull Request #11129 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

Added i18n support to ConfirmationQuestion #11129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2015
Merged

Added i18n support to ConfirmationQuestion #11129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
8000
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/Symfony/Component/Console/Question/ConfirmationQuestion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,22 @@
*/
class ConfirmationQuestion extends Question
{
private $trueAnswerRegex;

/**
* Constructor.
*
* @param string $question The question to ask to the user
* @param bool $default The default answer to return, true or false
* @param string $question The question to ask to the user
* @param bool $default The default answer to return, true or false
* @param string $trueAnswerRegex A regex to match the "yes" answer
*/
public function __construct($question, $default = true)
public function __construct($question, $default = true, $trueAnswerRegex = '/^y/i')
{
parent::__construct($question, (bool) $default);

$this->setNormalizer($this->getDefaultNormalizer());

$this->trueAnswerRegex = $trueAnswerRegex;
}

/**
Expand All @@ -45,11 +50,12 @@ private function getDefaultNormalizer()
return $answer;
}

$answerIsTrue = (bool) preg_match($this->trueAnswerRegex, $answer);
if (false === $default) {
return $answer && 'y' === strtolower($answer[0]);
return $answer && $answerIsTrue;
}

return !$answer || 'y' === strtolower($answer[0]);
return !$answer || $answerIsTrue;
};
}
}
42 changes: 27 additions & 15 deletions src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,27 +143,39 @@ public function testAskHiddenResponse()
$this->assertEquals('8AM', $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
}

public function testAskConfirmation()
/**
* @dataProvider getAskConfirmationData
*/
public function testAskConfirmation($question, $expected, $default = true)
{
$dialog = new QuestionHelper();

$dialog->setInputStream($this->getInputStream("\n\n"));
$question = new ConfirmationQuestion('Do you like French fries?');
$this->assertTrue($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
$question = new ConfirmationQuestion('Do you like French fries?', false);
$this->assertFalse($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
$dialog->setInputStream($this->getInputStream($question."\n"));
$question = new ConfirmationQuestion('Do you like French fries?', $default);
$this->assertEquals($expected, $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question), 'confirmation question should '.($expected ? 'pass' : 'cancel'));
}

$dialog->setInputStream($this->getInputStream("y\nyes\n"));
$question = new ConfirmationQuestion('Do you like French fries?', false);
public function getAskConfirmationData()
{
return array(
array('', true),
array('', false, false),
array('y', true),
array('yes', true),
array('n', false),
array('no', false),
);
}

public function testAskConfirmationWithCustomTrueAnswer()
{
$dialog = new QuestionHelper();

$dialog->setInputStream($this->getInputStream("j\ny\n"));
$question = new ConfirmationQuestion('Do you like French fries?', false, '/^(j|y)/i');
$this->assertTrue($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
$question = new ConfirmationQuestion('Do you like French fries?', false);
$question = new ConfirmationQuestion('Do you like French fries?', false, '/^(j|y)/i');
$this->assertTrue($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));

$dialog->setInputStream($this->getInputStream("n\nno\n"));
$question = new ConfirmationQuestion('Do you like French fries?', true);
$this->assertFalse($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
$question = new ConfirmationQuestion('Do you like French fries?', true);
$this->assertFalse($dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question));
}

public function testAskAndValidate()
Expand Down
0