diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.4' into 5.0

Browse Source 
* 4.4:
  [Console] Reset question validator attempts only for actual stdin (bis)
This commit is contained in:
Nicolas Grekas 2020-06-15 14:59:07 +02:00
commit 01095156ad
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Symfony/Component/Console/Helper/QuestionHelper.php
View File

@ -104,7 +104,7 @@ class QuestionHelper extends Helper
{
$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()) {
@ -472,7 +472,7 @@ class QuestionHelper extends Helper
} catch (\Exception $error) {
}
$attempts = $attempts ?? -(int) $this->isTty();
$attempts = $attempts ?? -(int) $this->askForever();
}
throw $error;
@ -505,18 +505,20 @@ class QuestionHelper extends Helper
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;