diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-16 09:09:12 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-07-16 18:36:02 +0200 |
| commit | ae7554270f5dc4bb2bcf4e7ead0c519d98d74bd0 (patch) | |
| tree | 4c11dc3eaf2e968f4b3aa2c16ef1849f5eda33bc /tests/output/sapi_windows_vt100_support_winko_in-err.phpt | |
| parent | 4659c12ae044154d112aec32d9dcb2ee65db7357 (diff) | |
| download | php-git-ae7554270f5dc4bb2bcf4e7ead0c519d98d74bd0.tar.gz | |
Fix #79805: sapi_windows_vt100_support throws TypeError
It does not make sense to throw a `TypeError` when the stream can't be
analyzed. If `sapi_windows_vt100_support()` is used as getter, we just
return `false` in that case; if the function is used as setter, we
additionally trigger a warning.
We also fix the test cases for this function, which have been broken
before. Note that these tests are still whitespace sensitive.
Diffstat (limited to 'tests/output/sapi_windows_vt100_support_winko_in-err.phpt')
| -rw-r--r-- | tests/output/sapi_windows_vt100_support_winko_in-err.phpt | 76 |
1 files changed, 21 insertions, 55 deletions
diff --git a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt index 45d288f15b..86cf631110 100644 --- a/tests/output/sapi_windows_vt100_support_winko_in-err.phpt +++ b/tests/output/sapi_windows_vt100_support_winko_in-err.phpt @@ -76,70 +76,36 @@ STDERR (php://fd/2): - current value : bool(false) - disabling VT100: bool(false) - current value : bool(false) -Not a stream: -- current value : -Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d -bool(false) -- enabling VT100 : -Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d -bool(false) -- current value : -Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d -bool(false) -- disabling VT100: -Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d -bool(false) -- current value : -Warning: sapi_windows_vt100_support(): Argument #1 must be of type resource, string given in %s on line %d -bool(false) Invalid stream (php://temp): -- current value : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d -bool(false) -- enabling VT100 : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d -bool(false) -- current value : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d -bool(false) -- disabling VT100: -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d +- current value : bool(false) +- enabling VT100 : +Warning: sapi_windows_vt100_support(): not able to analyze the specified stream in %s on line %d bool(false) -- current value : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d +- current value : bool(false) +- disabling VT100: +Warning: sapi_windows_vt100_support(): not able to analyze the specified stream in %s on line %d bool(false) +- current value : bool(false) Invalid stream (php://input): -- current value : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d -bool(false) -- enabling VT100 : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d -bool(false) -- current value : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d -bool(false) -- disabling VT100: -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d +- current value : bool(false) +- enabling VT100 : +Warning: sapi_windows_vt100_support(): not able to analyze the specified stream in %s on line %d bool(false) -- current value : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d +- current value : bool(false) +- disabling VT100: +Warning: sapi_windows_vt100_support(): not able to analyze the specified stream in %s on line %d bool(false) +- current value : bool(false) Invalid stream (php://memory): -- current value : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d -bool(false) -- enabling VT100 : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d -bool(false) -- current value : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d -bool(false) -- disabling VT100: -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d +- current value : bool(false) +- enabling VT100 : +Warning: sapi_windows_vt100_support(): not able to analyze the specified stream in %s on line %d bool(false) -- current value : -Warning: sapi_windows_vt100_support() was not able to analyze the specified stream in %s on line %d +- current value : bool(false) +- disabling VT100: +Warning: sapi_windows_vt100_support(): not able to analyze the specified stream in %s on line %d bool(false) +- current value : bool(false) File stream: - current value : bool(false) - enabling VT100 : bool(false) |