[Console] Default hidden question to 1 attempt for non-tty session

symfony · fabpot · May 4, 2020 · Apr 27, 2020 · Apr 27, 2020 · ee7fc5544ef6bf9f410f91ea0aeb45546a0db740
commit ee7fc5544ef6bf9f410f91ea0aeb45546a0db740
@@ -437,7 +437,7 @@ private function getHiddenResponse(OutputInterface $output, $inputStream, bool $

        if (false !== $shell = $this->getShell()) {
            $readCmd = 'csh' === $shell ? 'set mypassword = $<' : 'read -r mypassword';
-            $command = sprintf("/usr/bin/env %s -c 'stty -echo; %s; stty echo; echo \$mypassword'", $shell, $readCmd);
+            $command = sprintf("/usr/bin/env %s -c 'stty -echo; %s; stty echo; echo \$mypassword' 2> /dev/null", $shell, $readCmd);
            $sCommand = shell_exec($command);
            $value = $trimmable ? rtrim($sCommand) : $sCommand;
            $output->writeln('');
@@ -461,6 +461,11 @@ private function validateAttempts(callable $interviewer, OutputInterface $output
    {
        $error = null;
        $attempts = $question->getMaxAttempts();
+
+        if (null === $attempts && !$this->isTty()) {
+            $attempts = 1;
+        }
+
        while (null === $attempts || $attempts--) {
            if (null !== $error) {
                $this->writeError($output, $error);
@@ -503,4 +508,19 @@ private function getShell()

        return self::$shell;
    }
+
+    private function isTty(): bool
+    {
+        $inputStream = !$this->inputStream && \defined('STDIN') ? STDIN : $this->inputStream;
+
+        if (\function_exists('stream_isatty')) {
+            return stream_isatty($inputStream);
+        }
+
+        if (!\function_exists('posix_isatty')) {
+            return posix_isatty($inputStream);
+        }
+
+        return true;
+    }
 }
@@ -726,6 +726,23 @@ public function testAskThrowsExceptionOnMissingInputWithValidator()
        $dialog->ask($this->createStreamableInputInterfaceMock($this->getInputStream('')), $this->createOutputInterface(), $question);
    }

+    public function testAskThrowsExceptionFromValidatorEarlyWhenTtyIsMissing()
+    {
+        $this->expectException('Exception');
+        $this->expectExceptionMessage('Bar, not Foo');
+
+        $output = $this->getMockBuilder('\Symfony\Component\Console\Output\OutputInterface')->getMock();
+        $output->expects($this->once())->method('writeln');
+
+        (new QuestionHelper())->ask(
+            $this->createStreamableInputInterfaceMock($this->getInputStream('Foo'), true),
+            $output,
+            (new Question('Q?'))->setHidden(true)->setValidator(function ($input) {
+                throw new \Exception("Bar, not $input");
+            })
+        );
+    }
+
    public function testEmptyChoices()
    {
        $this->expectException('LogicException');