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

[Console] Reset question validator attempts only for actual stdin (bis)

Browse Source
This commit is contained in:
Nicolas Grekas 2020-06-15 14:27:36 +02:00
parent 52612b1541
commit 867642e337
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); $this->writePrompt($output, $question);
$inputStream = $this->inputStream ?: STDIN; $inputStream = $this->inputStream ?: fopen('php://stdin', 'r');
$autocomplete = $question->getAutocompleterCallback(); $autocomplete = $question->getAutocompleterCallback();
if (null === $autocomplete || !self::$stty || !Terminal::hasSttyAvailable()) { if (null === $autocomplete || !self::$stty || !Terminal::hasSttyAvailable()) {
@ -474,7 +474,7 @@ class QuestionHelper extends Helper
} catch (\Exception $error) { } catch (\Exception $error) {
} }
$attempts = $attempts ?? -(int) $this->isTty(); $attempts = $attempts ?? -(int) $this->askForever();
} }
throw $error; throw $error;
@ -507,18 +507,20 @@ class QuestionHelper extends Helper
return self::$shell; 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; return true;
} }
if (\function_exists('stream_isatty')) { if (\function_exists('stream_isatty')) {
return stream_isatty(fopen('php://input', 'r')); return stream_isatty($inputStream);
} }
if (\function_exists('posix_isatty')) { if (\function_exists('posix_isatty')) {
return posix_isatty(fopen('php://input', 'r')); return posix_isatty($inputStream);
} }
return true; return true;