Skip to content

Commit

Permalink
Merge branch '5.0' into 5.1
Browse files Browse the repository at this point in the history
* 5.0:
  [Console] Reset question validator attempts only for actual stdin (bis)
  • Loading branch information
nicolas-grekas committed Jun 15, 2020
2 parents 95242c2 + 8489f8c commit 34ac555
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions Helper/QuestionHelper.php
Expand Up @@ -106,7 +106,7 @@ private function doAsk(OutputInterface $output, Question $question)
{
$this->writePrompt($output, $question);

$inputStream = $this->inputStream ?: STDIN;
$inputStream = $this->inputStream ?: fopen('php://stdin', 'r');
$autocomplete = $question->getAutocompleterCallback();

if (null === $autocomplete || !self::$stty || !Terminal::hasSttyAvailable()) {
Expand Down Expand Up @@ -473,7 +473,7 @@ private function validateAttempts(callable $interviewer, OutputInterface $output
} catch (\Exception $error) {
}

$attempts = $attempts ?? -(int) $this->isTty();
$attempts = $attempts ?? -(int) $this->askForever();
}

throw $error;
Expand Down Expand Up @@ -506,18 +506,20 @@ private function getShell()
return self::$shell;
}

private function isTty(): bool
private function askForever(): bool
{
if (!\defined('STDIN')) {
$inputStream = $this->inputStream ?: fopen('php://stdin', 'r');

if ('php://stdin' !== (stream_get_meta_data($inputStream)['url'] ?? null)) {
return true;
}

if (\function_exists('stream_isatty')) {
return stream_isatty(fopen('php://input', 'r'));
return stream_isatty($inputStream);
}

if (\function_exists('posix_isatty')) {
return posix_isatty(fopen('php://input', 'r'));
return posix_isatty($inputStream);
}

return true;
Expand Down

0 comments on commit 34ac555

Please sign in to comment.