[Console] Fix infinite loop on missing input

chalasr · chalasr · commit 9405bd594b3d · 2016-11-01T21:01:49.000+01:00
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -399,6 +399,8 @@ private function validateAttempts($interviewer, OutputInterface $output, Questio
 
             try {
                 return call_user_func($question->getValidator(), $interviewer());
+            } catch (RuntimeException $e) {
+                throw $e;
             } catch (\Exception $error) {
             }
         }
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -402,6 +402,25 @@ public function testChoiceOutputFormattingQuestionForUtf8Keys()
         $dialog->ask($this->createInputInterfaceMock(), $output, $question);
     }
 
+    /**
+     * @expectedException        \Symfony\Component\Console\Exception\RuntimeException
+     * @expectedExceptionMessage Aborted
+     */
+    public function testAskThrowsExceptionOnMissingInputWithValidator()
+    {
+        $dialog = new QuestionHelper();
+        $dialog->setInputStream($this->getInputStream(''));
+
+        $question = new Question('What\'s your name?');
+        $question->setValidator(function () {
+            if (!$value) {
+                throw new \Exception('A value is required.');
+            }
+        });
+
+        $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), $question);
+    }
+
     protected function getInputStream($input)
     {
         $stream = fopen('php://memory', 'r+', false);
diff --git a/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/SymfonyQuestionHelperTest.php
@@ -101,6 +101,18 @@ public function testAskEscapeLabel()
         $this->assertOutputContains('Do you want a \?', $output);
     }
 
+    /**
+     * @expectedException        \Symfony\Component\Console\Exception\RuntimeException
+     * @expectedExceptionMessage Aborted
+     */
+    public function testAskThrowsExceptionOnMissingInput()
+    {
+        $dialog = new SymfonyQuestionHelper();
+
+        $dialog->setInputStream($this->getInputStream(''));
+        $dialog->ask($this->createInputInterfaceMock(), $this->createOutputInterface(), new Question('What\'s your name?'));
+    }
+
     protected function getInputStream($input)
     {
         $stream = fopen('php://memory', 'r+', false);

Original file line number	Diff line number	Diff line change
`@@ -399,6 +399,8 @@ private function validateAttempts($interviewer, OutputInterface $output, Questio`
`399`	`399`
`400`	`400`	`try {`
`401`	`401`	`return call_user_func($question->getValidator(), $interviewer());`
	`402`	`+ } catch (RuntimeException $e) {`
	`403`	`+ throw $e;`
`402`	`404`	`} catch (\Exception $error) {`
`403`	`405`	`}`
`404`	`406`	`}`