-
-
Notifications
You must be signed in to change notification settings - Fork 9.6k
[Console] Reset question validator attempts only for actual stdin (bis) #37286
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weβll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -104,7 +104,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()) { | ||
|
@@ -474,7 +474,7 @@ private function validateAttempts(callable $interviewer, OutputInterface $output | |
} catch (\Exception $error) { | ||
} | ||
|
||
$attempts = $attempts ?? -(int) $this->isTty(); | ||
$attempts = $attempts ?? -(int) $this->askForever(); | ||
} | ||
|
||
throw $error; | ||
|
@@ -507,18 +507,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); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this was my mistake: using |
||
} | ||
|
||
if (\function_exists('posix_isatty')) { | ||
return posix_isatty(fopen('php://input', 'r')); | ||
return posix_isatty($inputStream); | ||
} | ||
|
||
return true; | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually this is not needed to fix the failure, but making the behavior of this method global looks suspicious to me so here is a local check
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note that this check works even if
$inputStream === STDIN
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you sure with
url
here?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pretty much yes: https://3v4l.org/njZZV
What's your runtime?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That 3v4l snippet follows behaviour I observe on my PC, it looks to be
uri
, noturl
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
π€¦