Added i18n support to ConfirmationQuestion

wouterj · wouterj · commit 3cb280d8dfaa · 2015-01-07T14:28:56.000+01:00
diff --git a/src/Symfony/Component/Console/Question/ConfirmationQuestion.php b/src/Symfony/Component/Console/Question/ConfirmationQuestion.php
@@ -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;
     }
 
     /**
@@ -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;
         };
     }
 }
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -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()

Original file line number	Diff line number	Diff line change
`@@ -18,17 +18,22 @@`
`18`	`18`	`*/`
`19`	`19`	`class ConfirmationQuestion extends Question`
`20`	`20`	`{`
	`21`	`+ private $trueAnswerRegex;`
	`22`	`+`
`21`	`23`	`/**`
`22`	`24`	`* Constructor.`
`23`	`25`	`*`
`24`		`- * @param string $question The question to ask to the user`
`25`		`- * @param bool $default The default answer to return, true or false`
	`26`	`+ * @param string $question The question to ask to the user`
	`27`	`+ * @param bool $default The default answer to return, true or false`
	`28`	`+ * @param string $trueAnswerRegex A regex to match the "yes" answer`
`26`	`29`	`*/`
`27`		`- public function __construct($question, $default = true)`
	`30`	`+ public function __construct($question, $default = true, $trueAnswerRegex = '/^y/i')`
`28`	`31`	`{`
`29`	`32`	`parent::__construct($question, (bool) $default);`
`30`	`33`
`31`	`34`	`$this->setNormalizer($this->getDefaultNormalizer());`
	`35`	`+`
	`36`	`+ $this->trueAnswerRegex = $trueAnswerRegex;`
`32`	`37`	`}`
`33`	`38`
`34`	`39`	`/**`
`@@ -45,11 +50,12 @@ private function getDefaultNormalizer()`
`45`	`50`	`return $answer;`
`46`	`51`	`}`
`47`	`52`
	`53`	`+ $answerIsTrue = (bool) preg_match($this->trueAnswerRegex, $answer);`
`48`	`54`	`if (false === $default) {`
`49`		`- return $answer && 'y' === strtolower($answer[0]);`
	`55`	`+ return $answer && $answerIsTrue;`
`50`	`56`	`}`
`51`	`57`
`52`		`- return !$answer \|\| 'y' === strtolower($answer[0]);`
	`58`	`+ return !$answer \|\| $answerIsTrue;`
`53`	`59`	`};`
`54`	`60`	`}`
`55`	`61`	`}`