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.

diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index f871a7633a293726a97d150c84da13efea1e5452..9f5147d5f3f1e4ad7b9d791d47e4a5bdd5350fcd 100755 (executable)
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -1314,7 +1314,7 @@ function stream_isatty($stream): bool {}
 
 #ifdef PHP_WIN32
 /** @param resource $stream */
-function sapi_windows_vt100_support($stream, bool $enable = UNKNOWN): bool {}
+function sapi_windows_vt100_support($stream, ?bool $enable = null): bool {}
 #endif
 
 /** @param resource $stream */

diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index a4b70b23bb8238a167ea579ca555afde5b0fe941..52cce1cabf1088ca3787e42dd3b6a228bc478edf 100755 (executable)
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 05b740207a70a9d272b4c327882fd0b52016a0af */
+ * Stub hash: 49142ce7a3c79618e87a350b87994e01b1d69ff8 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
        ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -2028,7 +2028,7 @@ ZEND_END_ARG_INFO()
 #if defined(PHP_WIN32)
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_sapi_windows_vt100_support, 0, 1, _IS_BOOL, 0)
        ZEND_ARG_INFO(0, stream)
-       ZEND_ARG_TYPE_INFO(0, enable, _IS_BOOL, 0)
+       ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 1, "null")
 ZEND_END_ARG_INFO()
 #endif
 

diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index c0d950a18c752a1f4ab57d4692e273ae23769cff..1c49b26ac7db10238a30ccbc0884aeccea50723b 100644 (file)
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -1623,15 +1623,13 @@ PHP_FUNCTION(sapi_windows_vt100_support)
 {
        zval *zsrc;
        php_stream *stream;
-       zend_bool enable;
+       zend_bool enable, enable_is_null = 1;
        zend_long fileno;
 
-       int argc = ZEND_NUM_ARGS();
-
        ZEND_PARSE_PARAMETERS_START(1, 2)
                Z_PARAM_RESOURCE(zsrc)
                Z_PARAM_OPTIONAL
-               Z_PARAM_BOOL(enable)
+               Z_PARAM_BOOL_OR_NULL(enable, enable_is_null)
        ZEND_PARSE_PARAMETERS_END();
 
        php_stream_from_zval(stream, zsrc);
@@ -1643,11 +1641,14 @@ PHP_FUNCTION(sapi_windows_vt100_support)
                php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)&fileno, 0);
        }
        else {
-               zend_type_error(
-                       "%s() was not able to analyze the specified stream",
-                       get_active_function_name()
-               );
-               RETURN_THROWS();
+               if (!enable_is_null) {
+                       php_error_docref(
+                               NULL,
+                               E_WARNING,
+                               "not able to analyze the specified stream"
+                       );
+               }
+               RETURN_FALSE;
        }
 
        /* Check if the file descriptor is a console */
@@ -1655,7 +1656,7 @@ PHP_FUNCTION(sapi_windows_vt100_support)
                RETURN_FALSE;
        }
 
-       if (argc == 1) {
+       if (enable_is_null) {
                /* Check if the Windows standard handle has VT100 control codes enabled */
                if (php_win32_console_fileno_has_vt100(fileno)) {
                        RETURN_TRUE;

diff --git a/tests/output/sapi_windows_vt100_support.inc b/tests/output/sapi_windows_vt100_support.inc
index 9ac54cea615106fbe2c0ad9b66d4f6c8c91a1454..a9c60a6be92f6fd76db6ddf628c65359d607626b 100644 (file)
--- a/tests/output/sapi_windows_vt100_support.inc
+++ b/tests/output/sapi_windows_vt100_support.inc
@@ -35,7 +35,6 @@ function testToStdOut()
         'STDERR (constant)'             => STDERR,
         'STDERR (fopen)'                => fopen('php://stderr', 'wb'),
         'STDERR (php://fd/2)'           => fopen('php://fd/2', 'wb'),
-        'Not a stream'                  => 'foo',
         'Invalid stream (php://temp)'   => fopen('php://temp', 'wb'),
         'Invalid stream (php://input)'  => fopen('php://input', 'wb'),
         'Invalid stream (php://memory)' => fopen('php://memory', 'wb'),

diff --git a/tests/output/sapi_windows_vt100_support_winko_err.phpt b/tests/output/sapi_windows_vt100_support_winko_err.phpt
index 72b80891cd2bea6f5b4e9b971d4817a48244e7b0..d609e4877014121b323faf01a18a31af4b60e744 100644 (file)
--- a/tests/output/sapi_windows_vt100_support_winko_err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_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)

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 45d288f15be1ad190a25f4c582ba6f22c24ce437..86cf631110c2d4203d14bea43d542f0fa3cedf50 100644 (file)
--- 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)

diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt
index 6e42372cb87eb59dbd04dc628104ae1593bd6154..4c0f5f990993784c53eeb2bb7aaf721dbd00c6f1 100644 (file)
--- a/tests/output/sapi_windows_vt100_support_winko_in-out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_in-out-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)

diff --git a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt
index f3e05024601205fd2b976d4b51cd267715c24f65..01efb3bb4e36f73f0d95befb9aecc28f9f585d00 100644 (file)
--- a/tests/output/sapi_windows_vt100_support_winko_in-out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_in-out.phpt
@@ -76,70 +76,36 @@ STDERR (php://fd/2):
 - current value  : bool(false)
 - disabling VT100: bool(true)
 - 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)

diff --git a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt b/tests/output/sapi_windows_vt100_support_winko_out-err.phpt
index bd95ea7cb77d130cd8934db51da1b8a45b5d52ff..09d3d8f0be40eab9763514d087f6fff67a74e48b 100644 (file)
--- a/tests/output/sapi_windows_vt100_support_winko_out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_out-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)

diff --git a/tests/output/sapi_windows_vt100_support_winko_out.phpt b/tests/output/sapi_windows_vt100_support_winko_out.phpt
index a937bb9ac853afd44f547e4522392a77184a1971..65958ae19c1f0f092c3b55c3df99764ce1059338 100644 (file)
--- a/tests/output/sapi_windows_vt100_support_winko_out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winko_out.phpt
@@ -76,70 +76,36 @@ STDERR (php://fd/2):
 - current value  : bool(false)
 - disabling VT100: bool(true)
 - 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)

diff --git a/tests/output/sapi_windows_vt100_support_winok_err.phpt b/tests/output/sapi_windows_vt100_support_winok_err.phpt
index 2cc9b94fa9e0987fe1bbc18ffdf2b3735dd414dd..01a31a6b927e1b722a03ee1d2737fe78c8ae85e4 100644 (file)
--- a/tests/output/sapi_windows_vt100_support_winok_err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_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)

diff --git a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-err.phpt
index 0f1a9f46254c41585ed326d832f1d92af503f9c1..d36d79c8dcbf36eaddcc8359993490f3e686cc5a 100644 (file)
--- a/tests/output/sapi_windows_vt100_support_winok_in-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_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)

diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt
index 0355dc4091a04e2f8bdd3cf75ea22719d2090d88..16066046510bbfd0513193fac22d3a28bce087ad 100644 (file)
--- a/tests/output/sapi_windows_vt100_support_winok_in-out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_in-out-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)

diff --git a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt
index e75187702785deb462f735504bbf733e9c00c48d..f67942f603f7a528081c67b0423683551323ff2f 100644 (file)
--- a/tests/output/sapi_windows_vt100_support_winok_in-out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_in-out.phpt
@@ -76,70 +76,36 @@ STDERR (php://fd/2):
 - current value  : bool(true)
 - disabling VT100: bool(true)
 - 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)

diff --git a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt b/tests/output/sapi_windows_vt100_support_winok_out-err.phpt
index ce273f1780d390179a08695efb1700023d16acc8..ebc6bcb1205667af86c9754ef117953d7cdc130e 100644 (file)
--- a/tests/output/sapi_windows_vt100_support_winok_out-err.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_out-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)

diff --git a/tests/output/sapi_windows_vt100_support_winok_out.phpt b/tests/output/sapi_windows_vt100_support_winok_out.phpt
index 0ca0cde849bd99226291d3e5b5129317fc59aeba..94a5f20a1bfb95d4f619aa8a3ba3f1790758bd3d 100644 (file)
--- a/tests/output/sapi_windows_vt100_support_winok_out.phpt
+++ b/tests/output/sapi_windows_vt100_support_winok_out.phpt
@@ -76,70 +76,36 @@ STDERR (php://fd/2):
 - current value  : bool(true)
 - disabling VT100: bool(true)
 - 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)