diff options
| author | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-15 11:27:29 +0100 |
|---|---|---|
| committer | Máté Kocsis <kocsismate@woohoolabs.com> | 2020-01-17 14:52:46 +0100 |
| commit | d1764ca33018f1f2e4a05926c879c67ad4aa8da5 (patch) | |
| tree | 443cab099d2d5989a93a8102f599b51d36acc64e /ext | |
| parent | 117b18d22d14fb6a597b3cd6d52e75cef2d088bb (diff) | |
| download | php-git-d1764ca33018f1f2e4a05926c879c67ad4aa8da5.tar.gz | |
Make error messages more consistent by fixing capitalization
Closes GH-5066 As a first step, let's capitalize their initial letter when it is applicable.
Diffstat (limited to 'ext')
385 files changed, 1366 insertions, 1366 deletions
diff --git a/ext/bcmath/libbcmath/src/raise.c b/ext/bcmath/libbcmath/src/raise.c index e00a62e215..700a50f50c 100644 --- a/ext/bcmath/libbcmath/src/raise.c +++ b/ext/bcmath/libbcmath/src/raise.c @@ -54,10 +54,10 @@ bc_raise (bc_num num1, bc_num num2, bc_num *result, int scale) /* Check the exponent for scale digits and convert to a long. */ if (num2->n_scale != 0) - php_error_docref (NULL, E_WARNING, "non-zero scale in exponent"); + php_error_docref (NULL, E_WARNING, "Non-zero scale in exponent"); exponent = bc_num2long (num2); if (exponent == 0 && (num2->n_len > 1 || num2->n_value[0] != 0)) - php_error_docref (NULL, E_WARNING, "exponent too large"); + php_error_docref (NULL, E_WARNING, "Exponent too large"); /* Special case if exponent is a zero. */ if (exponent == 0) diff --git a/ext/bcmath/libbcmath/src/raisemod.c b/ext/bcmath/libbcmath/src/raisemod.c index 58f9532545..2865903940 100644 --- a/ext/bcmath/libbcmath/src/raisemod.c +++ b/ext/bcmath/libbcmath/src/raisemod.c @@ -79,21 +79,21 @@ bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale) /* Check the base for scale digits. */ if (power->n_scale != 0) { - php_error_docref (NULL, E_WARNING, "non-zero scale in base"); + php_error_docref (NULL, E_WARNING, "Non-zero scale in base"); _bc_truncate (&power); } /* Check the exponent for scale digits. */ if (exponent->n_scale != 0) { - php_error_docref (NULL, E_WARNING, "non-zero scale in exponent"); + php_error_docref (NULL, E_WARNING, "Non-zero scale in exponent"); _bc_truncate (&exponent); } /* Check the modulus for scale digits. */ if (modulus->n_scale != 0) { - php_error_docref (NULL, E_WARNING, "non-zero scale in modulus"); + php_error_docref (NULL, E_WARNING, "Non-zero scale in modulus"); _bc_truncate (&modulus); } diff --git a/ext/bcmath/tests/bcpow_error1.phpt b/ext/bcmath/tests/bcpow_error1.phpt index 2dc2dbd092..822b70eb86 100644 --- a/ext/bcmath/tests/bcpow_error1.phpt +++ b/ext/bcmath/tests/bcpow_error1.phpt @@ -9,5 +9,5 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available'); var_dump(bcpow('1', '1.1', 2)); ?> --EXPECTF-- -Warning: bcpow(): non-zero scale in exponent in %s on line %d +Warning: bcpow(): Non-zero scale in exponent in %s on line %d string(4) "1.00" diff --git a/ext/bcmath/tests/bcpow_error2.phpt b/ext/bcmath/tests/bcpow_error2.phpt index ca13875ed3..95c3f80b08 100644 --- a/ext/bcmath/tests/bcpow_error2.phpt +++ b/ext/bcmath/tests/bcpow_error2.phpt @@ -9,5 +9,5 @@ if (!extension_loaded('bcmath')) die('skip bcmath extension is not available'); var_dump(bcpow('0', '9223372036854775808', 2)); ?> --EXPECTF-- -Warning: bcpow(): exponent too large in %s on line %d +Warning: bcpow(): Exponent too large in %s on line %d string(4) "1.00" diff --git a/ext/bcmath/tests/bug72093.phpt b/ext/bcmath/tests/bug72093.phpt index 4295384a30..235a4e04a3 100644 --- a/ext/bcmath/tests/bug72093.phpt +++ b/ext/bcmath/tests/bug72093.phpt @@ -12,5 +12,5 @@ var_dump(bcpowmod(1, 1.2, 1, 1)); --EXPECTF-- string(1) "1" -Warning: bcpowmod(): non-zero scale in exponent in %s on line %d +Warning: bcpowmod(): Non-zero scale in exponent in %s on line %d string(3) "0.0" diff --git a/ext/bcmath/tests/bug75178.phpt b/ext/bcmath/tests/bug75178.phpt index dd811fccb9..2b7ab4b2c6 100644 --- a/ext/bcmath/tests/bug75178.phpt +++ b/ext/bcmath/tests/bug75178.phpt @@ -10,8 +10,8 @@ var_dump(bcpowmod('4.1', '4', '3', 3)); var_dump(bcpowmod('4', '4', '3.1', 3)); ?> --EXPECTF-- -Warning: bcpowmod(): non-zero scale in base in %s on line %d +Warning: bcpowmod(): Non-zero scale in base in %s on line %d string(5) "1.000" -Warning: bcpowmod(): non-zero scale in modulus in %s on line %d +Warning: bcpowmod(): Non-zero scale in modulus in %s on line %d string(5) "1.000" diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c index d6cdcacdeb..c90c117d71 100644 --- a/ext/bz2/bz2.c +++ b/ext/bz2/bz2.c @@ -374,12 +374,12 @@ static PHP_FUNCTION(bzopen) /* If it's not a resource its a string containing the filename to open */ if (Z_TYPE_P(file) == IS_STRING) { if (Z_STRLEN_P(file) == 0) { - php_error_docref(NULL, E_WARNING, "filename cannot be empty"); + php_error_docref(NULL, E_WARNING, "Filename cannot be empty"); RETURN_FALSE; } if (CHECK_ZVAL_NULL_PATH(file)) { - zend_type_error("filename must not contain null bytes"); + zend_type_error("Filename must not contain null bytes"); RETURN_THROWS(); } @@ -393,10 +393,10 @@ static PHP_FUNCTION(bzopen) stream_mode_len = strlen(stream->mode); if (stream_mode_len != 1 && !(stream_mode_len == 2 && memchr(stream->mode, 'b', 2))) { - php_error_docref(NULL, E_WARNING, "cannot use stream opened in mode '%s'", stream->mode); + php_error_docref(NULL, E_WARNING, "Cannot use stream opened in mode '%s'", stream->mode); RETURN_FALSE; } else if (stream_mode_len == 1 && stream->mode[0] != 'r' && stream->mode[0] != 'w' && stream->mode[0] != 'a' && stream->mode[0] != 'x') { - php_error_docref(NULL, E_WARNING, "cannot use stream opened in mode '%s'", stream->mode); + php_error_docref(NULL, E_WARNING, "Cannot use stream opened in mode '%s'", stream->mode); RETURN_FALSE; } @@ -404,7 +404,7 @@ static PHP_FUNCTION(bzopen) case 'r': /* only "r" and "rb" are supported */ if (stream->mode[0] != mode[0] && !(stream_mode_len == 2 && stream->mode[1] != mode[0])) { - php_error_docref(NULL, E_WARNING, "cannot read from a stream opened in write only mode"); + php_error_docref(NULL, E_WARNING, "Cannot read from a stream opened in write only mode"); RETURN_FALSE; } break; diff --git a/ext/bz2/tests/001.phpt b/ext/bz2/tests/001.phpt index a0e8d2e60e..1064e2b6a5 100644 --- a/ext/bz2/tests/001.phpt +++ b/ext/bz2/tests/001.phpt @@ -39,14 +39,14 @@ var_dump(bzopen($fp, "r")); --EXPECTF-- '' is not a valid mode for bzopen(). Only 'w' and 'r' are supported. -Warning: bzopen(): filename cannot be empty in %s on line %d +Warning: bzopen(): Filename cannot be empty in %s on line %d bool(false) -Warning: bzopen(): filename cannot be empty in %s on line %d +Warning: bzopen(): Filename cannot be empty in %s on line %d bool(false) 'x' is not a valid mode for bzopen(). Only 'w' and 'r' are supported. 'rw' is not a valid mode for bzopen(). Only 'w' and 'r' are supported. -Warning: bzopen(no_such_file): failed to open stream: No such file or directory in %s on line %d +Warning: bzopen(no_such_file): Failed to open stream: No such file or directory in %s on line %d bool(false) resource(%d) of type (stream) diff --git a/ext/bz2/tests/002.phpt b/ext/bz2/tests/002.phpt index c8069cc4a4..78c4a9bbdf 100644 --- a/ext/bz2/tests/002.phpt +++ b/ext/bz2/tests/002.phpt @@ -85,47 +85,47 @@ resource(%d) of type (stream) resource(%d) of type (stream) resource(%d) of type (stream) -Warning: bzopen(): cannot read from a stream opened in write only mode in %s on line %d +Warning: bzopen(): Cannot read from a stream opened in write only mode in %s on line %d bool(false) resource(%d) of type (stream) resource(%d) of type (stream) -Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d +Warning: fopen(bz_open_002.txt): Failed to open stream: Bad file %s in %s on line %d First parameter has to be string or file-resource -Warning: fopen(bz_open_002.txt): failed to open stream: Bad file %s in %s on line %d +Warning: fopen(bz_open_002.txt): Failed to open stream: Bad file %s in %s on line %d First parameter has to be string or file-resource Warning: bzopen(): cannot write to a stream opened in read only mode in %s on line %d bool(false) -Warning: bzopen(): cannot read from a stream opened in write only mode in %s on line %d +Warning: bzopen(): Cannot read from a stream opened in write only mode in %s on line %d bool(false) -Warning: bzopen(): cannot use stream opened in mode 'rw' in %s on line %d +Warning: bzopen(): Cannot use stream opened in mode 'rw' in %s on line %d bool(false) -Warning: bzopen(): cannot use stream opened in mode 'rw' in %s on line %d +Warning: bzopen(): Cannot use stream opened in mode 'rw' in %s on line %d bool(false) -Warning: bzopen(): cannot use stream opened in mode 'wr' in %s on line %d +Warning: bzopen(): Cannot use stream opened in mode 'wr' in %s on line %d bool(false) -Warning: bzopen(): cannot use stream opened in mode 'wr' in %s on line %d +Warning: bzopen(): Cannot use stream opened in mode 'wr' in %s on line %d bool(false) -Warning: bzopen(): cannot use stream opened in mode 'r+' in %s on line %d +Warning: bzopen(): Cannot use stream opened in mode 'r+' in %s on line %d bool(false) -Warning: bzopen(): cannot use stream opened in mode 'r+' in %s on line %d +Warning: bzopen(): Cannot use stream opened in mode 'r+' in %s on line %d bool(false) -Warning: bzopen(): cannot use stream opened in mode 'w+' in %s on line %d +Warning: bzopen(): Cannot use stream opened in mode 'w+' in %s on line %d bool(false) -Warning: bzopen(): cannot use stream opened in mode 'w+' in %s on line %d +Warning: bzopen(): Cannot use stream opened in mode 'w+' in %s on line %d bool(false) -Warning: bzopen(): cannot read from a stream opened in write only mode in %s on line %d +Warning: bzopen(): Cannot read from a stream opened in write only mode in %s on line %d bool(false) resource(%d) of type (stream) diff --git a/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt b/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt index 436f87cab4..9a05015bb9 100644 --- a/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt +++ b/ext/bz2/tests/bzopen_string_filename_with_null_bytes.phpt @@ -19,5 +19,5 @@ try { ?> --EXPECT-- -filename must not contain null bytes -filename must not contain null bytes +Filename must not contain null bytes +Filename must not contain null bytes diff --git a/ext/calendar/cal_unix.c b/ext/calendar/cal_unix.c index f76fb90882..1d3401283d 100644 --- a/ext/calendar/cal_unix.c +++ b/ext/calendar/cal_unix.c @@ -35,7 +35,7 @@ PHP_FUNCTION(unixtojd) if (!ts) { ts = time(NULL); } else if (ts < 0) { - zend_value_error("timestamp must not be negative"); + zend_value_error("Timestamp must not be negative"); RETURN_THROWS(); } diff --git a/ext/calendar/calendar.c b/ext/calendar/calendar.c index 0254039a02..a4a094fcdf 100644 --- a/ext/calendar/calendar.c +++ b/ext/calendar/calendar.c @@ -217,7 +217,7 @@ PHP_FUNCTION(cal_info) if (cal != -1 && (cal < 0 || cal >= CAL_NUM_CALS)) { - zend_value_error("invalid calendar ID " ZEND_LONG_FMT, cal); + zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal); RETURN_THROWS(); } @@ -239,7 +239,7 @@ PHP_FUNCTION(cal_days_in_month) } if (cal < 0 || cal >= CAL_NUM_CALS) { - zend_value_error("invalid calendar ID " ZEND_LONG_FMT, cal); + zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal); RETURN_THROWS(); } @@ -248,7 +248,7 @@ PHP_FUNCTION(cal_days_in_month) sdn_start = calendar->to_jd(year, month, 1); if (sdn_start == 0) { - zend_value_error("invalid date"); + zend_value_error("Invalid date"); RETURN_THROWS(); } @@ -285,7 +285,7 @@ PHP_FUNCTION(cal_to_jd) } if (cal < 0 || cal >= CAL_NUM_CALS) { - zend_value_error("invalid calendar ID " ZEND_LONG_FMT, cal); + zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal); RETURN_THROWS(); } @@ -306,7 +306,7 @@ PHP_FUNCTION(cal_from_jd) } if (cal < 0 || cal >= CAL_NUM_CALS) { - zend_value_error("invalid calendar ID " ZEND_LONG_FMT, cal); + zend_value_error("Invalid calendar ID: " ZEND_LONG_FMT, cal); RETURN_THROWS(); } calendar = &cal_conversion_table[cal]; diff --git a/ext/calendar/tests/cal_days_in_month_error1.phpt b/ext/calendar/tests/cal_days_in_month_error1.phpt index 21dd76d261..b7c82f2cbe 100644 --- a/ext/calendar/tests/cal_days_in_month_error1.phpt +++ b/ext/calendar/tests/cal_days_in_month_error1.phpt @@ -18,5 +18,5 @@ try{ } ?> --EXPECT-- -invalid calendar ID -1 -invalid date +Invalid calendar ID: -1 +Invalid date diff --git a/ext/calendar/tests/cal_from_jd_error1.phpt b/ext/calendar/tests/cal_from_jd_error1.phpt index 2a259121c1..8539117c0d 100644 --- a/ext/calendar/tests/cal_from_jd_error1.phpt +++ b/ext/calendar/tests/cal_from_jd_error1.phpt @@ -13,4 +13,4 @@ try { } ?> --EXPECT-- -invalid calendar ID -1 +Invalid calendar ID: -1 diff --git a/ext/calendar/tests/cal_info.phpt b/ext/calendar/tests/cal_info.phpt index f1d69203bf..3e7e3b3188 100644 --- a/ext/calendar/tests/cal_info.phpt +++ b/ext/calendar/tests/cal_info.phpt @@ -216,4 +216,4 @@ Array [calname] => Julian [calsymbol] => CAL_JULIAN ) -invalid calendar ID 99999 +Invalid calendar ID: 99999 diff --git a/ext/calendar/tests/cal_to_jd_error1.phpt b/ext/calendar/tests/cal_to_jd_error1.phpt index 156afaab6f..c1911a77b7 100644 --- a/ext/calendar/tests/cal_to_jd_error1.phpt +++ b/ext/calendar/tests/cal_to_jd_error1.phpt @@ -13,4 +13,4 @@ try { } ?> --EXPECT-- -invalid calendar ID -1 +Invalid calendar ID: -1 diff --git a/ext/calendar/tests/unixtojd_error1.phpt b/ext/calendar/tests/unixtojd_error1.phpt index 61068ad91e..856fc1bcf4 100644 --- a/ext/calendar/tests/unixtojd_error1.phpt +++ b/ext/calendar/tests/unixtojd_error1.phpt @@ -20,7 +20,7 @@ var_dump(unixtojd(null)) . PHP_EOL; var_dump(unixtojd(time())) . PHP_EOL; ?> --EXPECTF-- -timestamp must not be negative +Timestamp must not be negative int(%d) int(%d) int(%d) diff --git a/ext/com_dotnet/com_iterator.c b/ext/com_dotnet/com_iterator.c index 4300fd2cdc..7b031f4192 100644 --- a/ext/com_dotnet/com_iterator.c +++ b/ext/com_dotnet/com_iterator.c @@ -148,7 +148,7 @@ zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int b obj = CDNO_FETCH(object); if (V_VT(&obj->v) != VT_DISPATCH && !V_ISARRAY(&obj->v)) { - php_error_docref(NULL, E_WARNING, "variant is not an object or array VT=%d", V_VT(&obj->v)); + php_error_docref(NULL, E_WARNING, "Variant is not an object or array VT=%d", V_VT(&obj->v)); return NULL; } diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 5538ca0a8e..c4a931bf9e 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1671,7 +1671,7 @@ PHP_FUNCTION(curl_version) ZEND_PARSE_PARAMETERS_END(); if (uversion == CURLVERSION_NOW) { - php_error_docref(NULL, E_DEPRECATED, "the $version parameter is deprecated"); + php_error_docref(NULL, E_DEPRECATED, "The $version parameter is deprecated"); } else if (ZEND_NUM_ARGS() > 0) { php_error_docref(NULL, E_WARNING, "$version argument ignored"); } @@ -2576,7 +2576,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ ch->handlers->write->method = PHP_CURL_FILE; ZVAL_COPY(&ch->handlers->write->stream, zvalue); } else { - php_error_docref(NULL, E_WARNING, "the provided file handle is not writable"); + php_error_docref(NULL, E_WARNING, "The provided file handle is not writable"); return FAILURE; } break; @@ -2594,7 +2594,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ ch->handlers->write_header->method = PHP_CURL_FILE; ZVAL_COPY(&ch->handlers->write_header->stream, zvalue); } else { - php_error_docref(NULL, E_WARNING, "the provided file handle is not writable"); + php_error_docref(NULL, E_WARNING, "The provided file handle is not writable"); return FAILURE; } break; @@ -2623,7 +2623,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue) /* {{{ zval_ptr_dtor(&ch->handlers->std_err); ZVAL_COPY(&ch->handlers->std_err, zvalue); } else { - php_error_docref(NULL, E_WARNING, "the provided file handle is not writable"); + php_error_docref(NULL, E_WARNING, "The provided file handle is not writable"); return FAILURE; } /* break omitted intentionally */ diff --git a/ext/curl/tests/bug48207.phpt b/ext/curl/tests/bug48207.phpt index 566b84b246..7451199156 100644 --- a/ext/curl/tests/bug48207.phpt +++ b/ext/curl/tests/bug48207.phpt @@ -43,6 +43,6 @@ is_file($tempfile) and @unlink($tempfile); isset($tempname) and is_file($tempname) and @unlink($tempname); ?> --EXPECTF-- -Warning: curl_setopt(): the provided file handle is not writable in %s on line %d +Warning: curl_setopt(): The provided file handle is not writable in %s on line %d Hello World! Hello World! diff --git a/ext/curl/tests/curl_version_error_001.phpt b/ext/curl/tests/curl_version_error_001.phpt index 300f9c36d2..c281cc116b 100644 --- a/ext/curl/tests/curl_version_error_001.phpt +++ b/ext/curl/tests/curl_version_error_001.phpt @@ -10,6 +10,6 @@ curl_version(CURLVERSION_NOW); curl_version(0); ?> --EXPECTF-- -Deprecated: curl_version(): the $version parameter is deprecated in %s on line %d +Deprecated: curl_version(): The $version parameter is deprecated in %s on line %d Warning: curl_version(): $version argument ignored in %s on line %d diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 362bd711b6..0f6432b1a7 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -4642,7 +4642,7 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su case 6: break; default: - php_error_docref(NULL, E_WARNING, "invalid format"); + php_error_docref(NULL, E_WARNING, "Invalid format"); RETURN_FALSE; break; } diff --git a/ext/exif/tests/exif_imagetype_error.phpt b/ext/exif/tests/exif_imagetype_error.phpt index 26757ed4c3..8ad1511e16 100644 --- a/ext/exif/tests/exif_imagetype_error.phpt +++ b/ext/exif/tests/exif_imagetype_error.phpt @@ -22,5 +22,5 @@ var_dump( exif_imagetype(__DIR__.'/foo.jpg') ); -- Testing exif_imagetype() function with an unknown file -- -Warning: exif_imagetype(%s/foo.jpg): failed to open stream: No such file or directory in %s on line %d +Warning: exif_imagetype(%s/foo.jpg): Failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c index 46cc79a021..482d7c1a61 100644 --- a/ext/ffi/ffi.c +++ b/ext/ffi/ffi.c @@ -1009,7 +1009,7 @@ static zval *zend_ffi_cdata_set(zend_object *obj, zend_string *member, zval *val #endif if (UNEXPECTED(!zend_string_equals_literal(member, "cdata"))) { - zend_throw_error(zend_ffi_exception_ce, "only 'cdata' property may be set"); + zend_throw_error(zend_ffi_exception_ce, "Only 'cdata' property may be set"); return &EG(uninitialized_zval);; } @@ -3437,11 +3437,11 @@ static int zend_ffi_validate_incomplete_type(zend_ffi_type *type, zend_bool allo ZEND_HASH_FOREACH_STR_KEY_PTR(FFI_G(tags), key, tag) { if (ZEND_FFI_TYPE(tag->type) == type) { if (type->kind == ZEND_FFI_TYPE_ENUM) { - zend_ffi_throw_parser_error("incomplete 'enum %s' at line %d", ZSTR_VAL(key), FFI_G(line)); + zend_ffi_throw_parser_error("Incomplete 'enum %s' at line %d", ZSTR_VAL(key), FFI_G(line)); } else if (type->attr & ZEND_FFI_ATTR_UNION) { - zend_ffi_throw_parser_error("incomplete 'union %s' at line %d", ZSTR_VAL(key), FFI_G(line)); + zend_ffi_throw_parser_error("Incomplete 'union %s' at line %d", ZSTR_VAL(key), FFI_G(line)); } else { - zend_ffi_throw_parser_error("incomplete 'struct %s' at line %d", ZSTR_VAL(key), FFI_G(line)); + zend_ffi_throw_parser_error("Incomplete 'struct %s' at line %d", ZSTR_VAL(key), FFI_G(line)); } return FAILURE; } @@ -3453,12 +3453,12 @@ static int zend_ffi_validate_incomplete_type(zend_ffi_type *type, zend_bool allo ZEND_HASH_FOREACH_STR_KEY_PTR(FFI_G(symbols), key, sym) { if (type == ZEND_FFI_TYPE(sym->type)) { - zend_ffi_throw_parser_error("incomplete C type '%s' at line %d", ZSTR_VAL(key), FFI_G(line)); + zend_ffi_throw_parser_error("Incomplete C type '%s' at line %d", ZSTR_VAL(key), FFI_G(line)); return FAILURE; } } ZEND_HASH_FOREACH_END(); } - zend_ffi_throw_parser_error("incomplete type at line %d", FFI_G(line)); + zend_ffi_throw_parser_error("Incomplete type at line %d", FFI_G(line)); return FAILURE; } else if (!allow_incomplete_array && type->attr & ZEND_FFI_ATTR_INCOMPLETE_ARRAY) { zend_ffi_throw_parser_error("'[]' not allowed at line %d", FFI_G(line)); @@ -4003,16 +4003,16 @@ ZEND_METHOD(FFI, arrayType) /* {{{ */ type = ZEND_FFI_TYPE(ctype->type); if (type->kind == ZEND_FFI_TYPE_FUNC) { - zend_throw_error(zend_ffi_exception_ce, "array of functions is not allowed"); + zend_throw_error(zend_ffi_exception_ce, "Array of functions is not allowed"); RETURN_THROWS(); } else if (type->kind == ZEND_FFI_TYPE_ARRAY && (type->attr & ZEND_FFI_ATTR_INCOMPLETE_ARRAY)) { - zend_throw_error(zend_ffi_exception_ce, "only the leftmost array can be undimensioned"); + zend_throw_error(zend_ffi_exception_ce, "Only the leftmost array can be undimensioned"); RETURN_THROWS(); } else if (type->kind == ZEND_FFI_TYPE_VOID) { - zend_throw_error(zend_ffi_exception_ce, "array of 'void' is not allowed"); + zend_throw_error(zend_ffi_exception_ce, "Array of 'void' is not allowed"); RETURN_THROWS(); } else if (type->attr & ZEND_FFI_ATTR_INCOMPLETE_TAG) { - zend_throw_error(zend_ffi_exception_ce, "array of incomplete type is not allowed"); + zend_throw_error(zend_ffi_exception_ce, "Array of incomplete type is not allowed"); RETURN_THROWS(); } @@ -4189,7 +4189,7 @@ ZEND_METHOD(FFI, memcpy) /* {{{ */ } else { ptr1 = cdata1->ptr; if (type1->kind != ZEND_FFI_TYPE_POINTER && size > type1->size) { - zend_throw_error(zend_ffi_exception_ce, "attempt to write over data boundary"); + zend_throw_error(zend_ffi_exception_ce, "Attempt to write over data boundary"); RETURN_THROWS(); } } @@ -4198,7 +4198,7 @@ ZEND_METHOD(FFI, memcpy) /* {{{ */ if (Z_TYPE_P(zv2) == IS_STRING) { ptr2 = Z_STRVAL_P(zv2); if (size > Z_STRLEN_P(zv2)) { - zend_throw_error(zend_ffi_exception_ce, "attempt to read over string boundary"); + zend_throw_error(zend_ffi_exception_ce, "Attempt to read over string boundary"); RETURN_THROWS(); } } else if (Z_TYPE_P(zv2) == IS_OBJECT && Z_OBJCE_P(zv2) == zend_ffi_cdata_ce) { @@ -4209,7 +4209,7 @@ ZEND_METHOD(FFI, memcpy) /* {{{ */ } else { ptr2 = cdata2->ptr; if (type2->kind != ZEND_FFI_TYPE_POINTER && size > type2->size) { - zend_throw_error(zend_ffi_exception_ce, "attempt to read over data boundary"); + zend_throw_error(zend_ffi_exception_ce, "Attempt to read over data boundary"); RETURN_THROWS(); } } @@ -4266,7 +4266,7 @@ ZEND_METHOD(FFI, memcmp) /* {{{ */ if (Z_TYPE_P(zv2) == IS_STRING) { ptr2 = Z_STRVAL_P(zv2); if (size > Z_STRLEN_P(zv2)) { - zend_throw_error(zend_ffi_exception_ce, "attempt to read over string boundary"); + zend_throw_error(zend_ffi_exception_ce, "Attempt to read over string boundary"); RETURN_THROWS(); } } else if (Z_TYPE_P(zv2) == IS_OBJECT && Z_OBJCE_P(zv2) == zend_ffi_cdata_ce) { @@ -4277,7 +4277,7 @@ ZEND_METHOD(FFI, memcmp) /* {{{ */ } else { ptr2 = cdata2->ptr; if (type2->kind != ZEND_FFI_TYPE_POINTER && size > type2->size) { - zend_throw_error(zend_ffi_exception_ce, "attempt to read over data boundary"); + zend_throw_error(zend_ffi_exception_ce, "Attempt to read over data boundary"); RETURN_THROWS(); } } @@ -5512,7 +5512,7 @@ static int zend_ffi_validate_prev_field_type(zend_ffi_type *struct_type) /* {{{ break; } ZEND_HASH_FOREACH_END(); if (ZEND_FFI_TYPE(field->type)->attr & ZEND_FFI_ATTR_INCOMPLETE_ARRAY) { - zend_ffi_throw_parser_error("flexible array member not at end of struct at line %d", FFI_G(line)); + zend_ffi_throw_parser_error("Flexible array member not at end of struct at line %d", FFI_G(line)); return FAILURE; } } @@ -5523,13 +5523,13 @@ static int zend_ffi_validate_prev_field_type(zend_ffi_type *struct_type) /* {{{ static int zend_ffi_validate_field_type(zend_ffi_type *type, zend_ffi_type *struct_type) /* {{{ */ { if (type == struct_type) { - zend_ffi_throw_parser_error("struct/union can't contain an instance of itself at line %d", FFI_G(line)); + zend_ffi_throw_parser_error("Struct/union can't contain an instance of itself at line %d", FFI_G(line)); return FAILURE; } else if (zend_ffi_validate_var_type(type, 1) != SUCCESS) { return FAILURE; } else if (struct_type->attr & ZEND_FFI_ATTR_UNION) { if (type->attr & ZEND_FFI_ATTR_INCOMPLETE_ARRAY) { - zend_ffi_throw_parser_error("flexible array member in union at line %d", FFI_G(line)); + zend_ffi_throw_parser_error("Flexible array member in union at line %d", FFI_G(line)); return FAILURE; } } @@ -5789,10 +5789,10 @@ void zend_ffi_make_pointer_type(zend_ffi_dcl *dcl) /* {{{ */ static int zend_ffi_validate_array_element_type(zend_ffi_type *type) /* {{{ */ { if (type->kind == ZEND_FFI_TYPE_FUNC) { - zend_ffi_throw_parser_error("array of functions is not allowed at line %d", FFI_G(line)); + zend_ffi_throw_parser_error("Array of functions is not allowed at line %d", FFI_G(line)); return FAILURE; } else if (type->kind == ZEND_FFI_TYPE_ARRAY && (type->attr & ZEND_FFI_ATTR_INCOMPLETE_ARRAY)) { - zend_ffi_throw_parser_error("only the leftmost array can be undimensioned at line %d", FFI_G(line)); + zend_ffi_throw_parser_error("Only the leftmost array can be undimensioned at line %d", FFI_G(line)); return FAILURE; } return zend_ffi_validate_type(type, 0, 1); @@ -5849,10 +5849,10 @@ void zend_ffi_make_array_type(zend_ffi_dcl *dcl, zend_ffi_val *len) /* {{{ */ static int zend_ffi_validate_func_ret_type(zend_ffi_type *type) /* {{{ */ { if (type->kind == ZEND_FFI_TYPE_FUNC) { - zend_ffi_throw_parser_error("function returning function is not allowed at line %d", FFI_G(line)); + zend_ffi_throw_parser_error("Function returning function is not allowed at line %d", FFI_G(line)); return FAILURE; } else if (type->kind == ZEND_FFI_TYPE_ARRAY) { - zend_ffi_throw_parser_error("function returning array is not allowed at line %d", FFI_G(line)); + zend_ffi_throw_parser_error("Function returning array is not allowed at line %d", FFI_G(line)); return FAILURE; } return zend_ffi_validate_incomplete_type(type, 1, 0); @@ -5986,7 +5986,7 @@ void zend_ffi_make_func_type(zend_ffi_dcl *dcl, HashTable *args, zend_ffi_dcl *n } type->func.args = NULL; _zend_ffi_type_dtor(type); - zend_ffi_parser_error("unsupported calling convention line %d", FFI_G(line)); + zend_ffi_parser_error("Unsupported calling convention line %d", FFI_G(line)); break; } type->func.args = args; diff --git a/ext/ffi/tests/003.phpt b/ext/ffi/tests/003.phpt index d52e235644..f1041bf460 100644 --- a/ext/ffi/tests/003.phpt +++ b/ext/ffi/tests/003.phpt @@ -58,6 +58,6 @@ object(FFI\CData:struct _d)#%d (1) { ["x"]=> int(0) } -FFI\ParserException: incomplete 'struct _e' at line 1 -FFI\ParserException: incomplete 'struct _f' at line 1 +FFI\ParserException: Incomplete 'struct _e' at line 1 +FFI\ParserException: Incomplete 'struct _f' at line 1 ok diff --git a/ext/ffi/tests/004.phpt b/ext/ffi/tests/004.phpt index e914b604ac..7d265bfa68 100644 --- a/ext/ffi/tests/004.phpt +++ b/ext/ffi/tests/004.phpt @@ -82,6 +82,6 @@ object(FFI\CData:int32_t[2])#%d (2) { [1]=> int(0) } -FFI\ParserException: incomplete 'enum _e' at line 1 -FFI\ParserException: incomplete 'enum _f' at line 1 +FFI\ParserException: Incomplete 'enum _e' at line 1 +FFI\ParserException: Incomplete 'enum _f' at line 1 ok diff --git a/ext/ffi/tests/013.phpt b/ext/ffi/tests/013.phpt index 3e4c4d6fca..b95acfbe40 100644 --- a/ext/ffi/tests/013.phpt +++ b/ext/ffi/tests/013.phpt @@ -59,8 +59,8 @@ int(2) int(3) FFI\ParserException: 'void' type is not allowed at line 1 FFI\ParserException: 'void' type is not allowed at line 1 -FFI\ParserException: function returning array is not allowed at line 1 -FFI\ParserException: array of functions is not allowed at line 1 -FFI\ParserException: function returning function is not allowed at line 1 -FFI\ParserException: only the leftmost array can be undimensioned at line 1 +FFI\ParserException: Function returning array is not allowed at line 1 +FFI\ParserException: Array of functions is not allowed at line 1 +FFI\ParserException: Function returning function is not allowed at line 1 +FFI\ParserException: Only the leftmost array can be undimensioned at line 1 ok diff --git a/ext/ffi/tests/015.phpt b/ext/ffi/tests/015.phpt index 524ac95030..5143bea109 100644 --- a/ext/ffi/tests/015.phpt +++ b/ext/ffi/tests/015.phpt @@ -57,9 +57,9 @@ try { ?> ok --EXPECT-- -FFI\ParserException: incomplete 'struct DIR' at line 1 +FFI\ParserException: Incomplete 'struct DIR' at line 1 ok -FFI\ParserException: incomplete 'struct DIR' at line 1 +FFI\ParserException: Incomplete 'struct DIR' at line 1 ok ok ok diff --git a/ext/ffi/tests/016.phpt b/ext/ffi/tests/016.phpt index 857780b80c..89d765de03 100644 --- a/ext/ffi/tests/016.phpt +++ b/ext/ffi/tests/016.phpt @@ -28,6 +28,6 @@ try { ok --EXPECT-- FFI\ParserException: 'function' type is not allowed at line 1 -FFI\ParserException: struct/union can't contain an instance of itself at line 1 +FFI\ParserException: Struct/union can't contain an instance of itself at line 1 ok ok diff --git a/ext/ffi/tests/017.phpt b/ext/ffi/tests/017.phpt index 718b078bc7..cd64a85efc 100644 --- a/ext/ffi/tests/017.phpt +++ b/ext/ffi/tests/017.phpt @@ -25,7 +25,7 @@ try { ok --EXPECTF-- FFI\ParserException: 'function' type is not allowed at line 1 -FFI\ParserException: struct/union can't contain an instance of itself at line 1 +FFI\ParserException: Struct/union can't contain an instance of itself at line 1 object(FFI\CData:struct X)#%d (1) { ["ptr"]=> NULL diff --git a/ext/ffi/tests/018.phpt b/ext/ffi/tests/018.phpt index 9e7c124384..14905e74f6 100644 --- a/ext/ffi/tests/018.phpt +++ b/ext/ffi/tests/018.phpt @@ -21,6 +21,6 @@ try { ?> ok --EXPECT-- -FFI\ParserException: incomplete 'struct X' at line 1 +FFI\ParserException: Incomplete 'struct X' at line 1 ok ok diff --git a/ext/ffi/tests/028.phpt b/ext/ffi/tests/028.phpt index ee69d70f68..3015f784c6 100644 --- a/ext/ffi/tests/028.phpt +++ b/ext/ffi/tests/028.phpt @@ -47,6 +47,6 @@ try { ok ok ok -FFI\ParserException: flexible array member not at end of struct at line 1 -FFI\ParserException: flexible array member not at end of struct at line 1 -FFI\ParserException: flexible array member in union at line 1 +FFI\ParserException: Flexible array member not at end of struct at line 1 +FFI\ParserException: Flexible array member not at end of struct at line 1 +FFI\ParserException: Flexible array member in union at line 1 diff --git a/ext/fileinfo/tests/bug68996.phpt b/ext/fileinfo/tests/bug68996.phpt index a489e3c0de..83f2765408 100644 --- a/ext/fileinfo/tests/bug68996.phpt +++ b/ext/fileinfo/tests/bug68996.phpt @@ -15,8 +15,8 @@ finfo_open(FILEINFO_MIME_TYPE, "\xfc\x63"); ?> --EXPECTF-- <br /> -<b>Warning</b>: : failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br /> +<b>Warning</b>: : Failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br /> <br /> -<b>Warning</b>: : failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br /> +<b>Warning</b>: : Failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br /> <br /> <b>Warning</b>: finfo_open(): Failed to load magic database at '%s�c'. in <b>%sbug68996.php</b> on line <b>%d</b><br /> diff --git a/ext/fileinfo/tests/finfo_file_001.phpt b/ext/fileinfo/tests/finfo_file_001.phpt index 4650ff1c16..3d01c8e881 100644 --- a/ext/fileinfo/tests/finfo_file_001.phpt +++ b/ext/fileinfo/tests/finfo_file_001.phpt @@ -24,5 +24,5 @@ Warning: finfo_file(): Empty filename or path in %s on line %d bool(false) string(9) "directory" -Warning: finfo_file(&): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_file(&): Failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/fileinfo/tests/finfo_open_001.phpt b/ext/fileinfo/tests/finfo_open_001.phpt index 0b93e4cc40..af06278fae 100644 --- a/ext/fileinfo/tests/finfo_open_001.phpt +++ b/ext/fileinfo/tests/finfo_open_001.phpt @@ -23,23 +23,23 @@ finfo_open() expects parameter 2 to be a valid path, string given resource(%d) of type (file_info) resource(%d) of type (file_info) -Warning: finfo_open(%s123): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(%s123): Failed to open stream: No such file or directory in %s on line %d -Warning: finfo_open(%s123): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(%s123): Failed to open stream: No such file or directory in %s on line %d Warning: finfo_open(): Failed to load magic database at '%s123'. in %s on line %d bool(false) -Warning: finfo_open(%s1): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(%s1): Failed to open stream: No such file or directory in %s on line %d -Warning: finfo_open(%s1): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(%s1): Failed to open stream: No such file or directory in %s on line %d Warning: finfo_open(): Failed to load magic database at '%s1'. in %s on line %d bool(false) -Warning: finfo_open(%sinexistent): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(%sinexistent): Failed to open stream: No such file or directory in %s on line %d -Warning: finfo_open(%sinexistent): failed to open stream: No such file or directory in %s on line %d +Warning: finfo_open(%sinexistent): Failed to open stream: No such file or directory in %s on line %d Warning: finfo_open(): Failed to load magic database at '%sinexistent'. in %s on line %d bool(false) diff --git a/ext/fileinfo/tests/finfo_open_error.phpt b/ext/fileinfo/tests/finfo_open_error.phpt index fb07ea8064..deb35bb95f 100644 --- a/ext/fileinfo/tests/finfo_open_error.phpt +++ b/ext/fileinfo/tests/finfo_open_error.phpt @@ -33,9 +33,9 @@ try { --EXPECTF-- *** Testing finfo_open() : error functionality *** -Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d +Warning: finfo_open(%sfoobarfile): Failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d -Warning: finfo_open(%sfoobarfile): failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d +Warning: finfo_open(%sfoobarfile): Failed to open stream: No such file or directory in %sfinfo_open_error.php on line %d Warning: finfo_open(): Failed to load magic database at '%sfoobarfile'. in %sfinfo_open_error.php on line %d bool(false) diff --git a/ext/fileinfo/tests/mime_content_type_001.phpt b/ext/fileinfo/tests/mime_content_type_001.phpt index 8d18cb43ac..472d3e84f8 100644 --- a/ext/fileinfo/tests/mime_content_type_001.phpt +++ b/ext/fileinfo/tests/mime_content_type_001.phpt @@ -23,7 +23,7 @@ Warning: mime_content_type(): Can only process string or stream arguments in %s Warning: mime_content_type(): Can only process string or stream arguments in %s on line %d -Warning: mime_content_type(foo/inexistent): failed to open stream: No such file or directory in %s on line %d +Warning: mime_content_type(foo/inexistent): Failed to open stream: No such file or directory in %s on line %d Warning: mime_content_type(): Empty filename or path in %s on line %d diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c index 099211804b..79a0e9d9ab 100644 --- a/ext/filter/logical_filters.c +++ b/ext/filter/logical_filters.c @@ -360,7 +360,7 @@ void php_filter_float(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */ if (decimal_set) { if (decimal_len != 1) { - php_error_docref(NULL, E_WARNING, "decimal separator must be one char"); + php_error_docref(NULL, E_WARNING, "Decimal separator must be one char"); RETURN_VALIDATION_FAILED } else { dec_sep = *decimal; @@ -371,7 +371,7 @@ void php_filter_float(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */ if (thousand_set) { if (thousand_len < 1) { - php_error_docref(NULL, E_WARNING, "thousand separator must be at least one char"); + php_error_docref(NULL, E_WARNING, "Thousand separator must be at least one char"); RETURN_VALIDATION_FAILED } else { tsd_sep = thousand; diff --git a/ext/filter/tests/031.phpt b/ext/filter/tests/031.phpt index 23691fbbba..e45e484bd4 100644 --- a/ext/filter/tests/031.phpt +++ b/ext/filter/tests/031.phpt @@ -53,6 +53,6 @@ bool(false) float(1.234) float(1.234) -Warning: filter_var(): decimal separator must be one char in %s on line %d +Warning: filter_var(): Decimal separator must be one char in %s on line %d bool(false) bool(false) diff --git a/ext/filter/tests/bug51368.phpt b/ext/filter/tests/bug51368.phpt index a8ebecb2d5..38ae03ca95 100644 --- a/ext/filter/tests/bug51368.phpt +++ b/ext/filter/tests/bug51368.phpt @@ -18,5 +18,5 @@ var_dump(filter_var('12345', FILTER_VALIDATE_FLOAT, $options)); float(1000) float(1234.567) -Warning: filter_var(): thousand separator must be at least one char in %s on line %d +Warning: filter_var(): Thousand separator must be at least one char in %s on line %d bool(false) diff --git a/ext/ftp/ftp.c b/ext/ftp/ftp.c index cb8161a456..71dc7f6691 100644 --- a/ext/ftp/ftp.c +++ b/ext/ftp/ftp.c @@ -272,7 +272,7 @@ ftp_login(ftpbuf_t *ftp, const char *user, const size_t user_len, const char *pa ctx = SSL_CTX_new(SSLv23_client_method()); if (ctx == NULL) { - php_error_docref(NULL, E_WARNING, "failed to create the SSL context"); + php_error_docref(NULL, E_WARNING, "Failed to create the SSL context"); return 0; } @@ -288,7 +288,7 @@ ftp_login(ftpbuf_t *ftp, const char *user, const size_t user_len, const char *pa SSL_CTX_free(ctx); if (ftp->ssl_handle == NULL) { - php_error_docref(NULL, E_WARNING, "failed to create the SSL handle"); + php_error_docref(NULL, E_WARNING, "Failed to create the SSL handle"); return 0; } diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c index e135cec027..d196230a62 100644 --- a/ext/ftp/php_ftp.c +++ b/ext/ftp/php_ftp.c @@ -889,7 +889,7 @@ PHP_FUNCTION(ftp_nb_continue) } if (!ftp->nb) { - php_error_docref(NULL, E_WARNING, "no nbronous transfer to continue."); + php_error_docref(NULL, E_WARNING, "No nbronous transfer to continue."); RETURN_LONG(PHP_FTP_FAILED); } diff --git a/ext/ftp/tests/005.phpt b/ext/ftp/tests/005.phpt index bbc11e87ae..4b46321e26 100644 --- a/ext/ftp/tests/005.phpt +++ b/ext/ftp/tests/005.phpt @@ -66,7 +66,7 @@ int(-1) Warning: ftp_mkdir(): Command not implemented (7). in %s005.php on line 20 bool(false) -Warning: ftp_nb_continue(): no nbronous transfer to continue. in %s005.php on line 21 +Warning: ftp_nb_continue(): No nbronous transfer to continue. in %s005.php on line 21 int(0) Warning: ftp_nb_fget(): Mode must be FTP_ASCII or FTP_BINARY in %s005.php on line 22 diff --git a/ext/gd/gd_compat.c b/ext/gd/gd_compat.c index 448275b168..51692c47a4 100644 --- a/ext/gd/gd_compat.c +++ b/ext/gd/gd_compat.c @@ -11,11 +11,11 @@ int overflow2(int a, int b) { if(a <= 0 || b <= 0) { - php_error_docref(NULL, E_WARNING, "one parameter to a memory allocation multiplication is negative or zero, failing operation gracefully\n"); + php_error_docref(NULL, E_WARNING, "One parameter to a memory allocation multiplication is negative or zero, failing operation gracefully\n"); return 1; } if(a > INT_MAX / b) { - php_error_docref(NULL, E_WARNING, "product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully\n"); + php_error_docref(NULL, E_WARNING, "Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully\n"); return 1; } return 0; diff --git a/ext/gd/libgd/gd_security.c b/ext/gd/libgd/gd_security.c index 2a7d4a032a..438a564ff1 100644 --- a/ext/gd/libgd/gd_security.c +++ b/ext/gd/libgd/gd_security.c @@ -21,11 +21,11 @@ int overflow2(int a, int b) { if(a <= 0 || b <= 0) { - gd_error("one parameter to a memory allocation multiplication is negative or zero, failing operation gracefully\n"); + gd_error("One parameter to a memory allocation multiplication is negative or zero, failing operation gracefully\n"); return 1; } if(a > INT_MAX / b) { - gd_error("product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully\n"); + gd_error("Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully\n"); return 1; } return 0; diff --git a/ext/gd/libgd/gd_tga.c b/ext/gd/libgd/gd_tga.c index 7328163f2c..125a698f24 100644 --- a/ext/gd/libgd/gd_tga.c +++ b/ext/gd/libgd/gd_tga.c @@ -149,7 +149,7 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga) unsigned char header[18]; if (gdGetBuf(header, sizeof(header), ctx) < 18) { - gd_error("fail to read header"); + gd_error("Fail to read header"); return -1; } diff --git a/ext/gd/libgd/gd_xbm.c b/ext/gd/libgd/gd_xbm.c index dabdf0a38f..0be7c2352b 100644 --- a/ext/gd/libgd/gd_xbm.c +++ b/ext/gd/libgd/gd_xbm.c @@ -135,7 +135,7 @@ gdImagePtr gdImageCreateFromXbm(FILE * fd) h[3] = ch; } if (sscanf(h, "%x", &b) != 1) { - gd_error("invalid XBM"); + gd_error("Invalid XBM"); gdImageDestroy(im); return 0; } diff --git a/ext/gd/tests/001-mb.phpt b/ext/gd/tests/001-mb.phpt index 8ee2e9a415..c34c232d0a 100644 --- a/ext/gd/tests/001-mb.phpt +++ b/ext/gd/tests/001-mb.phpt @@ -17,7 +17,7 @@ var_dump(imagecreatefrompng($file)); echo "Done\n"; ?> --EXPECTF-- -Warning: imagecreatefrompng(%s001私はガラスを食べられます.test): failed to open stream: No such file or directory in %s on line %d +Warning: imagecreatefrompng(%s001私はガラスを食べられます.test): Failed to open stream: No such file or directory in %s on line %d bool(false) Warning: imagecreatefrompng(): '%s001私はガラスを食べられます.test' is not a valid PNG file in %s on line %d diff --git a/ext/gd/tests/001.phpt b/ext/gd/tests/001.phpt index b820ac1cc0..75dbcc0d47 100644 --- a/ext/gd/tests/001.phpt +++ b/ext/gd/tests/001.phpt @@ -17,7 +17,7 @@ var_dump(imagecreatefrompng($file)); echo "Done\n"; ?> --EXPECTF-- -Warning: imagecreatefrompng(%s001.test): failed to open stream: No such file or directory in %s on line %d +Warning: imagecreatefrompng(%s001.test): Failed to open stream: No such file or directory in %s on line %d bool(false) Warning: imagecreatefrompng(): '%s001.test' is not a valid PNG file in %s on line %d diff --git a/ext/gd/tests/bug66356.phpt b/ext/gd/tests/bug66356.phpt index 0e13bca9b3..a255997ca0 100644 --- a/ext/gd/tests/bug66356.phpt +++ b/ext/gd/tests/bug66356.phpt @@ -40,7 +40,7 @@ Array [height] => 10 ) -Warning: imagecrop(): one parameter to a memory allocation multiplication is negative or zero, failing operation gracefully +Warning: imagecrop(): One parameter to a memory allocation multiplication is negative or zero, failing operation gracefully in %s on line %d bool(false) object(GdImage)#2 (0) { @@ -48,6 +48,6 @@ object(GdImage)#2 (0) { object(GdImage)#2 (0) { } -Warning: imagecrop(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully +Warning: imagecrop(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %s on line %d bool(false) diff --git a/ext/gd/tests/bug72339.phpt b/ext/gd/tests/bug72339.phpt index d63ce67c55..5b5fdb6ee6 100644 --- a/ext/gd/tests/bug72339.phpt +++ b/ext/gd/tests/bug72339.phpt @@ -32,7 +32,7 @@ unlink($fname); ?> --EXPECTF-- -Warning: imagecreatefromgd2(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully +Warning: imagecreatefromgd2(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %sbug72339.php on line %d Warning: imagecreatefromgd2(): '%sbug72339.gd' is not a valid GD2 file in %sbug72339.php on line %d diff --git a/ext/gd/tests/bug77269.phpt b/ext/gd/tests/bug77269.phpt index 6a426a2aa0..2bd5758e1a 100644 --- a/ext/gd/tests/bug77269.phpt +++ b/ext/gd/tests/bug77269.phpt @@ -14,5 +14,5 @@ imagescale($im, 1, 1, IMG_TRIANGLE); ?> --EXPECTF-- -Warning: imagescale():%S product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully +Warning: imagescale():%S Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %s on line %d diff --git a/ext/gd/tests/bug77272.phpt b/ext/gd/tests/bug77272.phpt index f2d1c90a6d..678333f06c 100644 --- a/ext/gd/tests/bug77272.phpt +++ b/ext/gd/tests/bug77272.phpt @@ -14,6 +14,6 @@ $img = imagecreate(2**28, 1); var_dump(imagescale($img, 1, 1, IMG_TRIANGLE)); ?> --EXPECTF-- -Warning: imagescale():%S product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully +Warning: imagescale():%S Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %s on line %d bool(false) diff --git a/ext/gd/tests/bug77479.phpt b/ext/gd/tests/bug77479.phpt index 855d511992..e57da56439 100644 --- a/ext/gd/tests/bug77479.phpt +++ b/ext/gd/tests/bug77479.phpt @@ -14,7 +14,7 @@ imagecolorallocate($im, 0, 0, 0); imagewbmp($im, __DIR__ . '/77479.wbmp'); ?> --EXPECTF-- -Warning: imagewbmp():%S product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully +Warning: imagewbmp():%S Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %s on line %d Warning: imagewbmp(): Could not create WBMP in %s on line %d diff --git a/ext/gd/tests/bug77973.phpt b/ext/gd/tests/bug77973.phpt index 6a469a32c2..c9400987e0 100644 --- a/ext/gd/tests/bug77973.phpt +++ b/ext/gd/tests/bug77973.phpt @@ -14,7 +14,7 @@ $im = imagecreatefromxbm($filepath); var_dump($im); ?> --EXPECTF-- -Warning: imagecreatefromxbm(): invalid XBM in %s on line %d +Warning: imagecreatefromxbm(): Invalid XBM in %s on line %d Warning: imagecreatefromxbm(): '%s' is not a valid XBM file in %s on line %d bool(false) diff --git a/ext/gd/tests/createfromwbmp2.phpt b/ext/gd/tests/createfromwbmp2.phpt index e083b74c19..819795181a 100644 --- a/ext/gd/tests/createfromwbmp2.phpt +++ b/ext/gd/tests/createfromwbmp2.phpt @@ -42,7 +42,7 @@ $im = imagecreatefromwbmp($filename); unlink($filename); ?> --EXPECTF-- -Warning: imagecreatefromwbmp(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully +Warning: imagecreatefromwbmp(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %s on line %d Warning: imagecreatefromwbmp(): '%s' is not a valid WBMP file in %s on line %d diff --git a/ext/gd/tests/createfromwbmp2_extern.phpt b/ext/gd/tests/createfromwbmp2_extern.phpt index ed739461c4..0aff8d8b93 100644 --- a/ext/gd/tests/createfromwbmp2_extern.phpt +++ b/ext/gd/tests/createfromwbmp2_extern.phpt @@ -42,6 +42,6 @@ $im = imagecreatefromwbmp($filename); unlink($filename); ?> --EXPECTF-- -gd warning: product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully +gd warning: Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully Warning: imagecreatefromwbmp(): '%s_tmp.wbmp' is not a valid WBMP file in %s on line %d diff --git a/ext/gd/tests/imageloadfont_error2.phpt b/ext/gd/tests/imageloadfont_error2.phpt index 262009f2cf..a4ad10839b 100644 --- a/ext/gd/tests/imageloadfont_error2.phpt +++ b/ext/gd/tests/imageloadfont_error2.phpt @@ -11,5 +11,5 @@ Austin Drouare <austin.drouare [at] gmail [dot] com> #testfest #tek11 var_dump( imageloadfont('\src\invalidfile.font') ); ?> --EXPECTF-- -Warning: imageloadfont(\src\invalidfile.font): failed to open stream: No such file or directory in %s on line %d +Warning: imageloadfont(\src\invalidfile.font): Failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/gd/tests/imageloadfont_invalid.phpt b/ext/gd/tests/imageloadfont_invalid.phpt index ed9d9e3a30..0ef49da2a5 100644 --- a/ext/gd/tests/imageloadfont_invalid.phpt +++ b/ext/gd/tests/imageloadfont_invalid.phpt @@ -19,7 +19,7 @@ imagestring($image, $font, 0, 0, "Hello", $black); unlink($filename); ?> --EXPECTF-- -Warning: imageloadfont(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully +Warning: imageloadfont(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %simageloadfont_invalid.php on line %d Warning: imageloadfont(): Error reading font, invalid font header in %simageloadfont_invalid.php on line %d diff --git a/ext/gd/tests/libgd00101.phpt b/ext/gd/tests/libgd00101.phpt index dbb1886171..7e1e4b5872 100644 --- a/ext/gd/tests/libgd00101.phpt +++ b/ext/gd/tests/libgd00101.phpt @@ -11,7 +11,7 @@ $im = imagecreatefromgd(__DIR__ . '/libgd00101.gd'); var_dump($im); ?> --EXPECTF-- -Warning: imagecreatefromgd(): product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully +Warning: imagecreatefromgd(): Product of memory allocation multiplication would exceed INT_MAX, failing operation gracefully in %slibgd00101.php on line %d Warning: imagecreatefromgd(): '%slibgd00101.gd' is not a valid GD file in %slibgd00101.php on line %d diff --git a/ext/gettext/gettext.c b/ext/gettext/gettext.c index 5ba07e6fee..ab796630f4 100644 --- a/ext/gettext/gettext.c +++ b/ext/gettext/gettext.c @@ -77,7 +77,7 @@ ZEND_GET_MODULE(php_gettext) #define PHP_GETTEXT_DOMAIN_LENGTH_CHECK(domain_len) \ if (UNEXPECTED(domain_len > PHP_GETTEXT_MAX_DOMAIN_LENGTH)) { \ - php_error_docref(NULL, E_WARNING, "domain passed too long"); \ + php_error_docref(NULL, E_WARNING, "Domain passed too long"); \ RETURN_FALSE; \ } diff --git a/ext/gettext/tests/44938.phpt b/ext/gettext/tests/44938.phpt index 0062590464..a5b32c6bf2 100644 --- a/ext/gettext/tests/44938.phpt +++ b/ext/gettext/tests/44938.phpt @@ -36,10 +36,10 @@ var_dump(dgettext($domain, $overflown)); var_dump(textdomain($overflown)); ?> --EXPECTF-- -Warning: bindtextdomain(): domain passed too long in %s on line %d +Warning: bindtextdomain(): Domain passed too long in %s on line %d bool(false) -Warning: dngettext(): domain passed too long in %s on line %d +Warning: dngettext(): Domain passed too long in %s on line %d bool(false) Warning: dngettext(): msgid1 passed too long in %s on line %d @@ -57,13 +57,13 @@ bool(false) Warning: ngettext(): msgid2 passed too long in %s on line %d bool(false) -Warning: dcgettext(): domain passed too long in %s on line %d +Warning: dcgettext(): Domain passed too long in %s on line %d bool(false) Warning: dcgettext(): msgid passed too long in %s on line %d bool(false) -Warning: dcngettext(): domain passed too long in %s on line %d +Warning: dcngettext(): Domain passed too long in %s on line %d bool(false) Warning: dcngettext(): msgid1 passed too long in %s on line %d @@ -72,11 +72,11 @@ bool(false) Warning: dcngettext(): msgid2 passed too long in %s on line %d bool(false) -Warning: dgettext(): domain passed too long in %s on line %d +Warning: dgettext(): Domain passed too long in %s on line %d bool(false) Warning: dgettext(): msgid passed too long in %s on line %d bool(false) -Warning: textdomain(): domain passed too long in %s on line %d +Warning: textdomain(): Domain passed too long in %s on line %d bool(false) diff --git a/ext/hash/hash.c b/ext/hash/hash.c index 34dccfb32a..614d53666b 100644 --- a/ext/hash/hash.c +++ b/ext/hash/hash.c @@ -1065,7 +1065,7 @@ PHP_FUNCTION(mhash_keygen_s2k) bytes = (int)l_bytes; if (bytes <= 0){ - php_error_docref(NULL, E_WARNING, "the byte parameter must be greater than 0"); + php_error_docref(NULL, E_WARNING, "The byte parameter must be greater than 0"); RETURN_FALSE; } diff --git a/ext/hash/tests/hash_file_error.phpt b/ext/hash/tests/hash_file_error.phpt index 534d6a3f2c..eecd2638da 100644 --- a/ext/hash/tests/hash_file_error.phpt +++ b/ext/hash/tests/hash_file_error.phpt @@ -42,5 +42,5 @@ bool(false) -- Testing hash_file() function with a non-existent file -- -Warning: hash_file(%s): failed to open stream: No such file or directory in %s on line %d +Warning: hash_file(%s): Failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/iconv/tests/iconv_stream_filter_delimiter.phpt b/ext/iconv/tests/iconv_stream_filter_delimiter.phpt index 968cfcb606..e08ceeb69f 100644 --- a/ext/iconv/tests/iconv_stream_filter_delimiter.phpt +++ b/ext/iconv/tests/iconv_stream_filter_delimiter.phpt @@ -44,7 +44,7 @@ string(20) "a4b3a4f3a4cba4c1a4cf" string(10) "69636f6e76" string(2) "0a" -Warning: stream_filter_append(): unable to create or locate filter "convert.iconv.ISO-2022-JP\0EUC-JP" in %siconv_stream_filter_delimiter.php on line %d +Warning: stream_filter_append(): Unable to create or locate filter "convert.iconv.ISO-2022-JP\0EUC-JP" in %siconv_stream_filter_delimiter.php on line %d string(20) "1b244224332473244b24" string(10) "41244f1b28" string(2) "42" diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c index 05e6b67723..d539f6fbcf 100644 --- a/ext/imap/php_imap.c +++ b/ext/imap/php_imap.c @@ -992,7 +992,7 @@ PHP_FUNCTION(imap_append) 0, Z_L(0), Z_L(0)); if (!Z_LVAL_P(return_value)) { - php_error_docref(NULL, E_WARNING, "internal date not correctly formatted"); + php_error_docref(NULL, E_WARNING, "Internal date not correctly formatted"); internal_date = NULL; } } @@ -1091,7 +1091,7 @@ PHP_FUNCTION(imap_get_quota) /* set the callback for the GET_QUOTA function */ mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota); if (!imap_getquota(imap_le_struct->imap_stream, ZSTR_VAL(qroot))) { - php_error_docref(NULL, E_WARNING, "c-client imap_getquota failed"); + php_error_docref(NULL, E_WARNING, "C-client imap_getquota failed"); zend_array_destroy(Z_ARR_P(return_value)); RETURN_FALSE; } @@ -1120,7 +1120,7 @@ PHP_FUNCTION(imap_get_quotaroot) /* set the callback for the GET_QUOTAROOT function */ mail_parameters(NIL, SET_QUOTA, (void *) mail_getquota); if (!imap_getquotaroot(imap_le_struct->imap_stream, ZSTR_VAL(mbox))) { - php_error_docref(NULL, E_WARNING, "c-client imap_getquotaroot failed"); + php_error_docref(NULL, E_WARNING, "C-client imap_getquotaroot failed"); zend_array_destroy(Z_ARR_P(return_value)); RETURN_FALSE; } @@ -1241,7 +1241,7 @@ PHP_FUNCTION(imap_gc) } if (flags && ((flags & ~(GC_TEXTS | GC_ELT | GC_ENV)) != 0)) { - php_error_docref(NULL, E_WARNING, "invalid value for the flags parameter"); + php_error_docref(NULL, E_WARNING, "Invalid value for the flags parameter"); RETURN_FALSE; } @@ -1277,7 +1277,7 @@ PHP_FUNCTION(imap_close) /* Check that flags is exactly equal to PHP_EXPUNGE or zero */ if (flags && ((flags & ~PHP_EXPUNGE) != 0)) { - php_error_docref(NULL, E_WARNING, "invalid value for the flags parameter"); + php_error_docref(NULL, E_WARNING, "Invalid value for the flags parameter"); RETURN_FALSE; } @@ -1363,7 +1363,7 @@ PHP_FUNCTION(imap_body) } if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) { - php_error_docref(NULL, E_WARNING, "invalid value for the options parameter"); + php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter"); RETURN_FALSE; } @@ -1989,7 +1989,7 @@ PHP_FUNCTION(imap_fetchstructure) } if (flags && ((flags & ~FT_UID) != 0)) { - php_error_docref(NULL, E_WARNING, "invalid value for the options parameter"); + php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter"); RETURN_FALSE; } @@ -2041,7 +2041,7 @@ PHP_FUNCTION(imap_fetchbody) } if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) { - php_error_docref(NULL, E_WARNING, "invalid value for the options parameter"); + php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter"); RETURN_FALSE; } @@ -2083,7 +2083,7 @@ PHP_FUNCTION(imap_fetchmime) } if (flags && ((flags & ~(FT_UID|FT_PEEK|FT_INTERNAL)) != 0)) { - php_error_docref(NULL, E_WARNING, "invalid value for the options parameter"); + php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter"); RETURN_FALSE; } @@ -2860,7 +2860,7 @@ PHP_FUNCTION(imap_fetchheader) } if (flags && ((flags & ~(FT_UID|FT_INTERNAL|FT_PREFETCHTEXT)) != 0)) { - php_error_docref(NULL, E_WARNING, "invalid value for the options parameter"); + php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter"); RETURN_FALSE; } @@ -3102,7 +3102,7 @@ PHP_FUNCTION(imap_fetch_overview) } if (flags && ((flags & ~FT_UID) != 0)) { - php_error_docref(NULL, E_WARNING, "invalid value for the options parameter"); + php_error_docref(NULL, E_WARNING, "Invalid value for the options parameter"); RETURN_FALSE; } @@ -3460,7 +3460,7 @@ PHP_FUNCTION(imap_mail_compose) } if (bod && bod->type == TYPEMULTIPART && (!bod->nested.part || !bod->nested.part->next)) { - php_error_docref(NULL, E_WARNING, "cannot generate multipart e-mail without components."); + php_error_docref(NULL, E_WARNING, "Cannot generate multipart e-mail without components."); RETVAL_FALSE; goto done; } diff --git a/ext/imap/tests/bug75774.phpt b/ext/imap/tests/bug75774.phpt index b47ef2e415..686ffe75b8 100644 --- a/ext/imap/tests/bug75774.phpt +++ b/ext/imap/tests/bug75774.phpt @@ -21,6 +21,6 @@ unlink($fn); ?> --EXPECTF-- -Warning: imap_append(): internal date not correctly formatted in %s on line %d +Warning: imap_append(): Internal date not correctly formatted in %s on line %d -Exception: imap_append(): supplied resource is not a valid imap resource +Exception: imap_append(): Supplied resource is not a valid imap resource diff --git a/ext/imap/tests/imap_body.phpt b/ext/imap/tests/imap_body.phpt index a9b3bcd6e5..de5f7f286c 100644 --- a/ext/imap/tests/imap_body.phpt +++ b/ext/imap/tests/imap_body.phpt @@ -42,7 +42,7 @@ Warning: imap_body() expects at least 2 parameters, 1 given in %s on line %d Warning: imap_body(): Bad message number in %s on line %d -Warning: imap_body(): invalid value for the options parameter in %s on line %d +Warning: imap_body(): Invalid value for the options parameter in %s on line %d Warning: imap_body(): Bad message number in %s on line %d bool(false) diff --git a/ext/imap/tests/imap_close_variation4.phpt b/ext/imap/tests/imap_close_variation4.phpt index 9faa21c2d7..f45d34845c 100644 --- a/ext/imap/tests/imap_close_variation4.phpt +++ b/ext/imap/tests/imap_close_variation4.phpt @@ -77,15 +77,15 @@ CL_EXPUNGE was set -- Iteration 3 -- -Warning: imap_close(): invalid value for the flags parameter in %s on line %d +Warning: imap_close(): Invalid value for the flags parameter in %s on line %d bool(false) -- Iteration 4 -- -Warning: imap_close(): invalid value for the flags parameter in %s on line %d +Warning: imap_close(): Invalid value for the flags parameter in %s on line %d bool(false) -- Iteration 5 -- -Warning: imap_close(): invalid value for the flags parameter in %s on line %d +Warning: imap_close(): Invalid value for the flags parameter in %s on line %d bool(false) diff --git a/ext/imap/tests/imap_fetch_overview_variation3.phpt b/ext/imap/tests/imap_fetch_overview_variation3.phpt index 04ad6f4790..3bfb627d40 100644 --- a/ext/imap/tests/imap_fetch_overview_variation3.phpt +++ b/ext/imap/tests/imap_fetch_overview_variation3.phpt @@ -71,8 +71,8 @@ imap_fetch_overview() returns an object Testing with option value:int(%d) -Warning: imap_fetch_overview(): invalid value for the options parameter in %s on line %d +Warning: imap_fetch_overview(): Invalid value for the options parameter in %s on line %d Testing with option value:int(-%d) -Warning: imap_fetch_overview(): invalid value for the options parameter in %s on line %d +Warning: imap_fetch_overview(): Invalid value for the options parameter in %s on line %d diff --git a/ext/imap/tests/imap_fetchbody_variation4.phpt b/ext/imap/tests/imap_fetchbody_variation4.phpt index df773a3fb7..8648115896 100644 --- a/ext/imap/tests/imap_fetchbody_variation4.phpt +++ b/ext/imap/tests/imap_fetchbody_variation4.phpt @@ -68,10 +68,10 @@ FT_UID valid -- Iteration 5 -- -Warning: imap_fetchbody(): invalid value for the options parameter in %s on line %d +Warning: imap_fetchbody(): Invalid value for the options parameter in %s on line %d FT_UID not valid -- Iteration 6 -- -Warning: imap_fetchbody(): invalid value for the options parameter in %s on line %d +Warning: imap_fetchbody(): Invalid value for the options parameter in %s on line %d FT_UID not valid diff --git a/ext/imap/tests/imap_fetchheader_variation3.phpt b/ext/imap/tests/imap_fetchheader_variation3.phpt index e07a97b121..073e9e7eca 100644 --- a/ext/imap/tests/imap_fetchheader_variation3.phpt +++ b/ext/imap/tests/imap_fetchheader_variation3.phpt @@ -66,10 +66,10 @@ FT_UID valid -- Iteration 5 -- -Warning: imap_fetchheader(): invalid value for the options parameter in %s on line %d +Warning: imap_fetchheader(): Invalid value for the options parameter in %s on line %d FT_UID not valid -- Iteration 6 -- -Warning: imap_fetchheader(): invalid value for the options parameter in %s on line %d +Warning: imap_fetchheader(): Invalid value for the options parameter in %s on line %d FT_UID not valid diff --git a/ext/imap/tests/imap_gc_error.phpt b/ext/imap/tests/imap_gc_error.phpt index e9b2222778..ee13f45ce7 100644 --- a/ext/imap/tests/imap_gc_error.phpt +++ b/ext/imap/tests/imap_gc_error.phpt @@ -25,11 +25,11 @@ imap_gc($stream_id, -1); --EXPECTF-- Checking with no parameters -Warning: imap_gc() expects exactly 2 parameters, 0 given in %s on line %d +Warning: imap_gc() Expects exactly 2 parameters, 0 given in %s on line %d Checking with incorrect parameter type -Warning: imap_gc() expects parameter 1 to be resource, string given in %s on line %d +Warning: imap_gc() Expects parameter 1 to be resource, string given in %s on line %d -Warning: imap_gc() expects parameter 1 to be resource, bool given in %s on line %d +Warning: imap_gc() Expects parameter 1 to be resource, bool given in %s on line %d -Warning: imap_gc(): invalid value for the flags parameter in %s on line %d +Warning: imap_gc(): Invalid value for the flags parameter in %s on line %d diff --git a/ext/intl/dateformat/dateformat_helpers.cpp b/ext/intl/dateformat/dateformat_helpers.cpp index f578512de6..69332e931c 100644 --- a/ext/intl/dateformat/dateformat_helpers.cpp +++ b/ext/intl/dateformat/dateformat_helpers.cpp @@ -51,7 +51,7 @@ int datefmt_process_calendar_arg(zval* calendar_zv, zend_long v = Z_LVAL_P(calendar_zv); if (v != (zend_long)UCAL_TRADITIONAL && v != (zend_long)UCAL_GREGORIAN) { - spprintf(&msg, 0, "%s: invalid value for calendar type; it must be " + spprintf(&msg, 0, "%s: Invalid value for calendar type; it must be " "one of IntlDateFormatter::TRADITIONAL (locale's default " "calendar) or IntlDateFormatter::GREGORIAN. " "Alternatively, it can be an IntlCalendar object", diff --git a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt index 91e5cd531d..1b346abf67 100644 --- a/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt +++ b/ext/intl/tests/dateformat___construct_bad_tz_cal.phpt @@ -31,8 +31,8 @@ try { } ?> --EXPECTF-- -Exception: IntlDateFormatter::__construct(): datefmt_create: no such time zone: 'bad timezone' in %s on line %d +Exception: IntlDateFormatter::__construct(): datefmt_create: No such time zone: 'bad timezone' in %s on line %d -Exception: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %s on line %d +Exception: IntlDateFormatter::__construct(): datefmt_create: Invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %s on line %d Exception: IntlDateFormatter::__construct(): datefmt_create: Invalid calendar argument; should be an integer or an IntlCalendar instance in %s on line %d diff --git a/ext/intl/tests/dateformat_calendars.phpt b/ext/intl/tests/dateformat_calendars.phpt index 275dba1c30..83c256b713 100644 --- a/ext/intl/tests/dateformat_calendars.phpt +++ b/ext/intl/tests/dateformat_calendars.phpt @@ -41,7 +41,7 @@ string(44) "Sunday, January 1, 2012 5:12:00 AM GMT+05:12" string(44) "Sunday, January 1, 2012 5:12:00 AM GMT+05:12" string(42) "Sunday, Tevet 6, 5772 5:12:00 AM GMT+05:12" -Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars.php:%d +Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: Invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars.php:%d Stack trace: #0 %sdateformat_calendars.php(%d): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1) #1 {main} diff --git a/ext/intl/tests/dateformat_calendars_variant2.phpt b/ext/intl/tests/dateformat_calendars_variant2.phpt index fe4493aa7f..8d051abe59 100644 --- a/ext/intl/tests/dateformat_calendars_variant2.phpt +++ b/ext/intl/tests/dateformat_calendars_variant2.phpt @@ -42,7 +42,7 @@ string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12" string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12" string(48) "Sunday, Tevet 6, 5772 AM at 5:12:00 AM GMT+05:12" -Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars_variant2.php:27 +Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: Invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars_variant2.php:27 Stack trace: #0 %sdateformat_calendars_variant2.php(27): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1) #1 {main} diff --git a/ext/intl/tests/dateformat_calendars_variant3.phpt b/ext/intl/tests/dateformat_calendars_variant3.phpt index d5bdac7fcd..65597d6b45 100644 --- a/ext/intl/tests/dateformat_calendars_variant3.phpt +++ b/ext/intl/tests/dateformat_calendars_variant3.phpt @@ -41,7 +41,7 @@ string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12" string(47) "Sunday, January 1, 2012 at 5:12:00 AM GMT+05:12" string(44) "Sunday, 6 Tevet 5772 at 5:12:00 AM GMT+05:12" -Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars_variant3.php:27 +Fatal error: Uncaught IntlException: IntlDateFormatter::__construct(): datefmt_create: Invalid value for calendar type; it must be one of IntlDateFormatter::TRADITIONAL (locale's default calendar) or IntlDateFormatter::GREGORIAN. Alternatively, it can be an IntlCalendar object in %sdateformat_calendars_variant3.php:27 Stack trace: #0 %sdateformat_calendars_variant3.php(%d): IntlDateFormatter->__construct('en_US@calendar=...', 0, 0, 'GMT+05:12', -1) #1 {main} diff --git a/ext/intl/tests/dateformat_setTimeZone_error.phpt b/ext/intl/tests/dateformat_setTimeZone_error.phpt index 2426c4ccf4..72e78af5f3 100644 --- a/ext/intl/tests/dateformat_setTimeZone_error.phpt +++ b/ext/intl/tests/dateformat_setTimeZone_error.phpt @@ -19,8 +19,8 @@ var_dump($df->setTimeZone('non existing timezone')); --EXPECTF-- Warning: Array to string conversion in %s on line %d -Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'Array' in %s on line %d +Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: No such time zone: 'Array' in %s on line %d bool(false) -Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'non existing timezone' in %s on line %d +Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: No such time zone: 'non existing timezone' in %s on line %d bool(false) diff --git a/ext/intl/tests/dateformat_set_timezone_id2.phpt b/ext/intl/tests/dateformat_set_timezone_id2.phpt index 57658610d5..4f1724520c 100644 --- a/ext/intl/tests/dateformat_set_timezone_id2.phpt +++ b/ext/intl/tests/dateformat_set_timezone_id2.phpt @@ -57,9 +57,9 @@ include_once( 'ut_common.inc' ); ut_run(); ?> --EXPECTF-- -Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'CN' in %s on line %d +Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: No such time zone: 'CN' in %s on line %d -Warning: datefmt_set_timezone(): datefmt_set_timezone: no such time zone: 'CN' in %s on line %d +Warning: datefmt_set_timezone(): datefmt_set_timezone: No such time zone: 'CN' in %s on line %d After creation of the dateformatter : timezone_id= US/Pacific ----------- diff --git a/ext/intl/tests/dateformat_set_timezone_id3.phpt b/ext/intl/tests/dateformat_set_timezone_id3.phpt index 8c6a0c341c..0970089bed 100644 --- a/ext/intl/tests/dateformat_set_timezone_id3.phpt +++ b/ext/intl/tests/dateformat_set_timezone_id3.phpt @@ -57,9 +57,9 @@ include_once( 'ut_common.inc' ); ut_run(); ?> --EXPECTF-- -Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: no such time zone: 'CN' in %sut_common.inc on line %d +Warning: IntlDateFormatter::setTimeZone(): datefmt_set_timezone: No such time zone: 'CN' in %sut_common.inc on line %d -Warning: datefmt_set_timezone(): datefmt_set_timezone: no such time zone: 'CN' in %sut_common.inc on line %d +Warning: datefmt_set_timezone(): datefmt_set_timezone: No such time zone: 'CN' in %sut_common.inc on line %d After creation of the dateformatter : timezone_id= US/Pacific ----------- diff --git a/ext/intl/timezone/timezone_class.cpp b/ext/intl/timezone/timezone_class.cpp index 5ada926d9e..8a8ac2e29c 100644 --- a/ext/intl/timezone/timezone_class.cpp +++ b/ext/intl/timezone/timezone_class.cpp @@ -195,7 +195,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone, } timeZone = TimeZone::createTimeZone(id); if (timeZone == NULL) { - spprintf(&message, 0, "%s: could not create time zone", func); + spprintf(&message, 0, "%s: Could not create time zone", func); if (message) { intl_errors_set(outside_error, U_MEMORY_ALLOCATION_ERROR, message, 1); efree(message); @@ -204,7 +204,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(zval *zv_timezone, return NULL; } if (timeZone->getID(gottenId) != id) { - spprintf(&message, 0, "%s: no such time zone: '%s'", + spprintf(&message, 0, "%s: No such time zone: '%s'", func, Z_STRVAL_P(zv_timezone)); if (message) { intl_errors_set(outside_error, U_ILLEGAL_ARGUMENT_ERROR, message, 1); diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 3647c4b143..728dd588d9 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1030,7 +1030,7 @@ PHP_FUNCTION(ldap_connect) if (port <= 0 || port > 65535) { efree(ld); - php_error_docref(NULL, E_WARNING, "invalid port number: " ZEND_LONG_FMT, port); + php_error_docref(NULL, E_WARNING, "Invalid port number: " ZEND_LONG_FMT, port); RETURN_FALSE; } @@ -1968,7 +1968,7 @@ PHP_FUNCTION(ldap_next_attribute) } if (resultentry->ber == NULL) { - php_error_docref(NULL, E_WARNING, "called before calling ldap_first_attribute() or no attributes found in result entry"); + php_error_docref(NULL, E_WARNING, "Called before calling ldap_first_attribute() or no attributes found in result entry"); RETURN_FALSE; } @@ -3894,7 +3894,7 @@ static void php_ldap_do_translate(INTERNAL_FUNCTION_PARAMETERS, int way) RETVAL_STRINGL(value, value_len); free(value); } else { - php_error_docref(NULL, E_WARNING, "Conversion from iso-8859-1 to t61 failed: %s", ldap_err2string(result)); + php_error_docref(NULL, E_WARNING, "Conversion from ISO-8859-1 to t61 failed: %s", ldap_err2string(result)); RETVAL_FALSE; } } diff --git a/ext/ldap/tests/ldap_next_attribute_error.phpt b/ext/ldap/tests/ldap_next_attribute_error.phpt index e01297da50..94f7cfd475 100644 --- a/ext/ldap/tests/ldap_next_attribute_error.phpt +++ b/ext/ldap/tests/ldap_next_attribute_error.phpt @@ -26,5 +26,5 @@ $link = ldap_connect_and_bind($host, $port, $user, $passwd, $protocol_version); remove_dummy_data($link, $base); ?> --EXPECTF-- -Warning: ldap_next_attribute(): called before calling ldap_first_attribute() or no attributes found in result entry in %s on line %d +Warning: ldap_next_attribute(): Called before calling ldap_first_attribute() or no attributes found in result entry in %s on line %d bool(false) diff --git a/ext/libxml/tests/bug61367-write.phpt b/ext/libxml/tests/bug61367-write.phpt index 5da63d0b71..16951ec825 100644 --- a/ext/libxml/tests/bug61367-write.phpt +++ b/ext/libxml/tests/bug61367-write.phpt @@ -42,5 +42,5 @@ bool(true) Warning: DOMDocument::save(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (.) in %s on line %d -Warning: DOMDocument::save(%s): failed to open stream: Operation not permitted in %s on line %d +Warning: DOMDocument::save(%s): Failed to open stream: Operation not permitted in %s on line %d bool(false) diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index c43644a2d5..3a49bc8614 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -921,7 +921,7 @@ static void _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAMETERS, int icase) } if (arg_pattern_len == 0) { - php_error_docref(NULL, E_WARNING, "empty pattern"); + php_error_docref(NULL, E_WARNING, "Empty pattern"); RETVAL_FALSE; goto out; } diff --git a/ext/mbstring/tests/bug43994.phpt b/ext/mbstring/tests/bug43994.phpt index 5825a4901a..6bc03326ad 100644 --- a/ext/mbstring/tests/bug43994.phpt +++ b/ext/mbstring/tests/bug43994.phpt @@ -41,11 +41,11 @@ foreach($inputs as $input) { -- Iteration 1 -- Without $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) With $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) array(0) { } @@ -53,11 +53,11 @@ array(0) { -- Iteration 2 -- Without $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) With $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) array(0) { } @@ -65,11 +65,11 @@ array(0) { -- Iteration 3 -- Without $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) With $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) array(0) { } @@ -77,11 +77,11 @@ array(0) { -- Iteration 4 -- Without $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) With $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) array(0) { } @@ -89,11 +89,11 @@ array(0) { -- Iteration 5 -- Without $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) With $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) array(0) { } @@ -101,11 +101,11 @@ array(0) { -- Iteration 6 -- Without $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) With $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) array(0) { } @@ -113,11 +113,11 @@ array(0) { -- Iteration 7 -- Without $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) With $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) array(0) { } @@ -125,11 +125,11 @@ array(0) { -- Iteration 8 -- Without $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) With $regs arg: -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) array(0) { } diff --git a/ext/mbstring/tests/mb_ereg1.phpt b/ext/mbstring/tests/mb_ereg1.phpt index 0170e796a3..fcc7e72e9f 100644 --- a/ext/mbstring/tests/mb_ereg1.phpt +++ b/ext/mbstring/tests/mb_ereg1.phpt @@ -34,7 +34,7 @@ array(3) { } } -Warning: mb_ereg(): empty pattern in %s on line %d +Warning: mb_ereg(): Empty pattern in %s on line %d bool(false) array(3) { [0]=> diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 74dcc95ac9..85e7e93603 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -2342,7 +2342,7 @@ PHP_FUNCTION(mysqli_stmt_attr_set) MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID); if (mode_in < 0) { - php_error_docref(NULL, E_WARNING, "mode should be non-negative, " ZEND_LONG_FMT " passed", mode_in); + php_error_docref(NULL, E_WARNING, "Mode should be non-negative, " ZEND_LONG_FMT " passed", mode_in); RETURN_FALSE; } diff --git a/ext/mysqli/mysqli_warning.c b/ext/mysqli/mysqli_warning.c index c2c67abe0e..27f153a3f3 100644 --- a/ext/mysqli/mysqli_warning.c +++ b/ext/mysqli/mysqli_warning.c @@ -288,7 +288,7 @@ PHP_METHOD(mysqli_warning, __construct) RETURN_FALSE; } } else { - php_error_docref(NULL, E_WARNING, "invalid class argument"); + php_error_docref(NULL, E_WARNING, "Invalid class argument"); RETURN_FALSE; } diff --git a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt index 4d3c883e45..3700431762 100644 --- a/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt +++ b/ext/mysqli/tests/mysqli_class_mysqli_warning.phpt @@ -108,7 +108,7 @@ Warning: mysqli_warning::mysqli_warning(): invalid object or resource mysqli_stm Warning: mysqli_warning::mysqli_warning(): invalid object or resource mysqli_stmt in %s on line %d -Warning: mysqli_warning::mysqli_warning(): invalid class argument in /home/nixnutz/php6_mysqlnd/ext/mysqli/tests/mysqli_class_mysqli_warning.php on line 19 +Warning: mysqli_warning::mysqli_warning(): Invalid class argument in /home/nixnutz/php6_mysqlnd/ext/mysqli/tests/mysqli_class_mysqli_warning.php on line 19 Warning: mysqli_warning::mysqli_warning(): No warnings found in %s on line %d Parent class: diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt index 73b2ebe95c..8cbe1e7b4e 100644 --- a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt +++ b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt @@ -181,7 +181,7 @@ Warning: mysqli::real_connect(): (HY000/1045): %s in %s on line %d Warning: mysqli::real_connect(): (HY000/1045): %s in %s on line %d [300 + 002] [1045] %s -Warning: mysqli::real_connect(%sest_sha256_wrong_%d): failed to open stream: No such file or directory in %s on line %d +Warning: mysqli::real_connect(%sest_sha256_wrong_%d): Failed to open stream: No such file or directory in %s on line %d Warning: mysqli::real_connect(): (HY000/1045): %s in %s on line %d [400 + 002] [1045] %s diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c index d1b5978270..c1b2926711 100644 --- a/ext/mysqlnd/mysqlnd_connection.c +++ b/ext/mysqlnd/mysqlnd_connection.c @@ -2641,7 +2641,7 @@ mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long se retval = php_select(max_fd + 1, &rfds, &wfds, &efds, tv_p); if (retval == -1) { - php_error_docref(NULL, E_WARNING, "unable to select [%d]: %s (max_fd=%d)", + php_error_docref(NULL, E_WARNING, "Unable to select [%d]: %s (max_fd=%d)", errno, strerror(errno), max_fd); DBG_RETURN(FAIL); } diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index b3b28a4016..b25a50dcb8 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -1538,7 +1538,7 @@ sb4 php_oci_error(OCIError *err_p, sword errstatus) if (errcode) { php_error_docref(NULL, E_WARNING, "%s", errbuf); } else { - php_error_docref(NULL, E_WARNING, "failed to fetch error message"); + php_error_docref(NULL, E_WARNING, "Failed to fetch error message"); } break; case OCI_INVALID_HANDLE: diff --git a/ext/oci8/oci8_collection.c b/ext/oci8/oci8_collection.c index faf608b2c1..b6a363da1b 100644 --- a/ext/oci8/oci8_collection.c +++ b/ext/oci8/oci8_collection.c @@ -195,7 +195,7 @@ php_oci_collection *php_oci_collection_create(php_oci_connection *connection, ch break; /* we only support VARRAYs and TABLEs */ default: - php_error_docref(NULL, E_WARNING, "unknown collection type %d", collection->coll_typecode); + php_error_docref(NULL, E_WARNING, "Unknown collection type %d", collection->coll_typecode); break; } diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c index 08d94b5094..b48294e3a5 100644 --- a/ext/oci8/oci8_interface.c +++ b/ext/oci8/oci8_interface.c @@ -57,7 +57,7 @@ PHP_FUNCTION(oci_register_taf_callback) #if PHP_MAJOR_VERSION > 7 || (PHP_MAJOR_VERSION == 7 && PHP_MINOR_VERSION >= 2) if (!zend_is_callable(callback, 0, 0)) { callback_name = zend_get_callable_name(callback); - php_error_docref(NULL, E_WARNING, "function '%s' is not callable", ZSTR_VAL(callback_name)); + php_error_docref(NULL, E_WARNING, "Function '%s' is not callable", ZSTR_VAL(callback_name)); #if PHP_VERSION_ID < 70300 zend_string_release(callback_name); #else @@ -67,7 +67,7 @@ PHP_FUNCTION(oci_register_taf_callback) } #else if (!zend_is_callable(callback, 0, &callback_name)) { - php_error_docref(NULL, E_WARNING, "function '%s' is not callable", ZSTR_VAL(callback_name)); + php_error_docref(NULL, E_WARNING, "Function '%s' is not callable", ZSTR_VAL(callback_name)); #if PHP_VERSION_ID < 70300 zend_string_release(callback_name); #else @@ -986,7 +986,7 @@ PHP_FUNCTION(oci_lob_export) RETURN_FALSE; } if (ZEND_NUM_ARGS() > 2 && length < 0) { - php_error_docref(NULL, E_WARNING, "Length parameter must be greater than or equal to 0"); + php_error_docref(NULL, E_WARNING, "length parameter must be greater than or equal to 0"); RETURN_FALSE; } } @@ -1000,7 +1000,7 @@ PHP_FUNCTION(oci_lob_export) RETURN_FALSE; } if (ZEND_NUM_ARGS() > 3 && length < 0) { - php_error_docref(NULL, E_WARNING, "Length parameter must be greater than or equal to 0"); + php_error_docref(NULL, E_WARNING, "length parameter must be greater than or equal to 0"); RETURN_FALSE; } } @@ -1758,7 +1758,7 @@ go_out: } if (!errh) { - php_error_docref(NULL, E_WARNING, "Oci_error: unable to find error handle"); + php_error_docref(NULL, E_WARNING, "oci_error: unable to find error handle"); RETURN_FALSE; } @@ -2105,15 +2105,15 @@ PHP_FUNCTION(oci_password_change) PHP_OCI_ZVAL_TO_CONNECTION(z_connection, connection); if (!user_len) { - php_error_docref(NULL, E_WARNING, "username cannot be empty"); + php_error_docref(NULL, E_WARNING, "Username cannot be empty"); RETURN_FALSE; } if (!pass_old_len) { - php_error_docref(NULL, E_WARNING, "old password cannot be empty"); + php_error_docref(NULL, E_WARNING, "Old password cannot be empty"); RETURN_FALSE; } if (!pass_new_len) { - php_error_docref(NULL, E_WARNING, "new password cannot be empty"); + php_error_docref(NULL, E_WARNING, "New password cannot be empty"); RETURN_FALSE; } @@ -2124,15 +2124,15 @@ PHP_FUNCTION(oci_password_change) } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "ssss", &dbname, &dbname_len, &user, &user_len, &pass_old, &pass_old_len, &pass_new, &pass_new_len) == SUCCESS) { if (!user_len) { - php_error_docref(NULL, E_WARNING, "username cannot be empty"); + php_error_docref(NULL, E_WARNING, "Username cannot be empty"); RETURN_FALSE; } if (!pass_old_len) { - php_error_docref(NULL, E_WARNING, "old password cannot be empty"); + php_error_docref(NULL, E_WARNING, "Old password cannot be empty"); RETURN_FALSE; } if (!pass_new_len) { - php_error_docref(NULL, E_WARNING, "new password cannot be empty"); + php_error_docref(NULL, E_WARNING, "New password cannot be empty"); RETURN_FALSE; } diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index a132a63678..e0e10973be 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -626,24 +626,24 @@ static time_t php_openssl_asn1_time_to_time_t(ASN1_UTCTIME * timestr) /* {{{ */ size_t timestr_len; if (ASN1_STRING_type(timestr) != V_ASN1_UTCTIME && ASN1_STRING_type(timestr) != V_ASN1_GENERALIZEDTIME) { - php_error_docref(NULL, E_WARNING, "illegal ASN1 data type for timestamp"); + php_error_docref(NULL, E_WARNING, "Illegal ASN1 data type for timestamp"); return (time_t)-1; } timestr_len = (size_t)ASN1_STRING_length(timestr); if (timestr_len != strlen((const char *)ASN1_STRING_get0_data(timestr))) { - php_error_docref(NULL, E_WARNING, "illegal length in timestamp"); + php_error_docref(NULL, E_WARNING, "Illegal length in timestamp"); return (time_t)-1; } if (timestr_len < 13 && timestr_len != 11) { - php_error_docref(NULL, E_WARNING, "unable to parse time string %s correctly", timestr->data); + php_error_docref(NULL, E_WARNING, "Unable to parse time string %s correctly", timestr->data); return (time_t)-1; } if (ASN1_STRING_type(timestr) == V_ASN1_GENERALIZEDTIME && timestr_len < 15) { - php_error_docref(NULL, E_WARNING, "unable to parse time string %s correctly", timestr->data); + php_error_docref(NULL, E_WARNING, "Unable to parse time string %s correctly", timestr->data); return (time_t)-1; } @@ -741,7 +741,7 @@ static int php_openssl_add_oid_section(struct php_x509_request * req) /* {{{ */ sktmp = CONF_get_section(req->req_config, str); if (sktmp == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "problem loading oid section %s", str); + php_error_docref(NULL, E_WARNING, "Problem loading oid section %s", str); return FAILURE; } for (i = 0; i < sk_CONF_VALUE_num(sktmp); i++) { @@ -749,7 +749,7 @@ static int php_openssl_add_oid_section(struct php_x509_request * req) /* {{{ */ if (OBJ_sn2nid(cnf->name) == NID_undef && OBJ_ln2nid(cnf->name) == NID_undef && OBJ_create(cnf->value, cnf->name, cnf->name) == NID_undef) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "problem creating object %s=%s", cnf->name, cnf->value); + php_error_docref(NULL, E_WARNING, "Problem creating object %s=%s", cnf->name, cnf->value); return FAILURE; } } @@ -974,7 +974,7 @@ static int php_openssl_load_rand_file(const char * file, int *egdsocket, int *se if (file == NULL || !RAND_load_file(file, -1)) { if (RAND_status() == 0) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "unable to load random state; not enough random data!"); + php_error_docref(NULL, E_WARNING, "Unable to load random state; not enough random data!"); return FAILURE; } return FAILURE; @@ -1000,7 +1000,7 @@ static int php_openssl_write_rand_file(const char * file, int egdsocket, int see PHP_OPENSSL_RAND_ADD_TIME(); if (file == NULL || !RAND_write_file(file)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "unable to write random state"); + php_error_docref(NULL, E_WARNING, "Unable to write random state"); return FAILURE; } return SUCCESS; @@ -1463,7 +1463,7 @@ PHP_FUNCTION(openssl_x509_export_to_file) cert = php_openssl_x509_from_zval(zcert, 0, NULL); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 1"); return; } @@ -1483,7 +1483,7 @@ PHP_FUNCTION(openssl_x509_export_to_file) RETVAL_TRUE; } else { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening file %s", filename); + php_error_docref(NULL, E_WARNING, "Error opening file %s", filename); } if (Z_TYPE_P(zcert) != IS_RESOURCE) { X509_free(cert); @@ -1783,7 +1783,7 @@ PHP_FUNCTION(openssl_x509_export) cert = php_openssl_x509_from_zval(zcert, 0, NULL); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 1"); return; } @@ -1857,7 +1857,7 @@ PHP_FUNCTION(openssl_x509_fingerprint) cert = php_openssl_x509_from_zval(zcert, 0, NULL); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 1"); RETURN_FALSE; } @@ -2189,7 +2189,7 @@ static STACK_OF(X509) *php_openssl_load_all_certs_from_file(char *certfile) if(!(stack = sk_X509_new_null())) { php_openssl_store_errors(); - php_error_docref(NULL, E_ERROR, "memory allocation failure"); + php_error_docref(NULL, E_ERROR, "Memory allocation failure"); goto end; } @@ -2200,7 +2200,7 @@ static STACK_OF(X509) *php_openssl_load_all_certs_from_file(char *certfile) if (!(in=BIO_new_file(certfile, PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY)))) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening the file, %s", certfile); + php_error_docref(NULL, E_WARNING, "Error opening the file, %s", certfile); sk_X509_free(stack); goto end; } @@ -2208,7 +2208,7 @@ static STACK_OF(X509) *php_openssl_load_all_certs_from_file(char *certfile) /* This loads from a file, a stack of x509/crl/pkey sets */ if (!(sk=PEM_X509_INFO_read_bio(in, NULL, NULL, NULL))) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error reading the file, %s", certfile); + php_error_docref(NULL, E_WARNING, "Error reading the file, %s", certfile); sk_X509_free(stack); goto end; } @@ -2223,7 +2223,7 @@ static STACK_OF(X509) *php_openssl_load_all_certs_from_file(char *certfile) X509_INFO_free(xi); } if (!sk_X509_num(stack)) { - php_error_docref(NULL, E_WARNING, "no certificates in file, %s", certfile); + php_error_docref(NULL, E_WARNING, "No certificates in file, %s", certfile); sk_X509_free(stack); goto end; } @@ -2245,12 +2245,12 @@ static int check_cert(X509_STORE *ctx, X509 *x, STACK_OF(X509) *untrustedchain, csc = X509_STORE_CTX_new(); if (csc == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_ERROR, "memory allocation failure"); + php_error_docref(NULL, E_ERROR, "Memory allocation failure"); return 0; } if (!X509_STORE_CTX_init(csc, ctx, x, untrustedchain)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "cert store initialization failed"); + php_error_docref(NULL, E_WARNING, "Certificate store initialization failed"); return 0; } if (purpose >= 0 && !X509_STORE_CTX_set_purpose(csc, purpose)) { @@ -2347,7 +2347,7 @@ static X509_STORE *php_openssl_setup_verify(zval *calist) } if (VCWD_STAT(ZSTR_VAL(str), &sb) == -1) { - php_error_docref(NULL, E_WARNING, "unable to stat %s", ZSTR_VAL(str)); + php_error_docref(NULL, E_WARNING, "Unable to stat %s", ZSTR_VAL(str)); zend_string_release(str); continue; } @@ -2356,7 +2356,7 @@ static X509_STORE *php_openssl_setup_verify(zval *calist) file_lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file()); if (file_lookup == NULL || !X509_LOOKUP_load_file(file_lookup, ZSTR_VAL(str), X509_FILETYPE_PEM)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error loading file %s", ZSTR_VAL(str)); + php_error_docref(NULL, E_WARNING, "Error loading file %s", ZSTR_VAL(str)); } else { nfiles++; } @@ -2365,7 +2365,7 @@ static X509_STORE *php_openssl_setup_verify(zval *calist) dir_lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir()); if (dir_lookup == NULL || !X509_LOOKUP_add_dir(dir_lookup, ZSTR_VAL(str), X509_FILETYPE_PEM)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error loading directory %s", ZSTR_VAL(str)); + php_error_docref(NULL, E_WARNING, "Error loading directory %s", ZSTR_VAL(str)); } else { ndirs++; } @@ -2405,7 +2405,7 @@ PHP_FUNCTION(openssl_x509_read) ZVAL_RES(return_value, res); if (x509 == NULL) { - php_error_docref(NULL, E_WARNING, "supplied parameter cannot be coerced into an X509 certificate!"); + php_error_docref(NULL, E_WARNING, "Supplied parameter cannot be coerced into an X509 certificate!"); RETURN_FALSE; } } @@ -2518,19 +2518,19 @@ PHP_FUNCTION(openssl_pkcs12_export_to_file) cert = php_openssl_x509_from_zval(zcert, 0, NULL); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 1"); return; } priv_key = php_openssl_evp_from_zval(zpkey, 0, "", 0, 1, &keyresource); if (priv_key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get private key from parameter 3"); + php_error_docref(NULL, E_WARNING, "Cannot get private key from parameter 3"); } goto cleanup; } if (!X509_check_private_key(cert, priv_key)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "private key does not correspond to cert"); + php_error_docref(NULL, E_WARNING, "Private key does not correspond to cert"); goto cleanup; } if (php_openssl_open_base_dir_chk(filename)) { @@ -2568,7 +2568,7 @@ PHP_FUNCTION(openssl_pkcs12_export_to_file) RETVAL_TRUE; } else { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening file %s", filename); + php_error_docref(NULL, E_WARNING, "Error opening file %s", filename); } PKCS12_free(p12); @@ -2614,18 +2614,18 @@ PHP_FUNCTION(openssl_pkcs12_export) cert = php_openssl_x509_from_zval(zcert, 0, NULL); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 1"); return; } priv_key = php_openssl_evp_from_zval(zpkey, 0, "", 0, 1, &keyresource); if (priv_key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get private key from parameter 3"); + php_error_docref(NULL, E_WARNING, "Cannot get private key from parameter 3"); } goto cleanup; } if (!X509_check_private_key(cert, priv_key)) { - php_error_docref(NULL, E_WARNING, "private key does not correspond to cert"); + php_error_docref(NULL, E_WARNING, "Private key does not correspond to cert"); goto cleanup; } @@ -2897,7 +2897,7 @@ static int php_openssl_make_REQ(struct php_x509_request * req, X509_REQ * csr, z return FAILURE; } if (!X509_NAME_entry_count(subj)) { - php_error_docref(NULL, E_WARNING, "no objects specified in config file"); + php_error_docref(NULL, E_WARNING, "No objects specified in config file"); return FAILURE; } } @@ -3033,7 +3033,7 @@ PHP_FUNCTION(openssl_csr_export_to_file) csr = php_openssl_csr_from_zval(zcsr, 0, &csr_resource); if (csr == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get CSR from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get CSR from parameter 1"); } return; } @@ -3048,7 +3048,7 @@ PHP_FUNCTION(openssl_csr_export_to_file) php_openssl_store_errors(); } if (!PEM_write_bio_X509_REQ(bio_out, csr)) { - php_error_docref(NULL, E_WARNING, "error writing PEM to file %s", filename); + php_error_docref(NULL, E_WARNING, "Error writing PEM to file %s", filename); php_openssl_store_errors(); } else { RETVAL_TRUE; @@ -3056,7 +3056,7 @@ PHP_FUNCTION(openssl_csr_export_to_file) BIO_free(bio_out); } else { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening file %s", filename); + php_error_docref(NULL, E_WARNING, "Error opening file %s", filename); } if (csr_resource == NULL && csr != NULL) { @@ -3084,7 +3084,7 @@ PHP_FUNCTION(openssl_csr_export) csr = php_openssl_csr_from_zval(zcsr, 0, &csr_resource); if (csr == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get CSR from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get CSR from parameter 1"); } return; } @@ -3138,27 +3138,27 @@ PHP_FUNCTION(openssl_csr_sign) csr = php_openssl_csr_from_zval(zcsr, 0, &csr_resource); if (csr == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get CSR from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get CSR from parameter 1"); } return; } if (zcert) { cert = php_openssl_x509_from_zval(zcert, 0, &certresource); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "cannot get cert from parameter 2"); + php_error_docref(NULL, E_WARNING, "Cannot get cert from parameter 2"); goto cleanup; } } priv_key = php_openssl_evp_from_zval(zpkey, 0, "", 0, 1, &keyresource); if (priv_key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get private key from parameter 3"); + php_error_docref(NULL, E_WARNING, "Cannot get private key from parameter 3"); } goto cleanup; } if (cert && !X509_check_private_key(cert, priv_key)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "private key does not correspond to signing cert"); + php_error_docref(NULL, E_WARNING, "Private key does not correspond to signing cert"); goto cleanup; } @@ -3169,7 +3169,7 @@ PHP_FUNCTION(openssl_csr_sign) key = X509_REQ_get_pubkey(csr); if (key == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error unpacking public key"); + php_error_docref(NULL, E_WARNING, "Error unpacking public key"); goto cleanup; } i = X509_REQ_verify(csr, key); @@ -3230,7 +3230,7 @@ PHP_FUNCTION(openssl_csr_sign) /* Now sign it */ if (!X509_sign(new_cert, priv_key, req.digest)) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "failed to sign it"); + php_error_docref(NULL, E_WARNING, "Failed to sign it"); goto cleanup; } @@ -3502,7 +3502,7 @@ static EVP_PKEY * php_openssl_evp_from_zval( /* get passphrase */ if ((zphrase = zend_hash_index_find(Z_ARRVAL_P(val), 1)) == NULL) { - php_error_docref(NULL, E_WARNING, "key array must be of the form array(0 => key, 1 => phrase)"); + php_error_docref(NULL, E_WARNING, "Key array must be of the form array(0 => key, 1 => phrase)"); return NULL; } @@ -3521,7 +3521,7 @@ static EVP_PKEY * php_openssl_evp_from_zval( /* now set val to be the key param and continue */ if ((val = zend_hash_index_find(Z_ARRVAL_P(val), 0)) == NULL) { - php_error_docref(NULL, E_WARNING, "key array must be of the form array(0 => key, 1 => phrase)"); + php_error_docref(NULL, E_WARNING, "Key array must be of the form array(0 => key, 1 => phrase)"); TMP_CLEAN; } } @@ -3549,7 +3549,7 @@ static EVP_PKEY * php_openssl_evp_from_zval( /* check whether it is actually a private key if requested */ if (!public_key && !is_priv) { - php_error_docref(NULL, E_WARNING, "supplied key param is a public key"); + php_error_docref(NULL, E_WARNING, "Supplied key param is a public key"); TMP_CLEAN; } @@ -3663,7 +3663,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req EVP_PKEY * return_val = NULL; if (req->priv_key_bits < MIN_KEY_LENGTH) { - php_error_docref(NULL, E_WARNING, "private key length is too short; it needs to be at least %d bits, not %d", + php_error_docref(NULL, E_WARNING, "Private key length is too short; it needs to be at least %d bits, not %d", MIN_KEY_LENGTH, req->priv_key_bits); return NULL; } @@ -3688,7 +3688,7 @@ static EVP_PKEY * php_openssl_generate_private_key(struct php_x509_request * req BIGNUM *bne = (BIGNUM *)BN_new(); if (BN_set_word(bne, RSA_F4) != 1) { BN_free(bne); - php_error_docref(NULL, E_WARNING, "failed setting exponent"); + php_error_docref(NULL, E_WARNING, "Failed setting exponent"); return NULL; } rsaparam = RSA_new(); @@ -3865,7 +3865,7 @@ static int php_openssl_is_private_key(EVP_PKEY* pkey) break; #endif default: - php_error_docref(NULL, E_WARNING, "key type not supported in this PHP build!"); + php_error_docref(NULL, E_WARNING, "Key type not supported in this PHP build!"); break; } return 1; @@ -4282,7 +4282,7 @@ PHP_FUNCTION(openssl_pkey_export_to_file) if (key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get key from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get key from parameter 1"); } RETURN_FALSE; } @@ -4369,7 +4369,7 @@ PHP_FUNCTION(openssl_pkey_export) if (key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "cannot get key from parameter 1"); + php_error_docref(NULL, E_WARNING, "Cannot get key from parameter 1"); } RETURN_FALSE; } @@ -4931,7 +4931,7 @@ PHP_FUNCTION(openssl_pkcs7_verify) if (!PEM_write_bio_X509(certout, sk_X509_value(signers, i))) { php_openssl_store_errors(); RETVAL_LONG(-1); - php_error_docref(NULL, E_WARNING, "failed to write signer %d", i); + php_error_docref(NULL, E_WARNING, "Failed to write signer %d", i); } } @@ -4944,7 +4944,7 @@ PHP_FUNCTION(openssl_pkcs7_verify) BIO_free(certout); } else { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "signature OK, but cannot open %s for writing", signersfilename); + php_error_docref(NULL, E_WARNING, "Signature OK, but cannot open %s for writing", signersfilename); RETVAL_LONG(-1); } @@ -5251,14 +5251,14 @@ PHP_FUNCTION(openssl_pkcs7_sign) privkey = php_openssl_evp_from_zval(zprivkey, 0, "", 0, 0, &keyresource); if (privkey == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "error getting private key"); + php_error_docref(NULL, E_WARNING, "Error getting private key"); } goto clean_exit; } cert = php_openssl_x509_from_zval(zcert, 0, &certresource); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "error getting cert"); + php_error_docref(NULL, E_WARNING, "Error getting cert"); goto clean_exit; } @@ -5269,21 +5269,21 @@ PHP_FUNCTION(openssl_pkcs7_sign) infile = BIO_new_file(infilename, PHP_OPENSSL_BIO_MODE_R(flags)); if (infile == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening input file %s!", infilename); + php_error_docref(NULL, E_WARNING, "Error opening input file %s!", infilename); goto clean_exit; } outfile = BIO_new_file(outfilename, PHP_OPENSSL_BIO_MODE_W(PKCS7_BINARY)); if (outfile == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error opening output file %s!", outfilename); + php_error_docref(NULL, E_WARNING, "Error opening output file %s!", outfilename); goto clean_exit; } p7 = PKCS7_sign(cert, privkey, others, infile, (int)flags); if (p7 == NULL) { php_openssl_store_errors(); - php_error_docref(NULL, E_WARNING, "error creating PKCS7 structure!"); + php_error_docref(NULL, E_WARNING, "Error creating PKCS7 structure!"); goto clean_exit; } @@ -5358,14 +5358,14 @@ PHP_FUNCTION(openssl_pkcs7_decrypt) cert = php_openssl_x509_from_zval(recipcert, 0, &certresval); if (cert == NULL) { - php_error_docref(NULL, E_WARNING, "unable to coerce parameter 3 to x509 cert"); + php_error_docref(NULL, E_WARNING, "Unable to coerce parameter 3 to x509 cert"); goto clean_exit; } key = php_openssl_evp_from_zval(recipkey ? recipkey : recipcert, 0, "", 0, 0, &keyresval); if (key == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "unable to get private key"); + php_error_docref(NULL, E_WARNING, "Unable to get private key"); } goto clean_exit; } @@ -5733,7 +5733,7 @@ PHP_FUNCTION(openssl_sign) pkey = php_openssl_evp_from_zval(key, 0, "", 0, 0, &keyresource); if (pkey == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "supplied key param cannot be coerced into a private key"); + php_error_docref(NULL, E_WARNING, "Supplied key param cannot be coerced into a private key"); } RETURN_FALSE; } @@ -5820,7 +5820,7 @@ PHP_FUNCTION(openssl_verify) pkey = php_openssl_evp_from_zval(key, 1, NULL, 0, 0, &keyresource); if (pkey == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "supplied key param cannot be coerced into a public key"); + php_error_docref(NULL, E_WARNING, "Supplied key param cannot be coerced into a public key"); } RETURN_FALSE; } @@ -5902,7 +5902,7 @@ PHP_FUNCTION(openssl_seal) pkeys[i] = php_openssl_evp_from_zval(pubkey, 1, NULL, 0, 0, &key_resources[i]); if (pkeys[i] == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "not a public key (%dth member of pubkeys)", i+1); + php_error_docref(NULL, E_WARNING, "Not a public key (%dth member of pubkeys)", i+1); } RETVAL_FALSE; goto clean_exit; @@ -6002,7 +6002,7 @@ PHP_FUNCTION(openssl_open) pkey = php_openssl_evp_from_zval(privkey, 0, "", 0, 0, &keyresource); if (pkey == NULL) { if (!EG(exception)) { - php_error_docref(NULL, E_WARNING, "unable to coerce parameter 4 into a private key"); + php_error_docref(NULL, E_WARNING, "Unable to coerce parameter 4 into a private key"); } RETURN_FALSE; } diff --git a/ext/openssl/tests/bug38255.phpt b/ext/openssl/tests/bug38255.phpt index 03f9f29a03..d0e5d542cd 100644 --- a/ext/openssl/tests/bug38255.phpt +++ b/ext/openssl/tests/bug38255.phpt @@ -25,11 +25,11 @@ echo "Done\n"; ?> --EXPECTF-- -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) Done diff --git a/ext/openssl/tests/bug54992.phpt b/ext/openssl/tests/bug54992.phpt index fdd75680a3..9f559453e7 100644 --- a/ext/openssl/tests/bug54992.phpt +++ b/ext/openssl/tests/bug54992.phpt @@ -60,5 +60,5 @@ Warning: stream_socket_client(): Peer certificate CN=`bug54992_actual_peer_name' Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/bug65538_002.phpt b/ext/openssl/tests/bug65538_002.phpt index 2a06d2d1b6..51d8f46f5b 100644 --- a/ext/openssl/tests/bug65538_002.phpt +++ b/ext/openssl/tests/bug65538_002.phpt @@ -22,4 +22,4 @@ Warning: remote cafile streams are disabled for security purposes in %s on line Warning: file_get_contents(): Failed to enable crypto in %s on line %d -Warning: file_get_contents(%s): failed to open stream: operation failed in %s on line %d +Warning: file_get_contents(%s): Failed to open stream: operation failed in %s on line %d diff --git a/ext/openssl/tests/bug65729.phpt b/ext/openssl/tests/bug65729.phpt index cffba43dfe..7a516d0be6 100644 --- a/ext/openssl/tests/bug65729.phpt +++ b/ext/openssl/tests/bug65729.phpt @@ -49,7 +49,7 @@ Warning: stream_socket_client(): Peer certificate CN=`*.test.com' did not match Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) resource(%d) of type (stream) resource(%d) of type (stream) @@ -58,5 +58,5 @@ Warning: stream_socket_client(): Peer certificate CN=`*.test.com' did not match Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/bug68920.phpt b/ext/openssl/tests/bug68920.phpt index 34e07a4532..3419c06bed 100644 --- a/ext/openssl/tests/bug68920.phpt +++ b/ext/openssl/tests/bug68920.phpt @@ -54,14 +54,14 @@ Warning: stream_socket_client(): Expected peer fingerprint must be a string or a Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) Warning: stream_socket_client(): Expected peer fingerprint must be a string or an array in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) Warning: stream_socket_client(): Invalid peer_fingerprint array; [algo => fingerprint] form required in %s on line %d @@ -70,7 +70,7 @@ Warning: stream_socket_client(): peer_fingerprint match failure in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) Warning: stream_socket_client(): Invalid peer_fingerprint array; [algo => fingerprint] form required in %s on line %d @@ -79,5 +79,5 @@ Warning: stream_socket_client(): peer_fingerprint match failure in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to %s (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to %s (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/bug71475.phpt b/ext/openssl/tests/bug71475.phpt index 5df8ac27c6..6d4ca66580 100644 --- a/ext/openssl/tests/bug71475.phpt +++ b/ext/openssl/tests/bug71475.phpt @@ -11,5 +11,5 @@ openssl_seal($_, $_, $_, array_fill(0,64,0)); ?> DONE --EXPECTF-- -Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s%ebug71475.php on line %d +Warning: openssl_seal(): Not a public key (1th member of pubkeys) in %s%ebug71475.php on line %d DONE diff --git a/ext/openssl/tests/cve-2013-6420.phpt b/ext/openssl/tests/cve-2013-6420.phpt index 4a4b28ca74..82cbf47ca8 100644 --- a/ext/openssl/tests/cve-2013-6420.phpt +++ b/ext/openssl/tests/cve-2013-6420.phpt @@ -10,7 +10,7 @@ var_dump($info['issuer']['emailAddress'], $info["validFrom_time_t"]); ?> Done --EXPECTF-- -%s openssl_x509_parse(): illegal length in timestamp in %s%ecve-2013-6420.php on line 3 +%s openssl_x509_parse(): Illegal length in timestamp in %s%ecve-2013-6420.php on line 3 string(27) "stefan.esser@sektioneins.de" int(-1) Done diff --git a/ext/openssl/tests/openssl_csr_new_basic.phpt b/ext/openssl/tests/openssl_csr_new_basic.phpt index 6774245dad..c18ac2a22e 100644 --- a/ext/openssl/tests/openssl_csr_new_basic.phpt +++ b/ext/openssl/tests/openssl_csr_new_basic.phpt @@ -23,7 +23,7 @@ var_dump(openssl_csr_new(["countryName" => "DE"], $x, $conf + ["x509_extensions" echo "Done\n"; ?> --EXPECTF-- -Warning: openssl_csr_new(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_csr_new(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_csr_new(): add1_attr_by_txt challengePassword_min -> 4 (failed; check error queue and value of string_mask OpenSSL option if illegal characters are reported) in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_csr_sign_basic.phpt b/ext/openssl/tests/openssl_csr_sign_basic.phpt index 01306599ad..03e070e52b 100644 --- a/ext/openssl/tests/openssl_csr_sign_basic.phpt +++ b/ext/openssl/tests/openssl_csr_sign_basic.phpt @@ -47,23 +47,23 @@ resource(%d) of type (OpenSSL X.509) resource(%d) of type (OpenSSL X.509) resource(%d) of type (OpenSSL X.509) -Warning: openssl_csr_sign(): cannot get cert from parameter 2 in %s on line %d +Warning: openssl_csr_sign(): Cannot get cert from parameter 2 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get private key from parameter 3 in %s on line %d +Warning: openssl_csr_sign(): Cannot get private key from parameter 3 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get CSR from parameter 1 in %s on line %d +Warning: openssl_csr_sign(): Cannot get CSR from parameter 1 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get CSR from parameter 1 in %s on line %d +Warning: openssl_csr_sign(): Cannot get CSR from parameter 1 in %s on line %d bool(false) -Warning: openssl_csr_sign(): cannot get cert from parameter 2 in %s on line %d +Warning: openssl_csr_sign(): Cannot get cert from parameter 2 in %s on line %d bool(false) -Warning: openssl_csr_sign(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_csr_sign(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d -Warning: openssl_csr_sign(): cannot get private key from parameter 3 in %s on line %d +Warning: openssl_csr_sign(): Cannot get private key from parameter 3 in %s on line %d bool(false) resource(%d) of type (OpenSSL X.509) diff --git a/ext/openssl/tests/openssl_open_basic.phpt b/ext/openssl/tests/openssl_open_basic.phpt index d564bcf8e8..fc41022818 100644 --- a/ext/openssl/tests/openssl_open_basic.phpt +++ b/ext/openssl/tests/openssl_open_basic.phpt @@ -22,7 +22,7 @@ var_dump($output4); --EXPECTF-- string(19) "openssl_open() test" -Warning: openssl_open(): unable to coerce parameter 4 into a private key in %s on line %d +Warning: openssl_open(): Unable to coerce parameter 4 into a private key in %s on line %d NULL string(19) "openssl_open() test" NULL diff --git a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt index 89741f29c4..18fbeb0fd6 100644 --- a/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt +++ b/ext/openssl/tests/openssl_peer_fingerprint_basic.phpt @@ -74,6 +74,6 @@ Warning: stream_socket_client(): peer_fingerprint match failure in %s on line %d Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) resource(%d) of type (stream) diff --git a/ext/openssl/tests/openssl_pkcs12_export_basic.phpt b/ext/openssl/tests/openssl_pkcs12_export_basic.phpt index c6082bc645..41d2fbdedd 100644 --- a/ext/openssl/tests/openssl_pkcs12_export_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs12_export_basic.phpt @@ -48,11 +48,11 @@ bool(true) bool(true) int(3) -Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export(): Cannot get cert from parameter 1 in %s on line %d openssl_pkcs12_export(): supplied resource is not a valid OpenSSL X.509 resource diff --git a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt index f079ec8aac..994a0f85d5 100644 --- a/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs12_export_to_file_basic.phpt @@ -53,11 +53,11 @@ bool(true) bool(true) bool(true) -Warning: openssl_pkcs12_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get cert from parameter 1 in %s on line %d openssl_pkcs12_export_to_file(): supplied resource is not a valid OpenSSL X.509 resource diff --git a/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt b/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt index 407eb3aacd..92d7f2789e 100644 --- a/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt +++ b/ext/openssl/tests/openssl_pkcs12_export_to_file_error.phpt @@ -27,11 +27,11 @@ if (file_exists($pkcsfile)) { } ?> --EXPECTF-- -Warning: openssl_pkcs12_export_to_file(): cannot get private key from parameter 3 in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Cannot get private key from parameter 3 in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): private key does not correspond to cert in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Private key does not correspond to cert in %s on line %d bool(false) -Warning: openssl_pkcs12_export_to_file(): error opening file . in %s on line %d +Warning: openssl_pkcs12_export_to_file(): Error opening file . in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt index 937180a22e..f96fd401cd 100644 --- a/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs7_decrypt_basic.phpt @@ -45,22 +45,22 @@ if (file_exists($outfile)) { bool(true) bool(true) -Warning: openssl_pkcs7_decrypt(): unable to get private key in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to get private key in %s on line %d bool(false) -Warning: openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert in %s on line %d bool(false) -Warning: openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert in %s on line %d bool(false) bool(false) bool(false) bool(false) -Warning: openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert in %s on line %d bool(false) -Warning: openssl_pkcs7_decrypt(): unable to get private key in %s on line %d +Warning: openssl_pkcs7_decrypt(): Unable to get private key in %s on line %d bool(false) true true diff --git a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt index 63dabe8f32..d7ae715efb 100644 --- a/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt +++ b/ext/openssl/tests/openssl_pkcs7_decrypt_error.phpt @@ -33,12 +33,12 @@ echo "Done\n"; Object of class stdClass could not be converted to string object(stdClass)#1 (0) { } -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) -string(66) "openssl_pkcs7_decrypt(): unable to coerce parameter 3 to x509 cert" +string(66) "openssl_pkcs7_decrypt(): Unable to coerce parameter 3 to x509 cert" bool(false) Done diff --git a/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt b/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt index 08c96f8069..9b9ff91ddd 100644 --- a/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt +++ b/ext/openssl/tests/openssl_pkcs7_sign_basic.phpt @@ -40,21 +40,21 @@ bool(true) bool(true) bool(true) -Warning: openssl_pkcs7_sign(): error opening input file %s in %s on line %d +Warning: openssl_pkcs7_sign(): Error opening input file %s in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error opening input file %s in %s on line %d +Warning: openssl_pkcs7_sign(): Error opening input file %s in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error opening output file %s in %s on line %d +Warning: openssl_pkcs7_sign(): Error opening output file %s in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error getting cert in %s on line %d +Warning: openssl_pkcs7_sign(): Error getting cert in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error getting cert in %s on line %d +Warning: openssl_pkcs7_sign(): Error getting cert in %s on line %d bool(false) -Warning: openssl_pkcs7_sign(): error getting private key in %s on line %d +Warning: openssl_pkcs7_sign(): Error getting private key in %s on line %d bool(false) true diff --git a/ext/openssl/tests/openssl_private_decrypt_basic.phpt b/ext/openssl/tests/openssl_private_decrypt_basic.phpt index c318fe89b1..6c1401a99a 100644 --- a/ext/openssl/tests/openssl_private_decrypt_basic.phpt +++ b/ext/openssl/tests/openssl_private_decrypt_basic.phpt @@ -31,7 +31,7 @@ NULL bool(false) NULL -Warning: openssl_private_decrypt(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_private_decrypt(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_private_decrypt(): key parameter is not a valid private key in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_public_decrypt_basic.phpt b/ext/openssl/tests/openssl_public_decrypt_basic.phpt index 6c6fdc90f8..f6cd0aa5f0 100644 --- a/ext/openssl/tests/openssl_public_decrypt_basic.phpt +++ b/ext/openssl/tests/openssl_public_decrypt_basic.phpt @@ -33,13 +33,13 @@ NULL bool(false) NULL -Warning: openssl_public_decrypt(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_public_decrypt(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_public_decrypt(): key parameter is not a valid public key in %s on line %d bool(false) NULL -Warning: openssl_public_decrypt(): key array must be of the form array(0 => key, 1 => phrase) in %s on line %d +Warning: openssl_public_decrypt(): Key array must be of the form array(0 => key, 1 => phrase) in %s on line %d Warning: openssl_public_decrypt(): key parameter is not a valid public key in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_seal_basic.phpt b/ext/openssl/tests/openssl_seal_basic.phpt index 18d3808745..0914ab6df2 100644 --- a/ext/openssl/tests/openssl_seal_basic.phpt +++ b/ext/openssl/tests/openssl_seal_basic.phpt @@ -27,7 +27,7 @@ var_dump(openssl_seal($data, $sealed, $ekeys, array($wrong))); echo "Done\n"; ?> --EXPECTF-- -Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s on line %d +Warning: openssl_seal(): Not a public key (1th member of pubkeys) in %s on line %d bool(false) Warning: openssl_seal(): Fourth argument to openssl_seal() must be a non-empty array in %s on line %d @@ -35,12 +35,12 @@ bool(false) int(19) int(19) -Warning: openssl_seal(): not a public key (2th member of pubkeys) in %s on line %d +Warning: openssl_seal(): Not a public key (2th member of pubkeys) in %s on line %d bool(false) Warning: openssl_seal(): Fourth argument to openssl_seal() must be a non-empty array in %s on line %d bool(false) -Warning: openssl_seal(): not a public key (1th member of pubkeys) in %s on line %d +Warning: openssl_seal(): Not a public key (1th member of pubkeys) in %s on line %d bool(false) Done diff --git a/ext/openssl/tests/openssl_sign_basic.phpt b/ext/openssl/tests/openssl_sign_basic.phpt index c88d79f323..bbccda64a4 100644 --- a/ext/openssl/tests/openssl_sign_basic.phpt +++ b/ext/openssl/tests/openssl_sign_basic.phpt @@ -14,5 +14,5 @@ var_dump(openssl_sign($data, $sign, $wrong)); --EXPECTF-- bool(true) -Warning: openssl_sign(): supplied key param cannot be coerced into a private key in %s on line %d +Warning: openssl_sign(): Supplied key param cannot be coerced into a private key in %s on line %d bool(false) diff --git a/ext/openssl/tests/openssl_verify_basic.phpt b/ext/openssl/tests/openssl_verify_basic.phpt index 84d69502bf..99ec78129d 100644 --- a/ext/openssl/tests/openssl_verify_basic.phpt +++ b/ext/openssl/tests/openssl_verify_basic.phpt @@ -19,10 +19,10 @@ var_dump(openssl_verify($wrong, $sign, $pubkey)); --EXPECTF-- int(1) -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) -Warning: openssl_verify(): supplied key param cannot be coerced into a public key in %s on line %d +Warning: openssl_verify(): Supplied key param cannot be coerced into a public key in %s on line %d bool(false) int(0) int(0) diff --git a/ext/openssl/tests/openssl_x509_export_basic.phpt b/ext/openssl/tests/openssl_x509_export_basic.phpt index aecf569489..03baae9266 100644 --- a/ext/openssl/tests/openssl_x509_export_basic.phpt +++ b/ext/openssl/tests/openssl_x509_export_basic.phpt @@ -32,11 +32,11 @@ var_dump(strcmp($output, $output5)); // different bool(true) bool(true) -Warning: openssl_x509_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) bool(true) -Warning: openssl_x509_export(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export(): Cannot get cert from parameter 1 in %s on line %d bool(false) int(0) int(0) diff --git a/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt b/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt index 7fb6c02168..45037449a9 100644 --- a/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt +++ b/ext/openssl/tests/openssl_x509_export_to_file_basic.phpt @@ -32,11 +32,11 @@ if (file_exists($outfilename)) { bool(true) bool(true) -Warning: openssl_x509_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) bool(true) -Warning: openssl_x509_export_to_file(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_export_to_file(): Cannot get cert from parameter 1 in %s on line %d bool(false) --- bool(true) diff --git a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt index b2a87faa83..14f8c0c1ce 100644 --- a/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt +++ b/ext/openssl/tests/openssl_x509_fingerprint_basic.phpt @@ -36,7 +36,7 @@ string(32) "ac77008e172897e06c0b065294487a67" string(40) "6e6fd1ea10a5a23071d61c728ee9b40df6dbc33c" ** Testing bad certification ** -Warning: openssl_x509_fingerprint(): cannot get cert from parameter 1 in %s on line %d +Warning: openssl_x509_fingerprint(): Cannot get cert from parameter 1 in %s on line %d bool(false) ** Testing bad hash method ** diff --git a/ext/openssl/tests/openssl_x509_read_basic.phpt b/ext/openssl/tests/openssl_x509_read_basic.phpt index f7579c7e81..d3aeadd29b 100644 --- a/ext/openssl/tests/openssl_x509_read_basic.phpt +++ b/ext/openssl/tests/openssl_x509_read_basic.phpt @@ -25,12 +25,12 @@ var_dump(openssl_x509_read($f)); // read an array with the filename resource(%d) of type (OpenSSL X.509) resource(%d) of type (OpenSSL X.509) -Warning: openssl_x509_read(): supplied parameter cannot be coerced into an X509 certificate! in %s on line %d +Warning: openssl_x509_read(): Supplied parameter cannot be coerced into an X509 certificate! in %s on line %d bool(false) resource(%d) of type (OpenSSL X.509) -Warning: openssl_x509_read(): supplied parameter cannot be coerced into an X509 certificate! in %s on line %d +Warning: openssl_x509_read(): Supplied parameter cannot be coerced into an X509 certificate! in %s on line %d bool(false) -Warning: openssl_x509_read(): supplied parameter cannot be coerced into an X509 certificate! in %s on line %d +Warning: openssl_x509_read(): Supplied parameter cannot be coerced into an X509 certificate! in %s on line %d bool(false) diff --git a/ext/openssl/tests/san_peer_matching.phpt b/ext/openssl/tests/san_peer_matching.phpt index 87410dd16d..f981141f83 100644 --- a/ext/openssl/tests/san_peer_matching.phpt +++ b/ext/openssl/tests/san_peer_matching.phpt @@ -48,5 +48,5 @@ Warning: stream_socket_client(): Unable to locate peer certificate CN in %s on l Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/tests/stream_security_level.phpt b/ext/openssl/tests/stream_security_level.phpt index 8a8131542d..b47ab97adc 100644 --- a/ext/openssl/tests/stream_security_level.phpt +++ b/ext/openssl/tests/stream_security_level.phpt @@ -67,5 +67,5 @@ error:1416F086:SSL routines:tls_process_server_certificate:certificate verify fa Warning: stream_socket_client(): Failed to enable crypto in %s : eval()'d code on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64322 (Unknown error) in %s : eval()'d code on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64322 (Unknown error) in %s : eval()'d code on line %d bool(false) diff --git a/ext/openssl/tests/stream_verify_peer_name_003.phpt b/ext/openssl/tests/stream_verify_peer_name_003.phpt index 1770c357bd..a87b161b6a 100644 --- a/ext/openssl/tests/stream_verify_peer_name_003.phpt +++ b/ext/openssl/tests/stream_verify_peer_name_003.phpt @@ -58,5 +58,5 @@ Warning: stream_socket_client(): Peer certificate CN=`stream_verify_peer_name_00 Warning: stream_socket_client(): Failed to enable crypto in %s on line %d -Warning: stream_socket_client(): unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d +Warning: stream_socket_client(): Unable to connect to ssl://127.0.0.1:64321 (Unknown error) in %s on line %d bool(false) diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 30863be6e9..da175dcfb9 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1262,7 +1262,7 @@ static int php_openssl_set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /* bio = BIO_new_file(Z_STRVAL_P(zdhpath), PHP_OPENSSL_BIO_MODE_R(PKCS7_BINARY)); if (bio == NULL) { - php_error_docref(NULL, E_WARNING, "invalid dh_param"); + php_error_docref(NULL, E_WARNING, "Invalid dh_param"); return FAILURE; } @@ -1270,12 +1270,12 @@ static int php_openssl_set_server_dh_param(php_stream * stream, SSL_CTX *ctx) /* BIO_free(bio); if (dh == NULL) { - php_error_docref(NULL, E_WARNING, "failed reading DH params"); + php_error_docref(NULL, E_WARNING, "Failed reading DH params"); return FAILURE; } if (SSL_CTX_set_tmp_dh(ctx, dh) < 0) { - php_error_docref(NULL, E_WARNING, "failed assigning DH params"); + php_error_docref(NULL, E_WARNING, "Failed assigning DH params"); DH_free(dh); return FAILURE; } @@ -1308,14 +1308,14 @@ static int php_openssl_set_server_ecdh_curve(php_stream *stream, SSL_CTX *ctx) / curve_nid = OBJ_sn2nid(Z_STRVAL_P(zvcurve)); if (curve_nid == NID_undef) { - php_error_docref(NULL, E_WARNING, "invalid ecdh_curve specified"); + php_error_docref(NULL, E_WARNING, "Invalid ecdh_curve specified"); return FAILURE; } } ecdh = EC_KEY_new_by_curve_name(curve_nid); if (ecdh == NULL) { - php_error_docref(NULL, E_WARNING, "failed generating ECDH curve"); + php_error_docref(NULL, E_WARNING, "Failed generating ECDH curve"); return FAILURE; } @@ -1403,7 +1403,7 @@ static SSL_CTX *php_openssl_create_sni_server_ctx(char *cert_path, char *key_pat if (SSL_CTX_use_certificate_chain_file(ctx, cert_path) != 1) { php_error_docref(NULL, E_WARNING, - "failed setting local cert chain file `%s'; " \ + "Failed setting local cert chain file `%s'; " \ "check that your cafile/capath settings include " \ "details of your certificate and its issuer", cert_path @@ -1412,7 +1412,7 @@ static SSL_CTX *php_openssl_create_sni_server_ctx(char *cert_path, char *key_pat return NULL; } else if (SSL_CTX_use_PrivateKey_file(ctx, key_path, SSL_FILETYPE_PEM) != 1) { php_error_docref(NULL, E_WARNING, - "failed setting private key from file `%s'", + "Failed setting private key from file `%s'", key_path ); SSL_CTX_free(ctx); @@ -1492,7 +1492,7 @@ static int php_openssl_enable_server_sni(php_stream *stream, php_openssl_netstre } if (!VCWD_REALPATH(ZSTR_VAL(local_cert_str), resolved_cert_path_buff)) { php_error_docref(NULL, E_WARNING, - "failed setting local cert chain file `%s'; file not found", + "Failed setting local cert chain file `%s'; file not found", ZSTR_VAL(local_cert_str) ); zend_string_release(local_cert_str); @@ -1514,7 +1514,7 @@ static int php_openssl_enable_server_sni(php_stream *stream, php_openssl_netstre } if (!VCWD_REALPATH(ZSTR_VAL(local_pk_str), resolved_pk_path_buff)) { php_error_docref(NULL, E_WARNING, - "failed setting local private key file `%s'; file not found", + "Failed setting local private key file `%s'; file not found", ZSTR_VAL(local_pk_str) ); zend_string_release(local_pk_str); @@ -1528,7 +1528,7 @@ static int php_openssl_enable_server_sni(php_stream *stream, php_openssl_netstre ctx = php_openssl_create_sni_server_ctx(resolved_path_buff, resolved_path_buff); } else { php_error_docref(NULL, E_WARNING, - "failed setting local cert chain file `%s'; file not found", + "Failed setting local cert chain file `%s'; file not found", Z_STRVAL_P(current) ); return FAILURE; @@ -1808,9 +1808,9 @@ int php_openssl_setup_crypto(php_stream *stream, if (cparam->inputs.session) { if (cparam->inputs.session->ops != &php_openssl_socket_ops) { - php_error_docref(NULL, E_WARNING, "supplied session stream must be an SSL enabled stream"); + php_error_docref(NULL, E_WARNING, "Supplied session stream must be an SSL enabled stream"); } else if (((php_openssl_netstream_data_t*)cparam->inputs.session->abstract)->ssl_handle == NULL) { - php_error_docref(NULL, E_WARNING, "supplied SSL session stream is not initialized"); + php_error_docref(NULL, E_WARNING, "Supplied SSL session stream is not initialized"); } else { SSL_copy_session_id(sslsock->ssl_handle, ((php_openssl_netstream_data_t*)cparam->inputs.session->abstract)->ssl_handle); } diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index 495025096b..9a1e0f53f6 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -343,7 +343,7 @@ static PHP_METHOD(PDO, dbh_constructor) dbh->auto_commit = pdo_attr_lval(options, PDO_ATTR_AUTOCOMMIT, 1); if (!dbh->data_source || (username && !dbh->username) || (password && !dbh->password)) { - php_error_docref(NULL, E_ERROR, "out of memory"); + php_error_docref(NULL, E_ERROR, "Out of memory"); } zend_replace_error_handling(EH_THROW, pdo_exception_ce, &zeh); diff --git a/ext/pdo_oci/oci_statement.c b/ext/pdo_oci/oci_statement.c index 6a7be25c09..d25c324eca 100644 --- a/ext/pdo_oci/oci_statement.c +++ b/ext/pdo_oci/oci_statement.c @@ -780,7 +780,7 @@ static int oci_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, size_t *len return 1; } else { /* it was truncated */ - php_error_docref(NULL, E_WARNING, "column %d data was too large for buffer and was truncated to fit it", colno); + php_error_docref(NULL, E_WARNING, "Column %d data was too large for buffer and was truncated to fit it", colno); *ptr = C->data; *len = (size_t) C->fetched_len; diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index 1dfb0bd82e..65a0191a8d 100644 --- a/ext/pdo_pgsql/pgsql_driver.c +++ b/ext/pdo_pgsql/pgsql_driver.c @@ -1061,7 +1061,7 @@ static PHP_METHOD(PDO, pgsqlGetNotify) RETURN_FALSE; #if ZEND_ENABLE_ZVAL_LONG64 } else if (ms_timeout > INT_MAX) { - php_error_docref(NULL, E_WARNING, "timeout was shrunk to %d", INT_MAX); + php_error_docref(NULL, E_WARNING, "Timeout was shrunk to %d", INT_MAX); ms_timeout = INT_MAX; #endif } diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c index c0b7bc4a60..b96d59152e 100644 --- a/ext/pdo_sqlite/sqlite_driver.c +++ b/ext/pdo_sqlite/sqlite_driver.c @@ -541,7 +541,7 @@ static PHP_METHOD(SQLite, sqliteCreateFunction) if (!zend_is_callable(callback, 0, NULL)) { zend_string *cbname = zend_get_callable_name(callback); - php_error_docref(NULL, E_WARNING, "function '%s' is not callable", ZSTR_VAL(cbname)); + php_error_docref(NULL, E_WARNING, "Function '%s' is not callable", ZSTR_VAL(cbname)); zend_string_release_ex(cbname, 0); RETURN_FALSE; } @@ -613,14 +613,14 @@ static PHP_METHOD(SQLite, sqliteCreateAggregate) if (!zend_is_callable(step_callback, 0, NULL)) { zend_string *cbname = zend_get_callable_name(step_callback); - php_error_docref(NULL, E_WARNING, "function '%s' is not callable", ZSTR_VAL(cbname)); + php_error_docref(NULL, E_WARNING, "Function '%s' is not callable", ZSTR_VAL(cbname)); zend_string_release_ex(cbname, 0); RETURN_FALSE; } if (!zend_is_callable(fini_callback, 0, NULL)) { zend_string *cbname = zend_get_callable_name(fini_callback); - php_error_docref(NULL, E_WARNING, "function '%s' is not callable", ZSTR_VAL(cbname)); + php_error_docref(NULL, E_WARNING, "Function '%s' is not callable", ZSTR_VAL(cbname)); zend_string_release_ex(cbname, 0); RETURN_FALSE; } @@ -673,7 +673,7 @@ static PHP_METHOD(SQLite, sqliteCreateCollation) if (!zend_is_callable(callback, 0, NULL)) { zend_string *cbname = zend_get_callable_name(callback); - php_error_docref(NULL, E_WARNING, "function '%s' is not callable", ZSTR_VAL(cbname)); + php_error_docref(NULL, E_WARNING, "Function '%s' is not callable", ZSTR_VAL(cbname)); zend_string_release_ex(cbname, 0); RETURN_FALSE; } diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt index 671e4b3454..8bddde7165 100644 --- a/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt +++ b/ext/pdo_sqlite/tests/pdo_sqlite_createaggregate_002.phpt @@ -12,6 +12,6 @@ $pdo->sqliteCreateAggregate('foo', 'strlen', ''); ?> --EXPECTF-- -Warning: PDO::sqliteCreateAggregate(): function 'a' is not callable in %s on line %d +Warning: PDO::sqliteCreateAggregate(): Function 'a' is not callable in %s on line %d -Warning: PDO::sqliteCreateAggregate(): function '' is not callable in %s on line %d +Warning: PDO::sqliteCreateAggregate(): Function '' is not callable in %s on line %d diff --git a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_002.phpt b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_002.phpt index a1d890ac1b..190c0d8b6c 100644 --- a/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_002.phpt +++ b/ext/pdo_sqlite/tests/pdo_sqlite_createfunction_002.phpt @@ -14,4 +14,4 @@ $db->sqliteCreateFunction('bar-alias', 'bar'); ?> --EXPECTF-- -Warning: PDO::sqliteCreateFunction(): function 'bar' is not callable in %s on line %d +Warning: PDO::sqliteCreateFunction(): Function 'bar' is not callable in %s on line %d diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index e430e03643..c92a1ffaa5 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -3263,20 +3263,20 @@ PHP_FUNCTION(pg_lo_create) wanted_oid = (Oid)strtoul(Z_STRVAL_P(oid), &end_ptr, 10); if ((Z_STRVAL_P(oid)+Z_STRLEN_P(oid)) != end_ptr) { /* wrong integer format */ - php_error_docref(NULL, E_NOTICE, "invalid OID value passed"); + php_error_docref(NULL, E_NOTICE, "Invalid OID value passed"); RETURN_FALSE; } } break; case IS_LONG: if (Z_LVAL_P(oid) < (zend_long)InvalidOid) { - php_error_docref(NULL, E_NOTICE, "invalid OID value passed"); + php_error_docref(NULL, E_NOTICE, "Invalid OID value passed"); RETURN_FALSE; } wanted_oid = (Oid)Z_LVAL_P(oid); break; default: - php_error_docref(NULL, E_NOTICE, "invalid OID value passed"); + php_error_docref(NULL, E_NOTICE, "Invalid OID value passed"); RETURN_FALSE; } if ((pgsql_oid = lo_create(pgsql, wanted_oid)) == InvalidOid) { @@ -3675,20 +3675,20 @@ PHP_FUNCTION(pg_lo_import) wanted_oid = (Oid)strtoul(Z_STRVAL_P(oid), &end_ptr, 10); if ((Z_STRVAL_P(oid)+Z_STRLEN_P(oid)) != end_ptr) { /* wrong integer format */ - php_error_docref(NULL, E_NOTICE, "invalid OID value passed"); + php_error_docref(NULL, E_NOTICE, "Invalid OID value passed"); RETURN_FALSE; } } break; case IS_LONG: if (Z_LVAL_P(oid) < (zend_long)InvalidOid) { - php_error_docref(NULL, E_NOTICE, "invalid OID value passed"); + php_error_docref(NULL, E_NOTICE, "Invalid OID value passed"); RETURN_FALSE; } wanted_oid = (Oid)Z_LVAL_P(oid); break; default: - php_error_docref(NULL, E_NOTICE, "invalid OID value passed"); + php_error_docref(NULL, E_NOTICE, "Invalid OID value passed"); RETURN_FALSE; } diff --git a/ext/phar/func_interceptors.c b/ext/phar/func_interceptors.c index 17ade203d5..4e5115f884 100644 --- a/ext/phar/func_interceptors.c +++ b/ext/phar/func_interceptors.c @@ -137,7 +137,7 @@ PHAR_FUNC(phar_file_get_contents) /* {{{ */ if (ZEND_NUM_ARGS() == 5 && maxlen < 0) { efree(arch); - php_error_docref(NULL, E_WARNING, "length must be greater than or equal to zero"); + php_error_docref(NULL, E_WARNING, "Length must be greater than or equal to zero"); RETURN_FALSE; } diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 595ff409e4..8a4599d5f4 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -2992,7 +2992,7 @@ PHP_METHOD(Phar, setDefaultStub) } if (ZEND_NUM_ARGS() > 0 && (phar_obj->archive->is_tar || phar_obj->archive->is_zip)) { - php_error_docref(NULL, E_WARNING, "method accepts no arguments for a tar- or zip-based phar stub, %d given", ZEND_NUM_ARGS()); + php_error_docref(NULL, E_WARNING, "Method accepts no arguments for a tar- or zip-based phar stub, %d given", ZEND_NUM_ARGS()); RETURN_FALSE; } @@ -4438,7 +4438,7 @@ PHP_METHOD(Phar, extractTo) RETURN_THROWS(); case 0: zend_throw_exception_ex(phar_ce_PharException, 0, - "Phar Error: attempted to extract non-existent file or directory \"%s\" from phar \"%s\"", + "phar error: attempted to extract non-existent file or directory \"%s\" from phar \"%s\"", ZSTR_VAL(Z_STR_P(zval_file)), phar_obj->archive->fname); RETURN_THROWS(); } @@ -4460,7 +4460,7 @@ PHP_METHOD(Phar, extractTo) efree(error); } else if (0 == ret && NULL != filename) { zend_throw_exception_ex(phar_ce_PharException, 0, - "Phar Error: attempted to extract non-existent file or directory \"%s\" from phar \"%s\"", + "phar error: attempted to extract non-existent file or directory \"%s\" from phar \"%s\"", ZSTR_VAL(filename), phar_obj->archive->fname); } else { RETURN_TRUE; @@ -4891,7 +4891,7 @@ PHP_METHOD(PharFileInfo, getContent) if (entry_obj->entry->is_dir) { zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, - "Phar error: Cannot retrieve contents, \"%s\" in phar \"%s\" is a directory", entry_obj->entry->filename, entry_obj->entry->phar->fname); + "phar error: Cannot retrieve contents, \"%s\" in phar \"%s\" is a directory", entry_obj->entry->filename, entry_obj->entry->phar->fname); RETURN_THROWS(); } @@ -4903,14 +4903,14 @@ PHP_METHOD(PharFileInfo, getContent) if (SUCCESS != phar_open_entry_fp(link, &error, 0)) { zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, - "Phar error: Cannot retrieve contents, \"%s\" in phar \"%s\": %s", entry_obj->entry->filename, entry_obj->entry->phar->fname, error); + "phar error: Cannot retrieve contents, \"%s\" in phar \"%s\": %s", entry_obj->entry->filename, entry_obj->entry->phar->fname, error); efree(error); RETURN_THROWS(); } if (!(fp = phar_get_efp(link, 0))) { zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, - "Phar error: Cannot retrieve contents of \"%s\" in phar \"%s\"", entry_obj->entry->filename, entry_obj->entry->phar->fname); + "phar error: Cannot retrieve contents of \"%s\" in phar \"%s\"", entry_obj->entry->filename, entry_obj->entry->phar->fname); RETURN_THROWS(); } @@ -4987,7 +4987,7 @@ PHP_METHOD(PharFileInfo, compress) /* decompress this file indirectly */ if (SUCCESS != phar_open_entry_fp(entry_obj->entry, &error, 1)) { zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, - "Phar error: Cannot decompress bzip2-compressed file \"%s\" in phar \"%s\" in order to compress with gzip: %s", entry_obj->entry->filename, entry_obj->entry->phar->fname, error); + "phar error: Cannot decompress bzip2-compressed file \"%s\" in phar \"%s\" in order to compress with gzip: %s", entry_obj->entry->filename, entry_obj->entry->phar->fname, error); efree(error); RETURN_THROWS(); } @@ -5018,7 +5018,7 @@ PHP_METHOD(PharFileInfo, compress) /* decompress this file indirectly */ if (SUCCESS != phar_open_entry_fp(entry_obj->entry, &error, 1)) { zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, - "Phar error: Cannot decompress gzip-compressed file \"%s\" in phar \"%s\" in order to compress with bzip2: %s", entry_obj->entry->filename, entry_obj->entry->phar->fname, error); + "phar error: Cannot decompress gzip-compressed file \"%s\" in phar \"%s\" in order to compress with bzip2: %s", entry_obj->entry->filename, entry_obj->entry->phar->fname, error); efree(error); RETURN_THROWS(); } diff --git a/ext/phar/tests/013.phpt b/ext/phar/tests/013.phpt index 7667a98db9..e486a560bc 100644 --- a/ext/phar/tests/013.phpt +++ b/ext/phar/tests/013.phpt @@ -20,4 +20,4 @@ echo file_get_contents($pname.'/a'); --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- -Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (%s file "a") in %s on line %d +Warning: file_get_contents(phar://%s/a): Failed to open stream: phar error: internal corruption of phar "%s" (%s file "a") in %s on line %d diff --git a/ext/phar/tests/014.phpt b/ext/phar/tests/014.phpt index 08247d1743..4ecee19e90 100644 --- a/ext/phar/tests/014.phpt +++ b/ext/phar/tests/014.phpt @@ -20,4 +20,4 @@ echo file_get_contents($pname.'/a'); --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- -Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (crc32 mismatch on file "a") in %s on line %d +Warning: file_get_contents(phar://%s/a): Failed to open stream: phar error: internal corruption of phar "%s" (crc32 mismatch on file "a") in %s on line %d diff --git a/ext/phar/tests/016.phpt b/ext/phar/tests/016.phpt index e94a17f059..e9f6458243 100644 --- a/ext/phar/tests/016.phpt +++ b/ext/phar/tests/016.phpt @@ -28,12 +28,12 @@ var_dump(file_get_contents($pname . '/d')); --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- -Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d +Warning: file_get_contents(phar://%s/a): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d bool(false) -Warning: file_get_contents(phar://%s/b): failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "b") in %s on line %d +Warning: file_get_contents(phar://%s/b): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "b") in %s on line %d bool(false) string(1) "*" -Warning: file_get_contents(phar://%s/d): failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "d") in %s on line %d +Warning: file_get_contents(phar://%s/d): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "d") in %s on line %d bool(false) diff --git a/ext/phar/tests/016b.phpt b/ext/phar/tests/016b.phpt index fa2727bede..465f94936d 100644 --- a/ext/phar/tests/016b.phpt +++ b/ext/phar/tests/016b.phpt @@ -21,4 +21,4 @@ echo file_get_contents($pname . '/a'); --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- -Warning: file_get_contents(phar://%s/a): failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d +Warning: file_get_contents(phar://%s/a): Failed to open stream: phar error: internal corruption of phar "%s" (actual filesize mismatch on file "a") in %s on line %d diff --git a/ext/phar/tests/017.phpt b/ext/phar/tests/017.phpt index 69169b7a0b..54c2eef13b 100644 --- a/ext/phar/tests/017.phpt +++ b/ext/phar/tests/017.phpt @@ -29,5 +29,5 @@ $dir = opendir('phar://hio'); string(%d) "%s017.phar.php" bool(true) -Warning: opendir(phar://hio): failed to open dir: phar error: no directory in "phar://hio", must have at least phar://hio/ for root directory (always use full path to a new phar) +Warning: opendir(phar://hio): Failed to open directory: phar error: no directory in "phar://hio", must have at least phar://hio/ for root directory (always use full path to a new phar) phar url "phar://hio" is unknown in %s017.php on line %d diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt index 1d7ab5eae6..23e51db0df 100644 --- a/ext/phar/tests/027.phpt +++ b/ext/phar/tests/027.phpt @@ -85,10 +85,10 @@ bool(false) bool(false) opendir edge cases -Warning: opendir(phar://): failed to open dir: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) +Warning: opendir(phar://): Failed to open directory: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) phar url "phar://" is unknown in %s027.php on line %d bool(false) -Warning: opendir(phar://foo.phar/hi): failed to open dir: phar error: invalid url or non-existent phar "phar://foo.phar/hi" +Warning: opendir(phar://foo.phar/hi): Failed to open directory: phar error: invalid url or non-existent phar "phar://foo.phar/hi" phar url "phar://foo.phar/hi" is unknown in %s027.php on line %d bool(false) diff --git a/ext/phar/tests/bug69720.phpt b/ext/phar/tests/bug69720.phpt index c0f76c7a0e..5c57d6360a 100644 --- a/ext/phar/tests/bug69720.phpt +++ b/ext/phar/tests/bug69720.phpt @@ -24,7 +24,7 @@ try { --EXPECTF-- MY_METADATA_NULL -Warning: file_get_contents(phar://%s): failed to open stream: phar error: "test.php" is not a file in phar "%s.phar" in %s.php on line %d +Warning: file_get_contents(phar://%s): Failed to open stream: phar error: "test.php" is not a file in phar "%s.phar" in %s.php on line %d array(1) { ["whatever"]=> int(123) diff --git a/ext/phar/tests/cache_list/frontcontroller22.phpt b/ext/phar/tests/cache_list/frontcontroller22.phpt index f0d659b4c3..a6cbc4ae25 100644 --- a/ext/phar/tests/cache_list/frontcontroller22.phpt +++ b/ext/phar/tests/cache_list/frontcontroller22.phpt @@ -17,6 +17,6 @@ Content-type: text/html; charset=UTF-8 string(4) "test" string(12) "oof/test.php" -Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d +Warning: include(./hi.php): Failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt index 374d4ae821..3dc142b94c 100644 --- a/ext/phar/tests/create_new_phar_b.phpt +++ b/ext/phar/tests/create_new_phar_b.phpt @@ -16,9 +16,9 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.php/a.ph --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- -Warning: file_put_contents(phar://%screate_new_phar_b.phar.php/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d +Warning: file_put_contents(phar://%screate_new_phar_b.phar.php/a.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d -Warning: include(phar://%screate_new_phar_b.phar.php/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d +Warning: include(phar://%screate_new_phar_b.phar.php/a.php): Failed to open stream: %s in %screate_new_phar_b.php on line %d Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.php/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt index 9fad268065..955342d077 100644 --- a/ext/phar/tests/create_path_error.phpt +++ b/ext/phar/tests/create_path_error.phpt @@ -65,17 +65,17 @@ foreach($checks as $check) --EXPECTF-- string(5) "query" string(5) "query" -1:Error: file_put_contents(phar://%s//): failed to open stream: phar error: file "" in phar "%s" cannot be empty -2:Error: file_put_contents(phar://%s/.): failed to open stream: phar error: file "" in phar "%s" cannot be empty -3:Error: file_put_contents(phar://%s/../): failed to open stream: phar error: file "" in phar "%s" cannot be empty -4:Error: file_put_contents(phar://%s/a/..): failed to open stream: phar error: file "" in phar "%s" cannot be empty +1:Error: file_put_contents(phar://%s//): Failed to open stream: phar error: file "" in phar "%s" cannot be empty +2:Error: file_put_contents(phar://%s/.): Failed to open stream: phar error: file "" in phar "%s" cannot be empty +3:Error: file_put_contents(phar://%s/../): Failed to open stream: phar error: file "" in phar "%s" cannot be empty +4:Error: file_put_contents(phar://%s/a/..): Failed to open stream: phar error: file "" in phar "%s" cannot be empty 5: 6: 7: 8: -9:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character -10:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character -11:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character -12:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character -13:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character +9:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character +10:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character +11:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character +12:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character +13:Error: file_put_contents(phar://%s): Failed to open stream: phar error: invalid path "%s" contains illegal character Exception: Phar::offsetSet() expects parameter 1 to be a valid path, string given diff --git a/ext/phar/tests/delete.phpt b/ext/phar/tests/delete.phpt index 56559777d7..5a1059cc7a 100644 --- a/ext/phar/tests/delete.phpt +++ b/ext/phar/tests/delete.phpt @@ -28,4 +28,4 @@ echo file_get_contents($pname . '/a') . "\n"; --EXPECTF-- a -Warning: file_get_contents(phar://%sdelete.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16 +Warning: file_get_contents(phar://%sdelete.phar.php/a): Failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16 diff --git a/ext/phar/tests/delete_in_phar.phpt b/ext/phar/tests/delete_in_phar.phpt index 8f6efd4efd..4cf2f3b439 100644 --- a/ext/phar/tests/delete_in_phar.phpt +++ b/ext/phar/tests/delete_in_phar.phpt @@ -40,7 +40,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar.phar.php/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.php" in %sdelete_in_phar.php on line %d +Warning: include(%sdelete_in_phar.phar.php/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.php" in %sdelete_in_phar.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d diff --git a/ext/phar/tests/delete_in_phar_confirm.phpt b/ext/phar/tests/delete_in_phar_confirm.phpt index 066938e29c..90401bb5cc 100644 --- a/ext/phar/tests/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/delete_in_phar_confirm.phpt @@ -44,7 +44,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar_confirm.phar.php/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.php" in %sdelete_in_phar_confirm.php on line %d +Warning: include(%sdelete_in_phar_confirm.phar.php/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.php" in %sdelete_in_phar_confirm.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d diff --git a/ext/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt index 118a5ff550..aa037ca5f8 100644 --- a/ext/phar/tests/fgc_edgecases.phpt +++ b/ext/phar/tests/fgc_edgecases.phpt @@ -65,7 +65,7 @@ echo file_get_contents("./hi"); echo file_get_contents("./hi", 0, $context, 0, 0); ?> -Warning: file_get_contents(): length must be greater than or equal to zero in phar://%sfgc_edgecases.phar.php/foo/hi on line %d +Warning: file_get_contents(): Length must be greater than or equal to zero in phar://%sfgc_edgecases.phar.php/foo/hi on line %d test test <?php @@ -82,7 +82,7 @@ echo file_get_contents("./hi"); echo file_get_contents("./hi", 0, $context, 0, 0); ?> -Warning: file_get_contents(phar://%sfgc_edgecases.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sfgc_edgecases.phar.php/foo/hi on line %d +Warning: file_get_contents(phar://%sfgc_edgecases.phar.php/oops): Failed to open stream: phar error: path "oops" is a directory in phar://%sfgc_edgecases.phar.php/foo/hi on line %d Warning: file_get_contents(): Failed to seek to position 50000 in the stream in phar://%sfgc_edgecases.phar.php/foo/hi on line %d <?php diff --git a/ext/phar/tests/fopen.phpt b/ext/phar/tests/fopen.phpt index 5af0737530..c771b25dd3 100644 --- a/ext/phar/tests/fopen.phpt +++ b/ext/phar/tests/fopen.phpt @@ -35,4 +35,4 @@ include $fname; <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- hihi -Warning: fopen(notfound.txt): failed to open stream: No such file or directory in phar://%sfopen.phar.php/index.php on line %d +Warning: fopen(notfound.txt): Failed to open stream: No such file or directory in phar://%sfopen.phar.php/index.php on line %d diff --git a/ext/phar/tests/fopen_edgecases.phpt b/ext/phar/tests/fopen_edgecases.phpt index 52e8f476c1..72725e14c5 100644 --- a/ext/phar/tests/fopen_edgecases.phpt +++ b/ext/phar/tests/fopen_edgecases.phpt @@ -71,16 +71,16 @@ include $pname . '/test.php'; <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php'); ?> <?php unlink(__DIR__ . '/fopen_edgetest.phar'); --EXPECTF-- -Warning: fopen(phar://%sfopen_edgecases.phar.php/b/c.php): failed to open stream: phar error: open mode append not supported in %sfopen_edgecases.php on line %d +Warning: fopen(phar://%sfopen_edgecases.phar.php/b/c.php): Failed to open stream: phar error: open mode append not supported in %sfopen_edgecases.php on line %d -Warning: fopen(phar://%sfopen_edgecases.phar.php.phar.gz): failed to open stream: phar error: invalid url or non-existent phar "phar://%sfopen_edgecases.phar.php.phar.gz" in %sfopen_edgecases.php on line %d +Warning: fopen(phar://%sfopen_edgecases.phar.php.phar.gz): Failed to open stream: phar error: invalid url or non-existent phar "phar://%sfopen_edgecases.phar.php.phar.gz" in %sfopen_edgecases.php on line %d bool(false) -Warning: fopen(phar://%sfopen_edgecases.2.phar.php/hi): failed to open stream: internal corruption of phar "%sfopen_edgecases.2.phar.php" (truncated manifest at stub end) in %sfopen_edgecases.php on line %d +Warning: fopen(phar://%sfopen_edgecases.2.phar.php/hi): Failed to open stream: internal corruption of phar "%sfopen_edgecases.2.phar.php" (truncated manifest at stub end) in %sfopen_edgecases.php on line %d -Warning: fopen(phar://): failed to open stream: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) in %sfopen_edgecases.php on line %d +Warning: fopen(phar://): Failed to open stream: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) in %sfopen_edgecases.php on line %d -Warning: fopen(phar://foo.phar): failed to open stream: %s in %sfopen_edgecases.php on line %d +Warning: fopen(phar://foo.phar): Failed to open stream: %s in %sfopen_edgecases.php on line %d int(0) int(1) int(0) @@ -118,5 +118,5 @@ Warning: rename(): phar error: cannot rename "phar://%sfopen_edgecases.phar.php/ Warning: rename(): phar error: cannot rename "phar://%sfopen_edgecases.phar.php/hi" to "phar://%sfopen_edgecases.phar.php/there": invalid or non-writable url "phar://%sfopen_edgecases.phar.php/hi" in %sfopen_edgecases.php on line %d -Warning: fopen(./notfound.php): failed to open stream: No such file or directory in phar://%sfopen_edgecases.phar.php/test.php on line %d +Warning: fopen(./notfound.php): Failed to open stream: No such file or directory in phar://%sfopen_edgecases.phar.php/test.php on line %d diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt index 586e9ba20e..5b520ad0ca 100644 --- a/ext/phar/tests/fopen_edgecases2.phpt +++ b/ext/phar/tests/fopen_edgecases2.phpt @@ -42,4 +42,4 @@ fopen() expects parameter 1 to be a valid path, array given blah test -Warning: fopen(phar://%sfopen_edgecases2.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sfopen_edgecases2.phar.php/foo/hi on line %d +Warning: fopen(phar://%sfopen_edgecases2.phar.php/oops): Failed to open stream: phar error: path "oops" is a directory in phar://%sfopen_edgecases2.phar.php/foo/hi on line %d diff --git a/ext/phar/tests/frontcontroller22.phpt b/ext/phar/tests/frontcontroller22.phpt index b482164396..b9f1717b0b 100644 --- a/ext/phar/tests/frontcontroller22.phpt +++ b/ext/phar/tests/frontcontroller22.phpt @@ -16,6 +16,6 @@ Content-type: text/html; charset=UTF-8 string(4) "test" string(12) "oof/test.php" -Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d +Warning: include(./hi.php): Failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d diff --git a/ext/phar/tests/include_path.phpt b/ext/phar/tests/include_path.phpt index 38486c4748..c2c9387ea4 100644 --- a/ext/phar/tests/include_path.phpt +++ b/ext/phar/tests/include_path.phpt @@ -29,6 +29,6 @@ include 'file2.php'; file1.php test/file1.php -Warning: include(file2.php): failed to open stream: No such file or directory in %sinclude_path.php on line %d +Warning: include(file2.php): Failed to open stream: No such file or directory in %sinclude_path.php on line %d Warning: include(): Failed opening 'file2.php' for inclusion (include_path='%sphar://%stempmanifest1.phar.php/test') in %sinclude_path.php on line %d diff --git a/ext/phar/tests/mounteddir.phpt b/ext/phar/tests/mounteddir.phpt index ec14348671..5e2e94ad71 100644 --- a/ext/phar/tests/mounteddir.phpt +++ b/ext/phar/tests/mounteddir.phpt @@ -97,7 +97,7 @@ string(%d) "%sextfile.php" var_dump(__FILE__); ?> -Warning: file_get_contents(phar://%stempmanifest1.phar.php/testit/directory): failed to open stream: phar error: path "testit/directory" is a directory in phar://%stempmanifest1.phar.php/index.php on line %d +Warning: file_get_contents(phar://%stempmanifest1.phar.php/testit/directory): Failed to open stream: phar error: path "testit/directory" is a directory in phar://%stempmanifest1.phar.php/index.php on line %d oops string(%d) "phar://%sextfile.php" diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt index ddd1e904ef..d124ddd84b 100644 --- a/ext/phar/tests/open_for_write_existing_b.phpt +++ b/ext/phar/tests/open_for_write_existing_b.phpt @@ -25,6 +25,6 @@ include $pname . '/b/c.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d +Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d bool(false) This is b/c diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt index d46f8b23b1..945f3ebb29 100644 --- a/ext/phar/tests/open_for_write_existing_c.phpt +++ b/ext/phar/tests/open_for_write_existing_c.phpt @@ -25,6 +25,6 @@ include $pname . '/b/c.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d +Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d bool(false) This is b/c diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt index 99538325af..58bd08974e 100644 --- a/ext/phar/tests/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/open_for_write_newfile_b.phpt @@ -27,11 +27,11 @@ include $pname . '/b/new.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d +Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d bool(false) This is b/c -Warning: include(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.php" in %sopen_for_write_newfile_b.php on line %d +Warning: include(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.php" in %sopen_for_write_newfile_b.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt index 470aefede0..3955b39361 100644 --- a/ext/phar/tests/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/open_for_write_newfile_c.phpt @@ -27,11 +27,11 @@ include $pname . '/b/new.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d +Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d bool(false) This is b/c -Warning: include(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.php" in %sopen_for_write_newfile_c.php on line %d +Warning: include(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.php" in %sopen_for_write_newfile_c.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.php/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d diff --git a/ext/phar/tests/opendir.phpt b/ext/phar/tests/opendir.phpt index ee96491061..f3f437d67c 100644 --- a/ext/phar/tests/opendir.phpt +++ b/ext/phar/tests/opendir.phpt @@ -35,8 +35,8 @@ opendir('phar://hi.phar'); --EXPECTF-- file1.txtfile2.txtfile3.txt -Warning: opendir(phar://): failed to open dir: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) +Warning: opendir(phar://): Failed to open directory: phar error: no directory in "phar://", must have at least phar:/// for root directory (always use full path to a new phar) phar url "phar://" is unknown in %sopendir.php on line %d -Warning: opendir(phar://hi.phar): failed to open dir: phar error: invalid url or non-existent phar "phar://hi.phar" +Warning: opendir(phar://hi.phar): Failed to open directory: phar error: invalid url or non-existent phar "phar://hi.phar" phar url "phar://hi.phar" is unknown in %sopendir.php on line %d diff --git a/ext/phar/tests/opendir_edgecases.phpt b/ext/phar/tests/opendir_edgecases.phpt index 594cc823f8..30c137baf2 100644 --- a/ext/phar/tests/opendir_edgecases.phpt +++ b/ext/phar/tests/opendir_edgecases.phpt @@ -60,4 +60,4 @@ opendir() expects parameter 1 to be a valid path, array given .. foo -Warning: opendir(phar://%sopendir_edgecases.phar.php/oops): failed to open dir: %s in phar://%sopendir_edgecases.phar.php/foo on line %d +Warning: opendir(phar://%sopendir_edgecases.phar.php/oops): Failed to open directory: %s in phar://%sopendir_edgecases.phar.php/foo on line %d diff --git a/ext/phar/tests/phar_buildfromdirectory2.phpt b/ext/phar/tests/phar_buildfromdirectory2.phpt index 6d97ecbd97..e92b94eb1b 100644 --- a/ext/phar/tests/phar_buildfromdirectory2.phpt +++ b/ext/phar/tests/phar_buildfromdirectory2.phpt @@ -25,4 +25,4 @@ __HALT_COMPILER(); ?> --EXPECTF-- %s(24) "UnexpectedValueException" -RecursiveDirectoryIterator::__construct(1): failed to open dir: No such file or directory +RecursiveDirectoryIterator::__construct(1): Failed to open directory: No such file or directory diff --git a/ext/phar/tests/phar_gobyebye-win32.phpt b/ext/phar/tests/phar_gobyebye-win32.phpt index 7b1b683fa4..f4120902b3 100644 --- a/ext/phar/tests/phar_gobyebye-win32.phpt +++ b/ext/phar/tests/phar_gobyebye-win32.phpt @@ -28,11 +28,11 @@ include $pname . '/foo/hi'; <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php'); ?> --EXPECTF-- -Warning: readfile(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d +Warning: readfile(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d -Warning: fopen(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d +Warning: fopen(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d -Warning: file_get_contents(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d +Warning: file_get_contents(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d Warning: stat(): stat failed for foo/hi in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d bool(false) @@ -43,4 +43,4 @@ bool(false) Warning: opendir(foo/hi,foo/hi): %s (code: 3) in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d -Warning: opendir(foo/hi): failed to open dir: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d +Warning: opendir(foo/hi): Failed to open directory: No such file or directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d diff --git a/ext/phar/tests/phar_gobyebye.phpt b/ext/phar/tests/phar_gobyebye.phpt index fd779ff549..0abe70ee52 100644 --- a/ext/phar/tests/phar_gobyebye.phpt +++ b/ext/phar/tests/phar_gobyebye.phpt @@ -29,11 +29,11 @@ include $pname . '/foo/hi'; <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?> <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.2.php'); ?> --EXPECTF-- -Warning: readfile(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d +Warning: readfile(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d -Warning: fopen(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d +Warning: fopen(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d -Warning: file_get_contents(foo/hi): failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d +Warning: file_get_contents(foo/hi): Failed to open stream: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d Warning: stat(): stat failed for foo/hi in phar://%sphar_gobyebye.phar.php/foo/hi on line %d bool(false) @@ -42,4 +42,4 @@ bool(false) bool(false) bool(false) -Warning: opendir(foo/hi): failed to open dir: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d +Warning: opendir(foo/hi): Failed to open directory: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d diff --git a/ext/phar/tests/phar_oo_getcontents.phpt b/ext/phar/tests/phar_oo_getcontents.phpt index bac62a6e0d..a63097fafa 100644 --- a/ext/phar/tests/phar_oo_getcontents.phpt +++ b/ext/phar/tests/phar_oo_getcontents.phpt @@ -32,5 +32,5 @@ __halt_compiler(); --EXPECTF-- file contents this works -Phar error: Cannot retrieve contents, "a" in phar "%sphar_oo_getcontents.phar.php" is a directory -Phar error: Cannot retrieve contents, "hi" in phar "%sphar_oo_getcontents.phar.php" is a directory +phar error: Cannot retrieve contents, "a" in phar "%sphar_oo_getcontents.phar.php" is a directory +phar error: Cannot retrieve contents, "hi" in phar "%sphar_oo_getcontents.phar.php" is a directory diff --git a/ext/phar/tests/readfile_edgecases.phpt b/ext/phar/tests/readfile_edgecases.phpt index 3dc863f132..24969c2cf2 100644 --- a/ext/phar/tests/readfile_edgecases.phpt +++ b/ext/phar/tests/readfile_edgecases.phpt @@ -55,4 +55,4 @@ readfile("./hi", 0, $context); readfile("../oops"); ?> -Warning: readfile(phar://%sreadfile_edgecases.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sreadfile_edgecases.phar.php/foo/hi on line %d +Warning: readfile(phar://%sreadfile_edgecases.phar.php/oops): Failed to open stream: phar error: path "oops" is a directory in phar://%sreadfile_edgecases.phar.php/foo/hi on line %d diff --git a/ext/phar/tests/rename.phpt b/ext/phar/tests/rename.phpt index 9e3824729a..ec92777363 100644 --- a/ext/phar/tests/rename.phpt +++ b/ext/phar/tests/rename.phpt @@ -29,4 +29,4 @@ echo file_get_contents($pname . '/a') . "\n"; a a -Warning: file_get_contents(phar://%srename.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d +Warning: file_get_contents(phar://%srename.phar.php/a): Failed to open stream: phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d diff --git a/ext/phar/tests/rename_dir.phpt b/ext/phar/tests/rename_dir.phpt index 7283135632..a383b4c541 100644 --- a/ext/phar/tests/rename_dir.phpt +++ b/ext/phar/tests/rename_dir.phpt @@ -30,4 +30,4 @@ echo file_get_contents($pname . '/a/x') . "\n"; a a -Warning: file_get_contents(phar://%srename_dir.phar.php/a/x): failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.php" in %srename_dir.php on line %d +Warning: file_get_contents(phar://%srename_dir.phar.php/a/x): Failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.php" in %srename_dir.php on line %d diff --git a/ext/phar/tests/tar/create_new_phar_b.phpt b/ext/phar/tests/tar/create_new_phar_b.phpt index 570d20678f..b8a7d4322b 100644 --- a/ext/phar/tests/tar/create_new_phar_b.phpt +++ b/ext/phar/tests/tar/create_new_phar_b.phpt @@ -16,9 +16,9 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.tar/a.ph --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- -Warning: file_put_contents(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d +Warning: file_put_contents(phar://%screate_new_phar_b.phar.tar/a.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d -Warning: include(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d +Warning: include(phar://%screate_new_phar_b.phar.tar/a.php): Failed to open stream: %s in %screate_new_phar_b.php on line %d Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.tar/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d diff --git a/ext/phar/tests/tar/delete.phpt b/ext/phar/tests/tar/delete.phpt index c34c720d31..f092784356 100644 --- a/ext/phar/tests/tar/delete.phpt +++ b/ext/phar/tests/tar/delete.phpt @@ -29,4 +29,4 @@ echo file_get_contents($alias . '/a') . "\n"; --EXPECTF-- a -Warning: file_get_contents(phar://%sdelete.phar.tar/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.tar" in %sdelete.php on line %d +Warning: file_get_contents(phar://%sdelete.phar.tar/a): Failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.tar" in %sdelete.php on line %d diff --git a/ext/phar/tests/tar/delete_in_phar.phpt b/ext/phar/tests/tar/delete_in_phar.phpt index 87e1fb53dd..948260b385 100644 --- a/ext/phar/tests/tar/delete_in_phar.phpt +++ b/ext/phar/tests/tar/delete_in_phar.phpt @@ -41,7 +41,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar.phar.tar/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.tar" in %sdelete_in_phar.php on line %d +Warning: include(%sdelete_in_phar.phar.tar/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.tar" in %sdelete_in_phar.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.tar/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d diff --git a/ext/phar/tests/tar/delete_in_phar_confirm.phpt b/ext/phar/tests/tar/delete_in_phar_confirm.phpt index 0ee0d00c59..762ed508da 100644 --- a/ext/phar/tests/tar/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/tar/delete_in_phar_confirm.phpt @@ -44,7 +44,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar_confirm.phar.tar/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.tar" in %sdelete_in_phar_confirm.php on line %d +Warning: include(%sdelete_in_phar_confirm.phar.tar/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.tar" in %sdelete_in_phar_confirm.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.tar/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt index dc8dfeb8be..eaf1ed9ad2 100644 --- a/ext/phar/tests/tar/open_for_write_existing_b.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt @@ -38,7 +38,7 @@ include $alias . '/b/c.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d +Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d bool(false) This is b/c diff --git a/ext/phar/tests/tar/open_for_write_existing_c.phpt b/ext/phar/tests/tar/open_for_write_existing_c.phpt index fe457b1f06..d70a96bf3b 100644 --- a/ext/phar/tests/tar/open_for_write_existing_c.phpt +++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt @@ -38,7 +38,7 @@ include $alias . '/b/c.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d +Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d bool(false) This is b/c diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt index 1a11debae8..fec1cf2d6c 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt @@ -39,11 +39,11 @@ include $alias . '/b/new.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d +Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d bool(false) This is b/c -Warning: include(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.tar" in %sopen_for_write_newfile_b.php on line %d +Warning: include(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.tar" in %sopen_for_write_newfile_b.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.tar/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt index 6793de14f4..e6d371fb0f 100644 --- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt @@ -38,11 +38,11 @@ include $alias . '/b/new.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d +Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d bool(false) This is b/c -Warning: include(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.tar" in %sopen_for_write_newfile_c.php on line %d +Warning: include(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.tar" in %sopen_for_write_newfile_c.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.tar/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d diff --git a/ext/phar/tests/tar/phar_setdefaultstub.phpt b/ext/phar/tests/tar/phar_setdefaultstub.phpt index 55b214456e..0eedd45861 100644 --- a/ext/phar/tests/tar/phar_setdefaultstub.phpt +++ b/ext/phar/tests/tar/phar_setdefaultstub.phpt @@ -67,12 +67,12 @@ __HALT_COMPILER();" ============================================================================ ============================================================================ -Warning: Phar::setDefaultStub(): method accepts no arguments for a tar- or zip-based phar stub, 1 given in %sphar_setdefaultstub.php on line %d +Warning: Phar::setDefaultStub(): Method accepts no arguments for a tar- or zip-based phar stub, 1 given in %sphar_setdefaultstub.php on line %d string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" ============================================================================ ============================================================================ -Warning: Phar::setDefaultStub(): method accepts no arguments for a tar- or zip-based phar stub, 2 given in %sphar_setdefaultstub.php on line %d +Warning: Phar::setDefaultStub(): Method accepts no arguments for a tar- or zip-based phar stub, 2 given in %sphar_setdefaultstub.php on line %d string(60) "<?php // tar-based phar archive stub file __HALT_COMPILER();" diff --git a/ext/phar/tests/tar/rename.phpt b/ext/phar/tests/tar/rename.phpt index 8774fb2581..2adf01d5f6 100644 --- a/ext/phar/tests/tar/rename.phpt +++ b/ext/phar/tests/tar/rename.phpt @@ -39,4 +39,4 @@ echo file_get_contents($alias . '/a') . "\n"; a a -Warning: file_get_contents(phar://%srename.phar.tar/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.tar" in %srename.php on line %d +Warning: file_get_contents(phar://%srename.phar.tar/a): Failed to open stream: phar error: "a" is not a file in phar "%srename.phar.tar" in %srename.php on line %d diff --git a/ext/phar/tests/tar/rename_dir.phpt b/ext/phar/tests/tar/rename_dir.phpt index f0b8a9b00e..e1a3c5d969 100644 --- a/ext/phar/tests/tar/rename_dir.phpt +++ b/ext/phar/tests/tar/rename_dir.phpt @@ -39,4 +39,4 @@ echo file_get_contents($alias . '/a/x') . "\n"; a a -Warning: file_get_contents(phar://%srename_dir.phar.tar/a/x): failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.tar" in %srename_dir.php on line %d +Warning: file_get_contents(phar://%srename_dir.phar.tar/a/x): Failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.tar" in %srename_dir.php on line %d diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt index 6add59ac0e..6fc2df3ae7 100644 --- a/ext/phar/tests/tar/tar_001.phpt +++ b/ext/phar/tests/tar/tar_001.phpt @@ -24,5 +24,5 @@ try { @unlink(__DIR__ . '/tar_001.phar.tar'); ?> --EXPECTF-- -Warning: fopen(phar://%star_001.phar.tar/tar_001.phpt): failed to open stream: phar error: "%star_001.phar.tar" is a corrupted tar file (truncated) in %star_001.php on line 9 +Warning: fopen(phar://%star_001.phar.tar/tar_001.phpt): Failed to open stream: phar error: "%star_001.phar.tar" is a corrupted tar file (truncated) in %star_001.php on line 9 phar error: "%star_001.phar.tar" is a corrupted tar file (truncated) diff --git a/ext/phar/tests/tar/tar_002.phpt b/ext/phar/tests/tar/tar_002.phpt index 10c46e2805..3549035a4d 100644 --- a/ext/phar/tests/tar/tar_002.phpt +++ b/ext/phar/tests/tar/tar_002.phpt @@ -27,5 +27,5 @@ try { @unlink(__DIR__ . '/tar_002.phar.tar'); ?> --EXPECTF-- -Warning: fopen(phar://%star_002.phar.tar/tar_002.phpt): failed to open stream: phar error: "%star_002.phar.tar" is a corrupted tar file (truncated) in %star_002.php on line 9 +Warning: fopen(phar://%star_002.phar.tar/tar_002.phpt): Failed to open stream: phar error: "%star_002.phar.tar" is a corrupted tar file (truncated) in %star_002.php on line 9 phar error: "%star_002.phar.tar" is a corrupted tar file (truncated) diff --git a/ext/phar/tests/tar/tar_nostub.phpt b/ext/phar/tests/tar/tar_nostub.phpt index 4bef6dc747..d100feb830 100644 --- a/ext/phar/tests/tar/tar_nostub.phpt +++ b/ext/phar/tests/tar/tar_nostub.phpt @@ -41,6 +41,6 @@ try { @unlink(__DIR__ . '/tar_nostub.tar'); ?> --EXPECTF-- -RecursiveDirectoryIterator::__construct(phar://%star_nostub.phar.tar/): failed to open dir: '%star_nostub.phar.tar' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive +RecursiveDirectoryIterator::__construct(phar://%star_nostub.phar.tar/): Failed to open directory: '%star_nostub.phar.tar' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive phar url "phar://%star_nostub.phar.tar/" is unknown string(0) "" diff --git a/ext/phar/tests/test_alias_unset.phpt b/ext/phar/tests/test_alias_unset.phpt index 9d85285036..72ab3ba7b1 100644 --- a/ext/phar/tests/test_alias_unset.phpt +++ b/ext/phar/tests/test_alias_unset.phpt @@ -40,4 +40,4 @@ $a = file_get_contents($pname . '/file1.txt'); // this fails because $fname2 ref Cannot open archive "%stest_alias_unset.2.phar.php", alias is already in use by existing archive string(5) "first" -Warning: file_get_contents(phar://%sfile1.txt): failed to open stream: Cannot open archive "%stest_alias_unset.phar.php", alias is already in use by existing archive in %stest_alias_unset.php on line %d +Warning: file_get_contents(phar://%sfile1.txt): Failed to open stream: Cannot open archive "%stest_alias_unset.phar.php", alias is already in use by existing archive in %stest_alias_unset.php on line %d diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt index 1db8f6ecdb..7f838f3f8a 100644 --- a/ext/phar/tests/zip/create_new_phar_b.phpt +++ b/ext/phar/tests/zip/create_new_phar_b.phpt @@ -16,9 +16,9 @@ include 'phar://' . __DIR__ . '/' . basename(__FILE__, '.php') . '.phar.zip/a.ph --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- -Warning: file_put_contents(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d +Warning: file_put_contents(phar://%screate_new_phar_b.phar.zip/a.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d -Warning: include(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d +Warning: include(phar://%screate_new_phar_b.phar.zip/a.php): Failed to open stream: %s in %screate_new_phar_b.php on line %d Warning: include(): Failed opening 'phar://%screate_new_phar_b.phar.zip/a.php' for inclusion (include_path='%s') in %screate_new_phar_b.php on line %d diff --git a/ext/phar/tests/zip/delete.phpt b/ext/phar/tests/zip/delete.phpt index 87536c9666..25b9d2d62a 100644 --- a/ext/phar/tests/zip/delete.phpt +++ b/ext/phar/tests/zip/delete.phpt @@ -28,4 +28,4 @@ echo file_get_contents($alias . '/a') . "\n"; --EXPECTF-- a -Warning: file_get_contents(phar://%sdelete.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.zip" in %sdelete.php on line %d +Warning: file_get_contents(phar://%sdelete.phar.zip/a): Failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.zip" in %sdelete.php on line %d diff --git a/ext/phar/tests/zip/delete_in_phar.phpt b/ext/phar/tests/zip/delete_in_phar.phpt index e1c541e7e2..5f5d644470 100644 --- a/ext/phar/tests/zip/delete_in_phar.phpt +++ b/ext/phar/tests/zip/delete_in_phar.phpt @@ -40,7 +40,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar.phar.zip/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.zip" in %sdelete_in_phar.php on line %d +Warning: include(%sdelete_in_phar.phar.zip/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar.phar.zip" in %sdelete_in_phar.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d diff --git a/ext/phar/tests/zip/delete_in_phar_confirm.phpt b/ext/phar/tests/zip/delete_in_phar_confirm.phpt index 84d337af06..4d2c68720e 100644 --- a/ext/phar/tests/zip/delete_in_phar_confirm.phpt +++ b/ext/phar/tests/zip/delete_in_phar_confirm.phpt @@ -45,7 +45,7 @@ This is b/c This is a This is b -Warning: include(%sdelete_in_phar_confirm.phar.zip/b/c.php): failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.zip" in %sdelete_in_phar_confirm.php on line %d +Warning: include(%sdelete_in_phar_confirm.phar.zip/b/c.php): Failed to open stream: phar error: "b/c.php" is not a file in phar "%sdelete_in_phar_confirm.phar.zip" in %sdelete_in_phar_confirm.php on line %d Warning: include(): Failed opening 'phar://%sdelete_in_phar_confirm.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar_confirm.php on line %d diff --git a/ext/phar/tests/zip/notphar.phpt b/ext/phar/tests/zip/notphar.phpt index ff30a0c162..f5f049dc5c 100644 --- a/ext/phar/tests/zip/notphar.phpt +++ b/ext/phar/tests/zip/notphar.phpt @@ -21,5 +21,5 @@ unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); __HALT_COMPILER(); ?> --EXPECTF-- -Warning: include(phar://%snotphar.phar.zip/.phar/stub.php): failed to open stream: '%snotphar.phar.zip' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive in %snotphar.php on line %d +Warning: include(phar://%snotphar.phar.zip/.phar/stub.php): Failed to open stream: '%snotphar.phar.zip' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive in %snotphar.php on line %d PK%a diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt index a15a7897e5..68a2d14edd 100644 --- a/ext/phar/tests/zip/open_for_write_existing_b.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt @@ -35,6 +35,6 @@ include $alias . '/b/c.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d +Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d bool(false) This is b/c diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt index 6e6a1b9edf..f62cd4290b 100644 --- a/ext/phar/tests/zip/open_for_write_existing_c.phpt +++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt @@ -35,6 +35,6 @@ include $alias . '/b/c.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d +Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d bool(false) This is b/c diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt index e25bade085..35a50a12fb 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt @@ -38,11 +38,11 @@ include $alias . '/b/new.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d +Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d bool(false) This is b/c -Warning: include(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.zip" in %sopen_for_write_newfile_b.php on line %d +Warning: include(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_b.phar.zip" in %sopen_for_write_newfile_b.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_b.phar.zip/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_b.php on line %d diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt index e2074d7003..0b8e86f7f5 100644 --- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt +++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt @@ -38,11 +38,11 @@ include $alias . '/b/new.php'; --CLEAN-- <?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?> --EXPECTF-- -Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d +Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): Failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d bool(false) This is b/c -Warning: include(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.zip" in %sopen_for_write_newfile_c.php on line %d +Warning: include(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): Failed to open stream: phar error: "b/new.php" is not a file in phar "%sopen_for_write_newfile_c.phar.zip" in %sopen_for_write_newfile_c.php on line %d Warning: include(): Failed opening 'phar://%sopen_for_write_newfile_c.phar.zip/b/new.php' for inclusion (include_path='%s') in %sopen_for_write_newfile_c.php on line %d diff --git a/ext/phar/tests/zip/phar_setdefaultstub.phpt b/ext/phar/tests/zip/phar_setdefaultstub.phpt index 416dd10c26..92a721ba37 100644 --- a/ext/phar/tests/zip/phar_setdefaultstub.phpt +++ b/ext/phar/tests/zip/phar_setdefaultstub.phpt @@ -67,12 +67,12 @@ __HALT_COMPILER();" ============================================================================ ============================================================================ -Warning: Phar::setDefaultStub(): method accepts no arguments for a tar- or zip-based phar stub, 1 given in %sphar_setdefaultstub.php on line %d +Warning: Phar::setDefaultStub(): Method accepts no arguments for a tar- or zip-based phar stub, 1 given in %sphar_setdefaultstub.php on line %d string(60) "<?php // zip-based phar archive stub file __HALT_COMPILER();" ============================================================================ ============================================================================ -Warning: Phar::setDefaultStub(): method accepts no arguments for a tar- or zip-based phar stub, 2 given in %sphar_setdefaultstub.php on line %d +Warning: Phar::setDefaultStub(): Method accepts no arguments for a tar- or zip-based phar stub, 2 given in %sphar_setdefaultstub.php on line %d string(60) "<?php // zip-based phar archive stub file __HALT_COMPILER();" diff --git a/ext/phar/tests/zip/rename.phpt b/ext/phar/tests/zip/rename.phpt index 82e2850927..b3ebc98364 100644 --- a/ext/phar/tests/zip/rename.phpt +++ b/ext/phar/tests/zip/rename.phpt @@ -31,4 +31,4 @@ echo file_get_contents($alias . '/a') . "\n"; a a -Warning: file_get_contents(phar://%srename.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.zip" in %srename.php on line %d +Warning: file_get_contents(phar://%srename.phar.zip/a): Failed to open stream: phar error: "a" is not a file in phar "%srename.phar.zip" in %srename.php on line %d diff --git a/ext/phar/tests/zip/rename_dir.phpt b/ext/phar/tests/zip/rename_dir.phpt index a65113c3cf..b53ff8d964 100644 --- a/ext/phar/tests/zip/rename_dir.phpt +++ b/ext/phar/tests/zip/rename_dir.phpt @@ -31,4 +31,4 @@ echo file_get_contents($alias . '/a/x') . "\n"; a a -Warning: file_get_contents(phar://%srename_dir.phar.zip/a/x): failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.zip" in %srename_dir.php on line %d +Warning: file_get_contents(phar://%srename_dir.phar.zip/a/x): Failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.zip" in %srename_dir.php on line %d diff --git a/ext/posix/posix.c b/ext/posix/posix.c index 1be14a616a..2d1337eee8 100644 --- a/ext/posix/posix.c +++ b/ext/posix/posix.c @@ -606,7 +606,7 @@ static int php_posix_stream_get_fd(zval *zfp, int *fd) /* {{{ */ } else if (php_stream_can_cast(stream, PHP_STREAM_AS_FD) == SUCCESS) { php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)fd, 0); } else { - php_error_docref(NULL, E_WARNING, "could not use stream of type '%s'", + php_error_docref(NULL, E_WARNING, "Could not use stream of type '%s'", stream->ops->label); return 0; } @@ -941,7 +941,7 @@ try_again: if (!php_posix_group_to_array(g, return_value)) { zend_array_destroy(Z_ARR_P(return_value)); - php_error_docref(NULL, E_WARNING, "unable to convert posix group to array"); + php_error_docref(NULL, E_WARNING, "Unable to convert posix group to array"); RETVAL_FALSE; } #if defined(ZTS) && defined(HAVE_GETGRNAM_R) && defined(_SC_GETGR_R_SIZE_MAX) @@ -994,7 +994,7 @@ PHP_FUNCTION(posix_getgrgid) if (!php_posix_group_to_array(g, return_value)) { zend_array_destroy(Z_ARR_P(return_value)); - php_error_docref(NULL, E_WARNING, "unable to convert posix group struct to array"); + php_error_docref(NULL, E_WARNING, "Unable to convert posix group struct to array"); RETVAL_FALSE; } #if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX) @@ -1061,7 +1061,7 @@ PHP_FUNCTION(posix_getpwnam) if (!php_posix_passwd_to_array(pw, return_value)) { zend_array_destroy(Z_ARR_P(return_value)); - php_error_docref(NULL, E_WARNING, "unable to convert posix passwd struct to array"); + php_error_docref(NULL, E_WARNING, "Unable to convert posix passwd struct to array"); RETVAL_FALSE; } #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWNAM_R) @@ -1112,7 +1112,7 @@ PHP_FUNCTION(posix_getpwuid) if (!php_posix_passwd_to_array(pw, return_value)) { zend_array_destroy(Z_ARR_P(return_value)); - php_error_docref(NULL, E_WARNING, "unable to convert posix passwd struct to array"); + php_error_docref(NULL, E_WARNING, "Unable to convert posix passwd struct to array"); RETVAL_FALSE; } #if defined(ZTS) && defined(_SC_GETPW_R_SIZE_MAX) && defined(HAVE_GETPWUID_R) diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index d387a64091..5d5dcb1ca3 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -269,9 +269,9 @@ static int ps_files_write(ps_files *data, zend_string *key, zend_string *val) if (n != ZSTR_LEN(val)) { if (n == (size_t)-1) { - php_error_docref(NULL, E_WARNING, "write failed: %s (%d)", strerror(errno), errno); + php_error_docref(NULL, E_WARNING, "Write failed: %s (%d)", strerror(errno), errno); } else { - php_error_docref(NULL, E_WARNING, "write wrote less bytes than requested"); + php_error_docref(NULL, E_WARNING, "Write wrote less bytes than requested"); } return FAILURE; } @@ -521,9 +521,9 @@ PS_READ_FUNC(files) if (n != (zend_long)sbuf.st_size) { if (n == -1) { - php_error_docref(NULL, E_WARNING, "read failed: %s (%d)", strerror(errno), errno); + php_error_docref(NULL, E_WARNING, "Read failed: %s (%d)", strerror(errno), errno); } else { - php_error_docref(NULL, E_WARNING, "read returned less bytes than requested"); + php_error_docref(NULL, E_WARNING, "Read returned less bytes than requested"); } zend_string_release_ex(*val, 0); *val = ZSTR_EMPTY_ALLOC(); diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c index 55ff0fb68a..6698c307e0 100644 --- a/ext/session/mod_mm.c +++ b/ext/session/mod_mm.c @@ -401,7 +401,7 @@ PS_WRITE_FUNC(mm) if (!sd->data) { ps_sd_destroy(data, sd); - php_error_docref(NULL, E_WARNING, "cannot allocate new data segment"); + php_error_docref(NULL, E_WARNING, "Cannot allocate new data segment"); sd = NULL; } } diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c index f6f8d88355..446c309458 100644 --- a/ext/shmop/shmop.c +++ b/ext/shmop/shmop.c @@ -155,7 +155,7 @@ PHP_FUNCTION(shmop_open) */ break; default: - php_error_docref(NULL, E_WARNING, "invalid access mode"); + php_error_docref(NULL, E_WARNING, "Invalid access mode"); goto err; } @@ -166,19 +166,19 @@ PHP_FUNCTION(shmop_open) shmop->shmid = shmget(shmop->key, shmop->size, shmop->shmflg); if (shmop->shmid == -1) { - php_error_docref(NULL, E_WARNING, "unable to attach or create shared memory segment '%s'", strerror(errno)); + php_error_docref(NULL, E_WARNING, "Unable to attach or create shared memory segment '%s'", strerror(errno)); goto err; } if (shmctl(shmop->shmid, IPC_STAT, &shm)) { /* please do not add coverage here: the segment would be leaked and impossible to delete via php */ - php_error_docref(NULL, E_WARNING, "unable to get shared memory segment information '%s'", strerror(errno)); + php_error_docref(NULL, E_WARNING, "Unable to get shared memory segment information '%s'", strerror(errno)); goto err; } shmop->addr = shmat(shmop->shmid, 0, shmop->shmatflg); if (shmop->addr == (char*) -1) { - php_error_docref(NULL, E_WARNING, "unable to attach to shared memory segment '%s'", strerror(errno)); + php_error_docref(NULL, E_WARNING, "Unable to attach to shared memory segment '%s'", strerror(errno)); goto err; } @@ -211,12 +211,12 @@ PHP_FUNCTION(shmop_read) } if (start < 0 || start > shmop->size) { - php_error_docref(NULL, E_WARNING, "start is out of range"); + php_error_docref(NULL, E_WARNING, "Start is out of range"); RETURN_FALSE; } if (count < 0 || start > (INT_MAX - count) || start + count > shmop->size) { - php_error_docref(NULL, E_WARNING, "count is out of range"); + php_error_docref(NULL, E_WARNING, "Count is out of range"); RETURN_FALSE; } @@ -287,12 +287,12 @@ PHP_FUNCTION(shmop_write) } if ((shmop->shmatflg & SHM_RDONLY) == SHM_RDONLY) { - php_error_docref(NULL, E_WARNING, "trying to write to a read only segment"); + php_error_docref(NULL, E_WARNING, "Trying to write to a read only segment"); RETURN_FALSE; } if (offset < 0 || offset > shmop->size) { - php_error_docref(NULL, E_WARNING, "offset out of range"); + php_error_docref(NULL, E_WARNING, "Offset out of range"); RETURN_FALSE; } @@ -319,7 +319,7 @@ PHP_FUNCTION(shmop_delete) } if (shmctl(shmop->shmid, IPC_RMID, NULL)) { - php_error_docref(NULL, E_WARNING, "can't mark segment for deletion (are you the owner?)"); + php_error_docref(NULL, E_WARNING, "Can't mark segment for deletion (are you the owner?)"); RETURN_FALSE; } diff --git a/ext/shmop/tests/001.phpt b/ext/shmop/tests/001.phpt index a5ad01c302..471f82cbda 100644 --- a/ext/shmop/tests/001.phpt +++ b/ext/shmop/tests/001.phpt @@ -84,7 +84,7 @@ data in memory is: test #1 of the shmop() extension shm open for read only: ok data in memory is: test #1 of the shmop() extension -Warning: shmop_write(): trying to write to a read only segment in %s on line %d +Warning: shmop_write(): Trying to write to a read only segment in %s on line %d shm open for read only: ok shm write test #1: ok data in memory is: test #1 of the shmop() extensiontest #2 append data to shared memory segment diff --git a/ext/shmop/tests/002.phpt b/ext/shmop/tests/002.phpt index a06f454445..12b1b6b95f 100644 --- a/ext/shmop/tests/002.phpt +++ b/ext/shmop/tests/002.phpt @@ -52,22 +52,22 @@ echo PHP_EOL, '## shmop_write function tests ##'; Warning: shmop_open(): is not a valid flag in %s on line %d bool(false) -Warning: shmop_open(): invalid access mode in %s on line %d +Warning: shmop_open(): Invalid access mode in %s on line %d bool(false) -Warning: shmop_open(): unable to attach or create shared memory segment 'Invalid argument' in %s on line %d +Warning: shmop_open(): Unable to attach or create shared memory segment 'Invalid argument' in %s on line %d bool(false) Warning: shmop_open(): Shared memory segment size must be greater than zero in %s on line %d bool(false) ## shmop_read function tests ## -Warning: shmop_read(): start is out of range in %s on line %d +Warning: shmop_read(): Start is out of range in %s on line %d bool(false) -Warning: shmop_read(): count is out of range in %s on line %d +Warning: shmop_read(): Count is out of range in %s on line %d bool(false) ## shmop_write function tests ## -Warning: shmop_write(): offset out of range in %s on line %d +Warning: shmop_write(): Offset out of range in %s on line %d bool(false) diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c index 0cf1061acf..95117686f8 100644 --- a/ext/snmp/snmp.c +++ b/ext/snmp/snmp.c @@ -879,7 +879,7 @@ static int netsnmp_session_init(php_snmp_session **session_p, int version, char } *pptr = '\0'; } else { - php_error_docref(NULL, E_WARNING, "malformed IPv6 address, closing square bracket missing"); + php_error_docref(NULL, E_WARNING, "Malformed IPv6 address, closing square bracket missing"); return (-1); } } else { /* IPv4 address */ diff --git a/ext/snmp/tests/ipv6.phpt b/ext/snmp/tests/ipv6.phpt index 37d15542e7..38bf7ffcb6 100644 --- a/ext/snmp/tests/ipv6.phpt +++ b/ext/snmp/tests/ipv6.phpt @@ -25,5 +25,5 @@ var_dump(snmpget('[dead:beef::', $community, '.1.3.6.1.2.1.1.1.0')); --EXPECTF-- string(%d) "%s" -Warning: snmpget(): malformed IPv6 address, closing square bracket missing in %s on line %d +Warning: snmpget(): Malformed IPv6 address, closing square bracket missing in %s on line %d bool(false) diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c index 4ed32d2518..9c2ede219d 100644 --- a/ext/sockets/multicast.c +++ b/ext/sockets/multicast.c @@ -67,7 +67,7 @@ int php_string_to_if_index(const char *val, unsigned *out) ind = if_nametoindex(val); if (ind == 0) { php_error_docref(NULL, E_WARNING, - "no interface with name \"%s\" could be found", val); + "No interface with name \"%s\" could be found", val); return FAILURE; } else { *out = ind; @@ -75,7 +75,7 @@ int php_string_to_if_index(const char *val, unsigned *out) } #else php_error_docref(NULL, E_WARNING, - "this platform does not support looking up an interface by " + "This platform does not support looking up an interface by " "name, an integer interface index must be supplied instead"); return FAILURE; #endif @@ -88,7 +88,7 @@ static int php_get_if_index_from_zval(zval *val, unsigned *out) if (Z_TYPE_P(val) == IS_LONG) { if (Z_LVAL_P(val) < 0 || (zend_ulong)Z_LVAL_P(val) > UINT_MAX) { php_error_docref(NULL, E_WARNING, - "the interface index cannot be negative or larger than %u;" + "The interface index cannot be negative or larger than %u;" " given " ZEND_LONG_FMT, UINT_MAX, Z_LVAL_P(val)); ret = FAILURE; } else { @@ -127,7 +127,7 @@ static int php_get_address_from_array(const HashTable *ht, const char *key, zend_string *str, *tmp_str; if ((val = zend_hash_str_find(ht, key, strlen(key))) == NULL) { - php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", key); + php_error_docref(NULL, E_WARNING, "No key \"%s\" passed in optval", key); return FAILURE; } str = zval_get_tmp_string(val, &tmp_str); @@ -221,7 +221,7 @@ mcast_req_fun: #endif default: php_error_docref(NULL, E_WARNING, - "unexpected option in php_do_mcast_opt (level %d, option %d). " + "Unexpected option in php_do_mcast_opt (level %d, option %d). " "This is a bug.", level, optname); return FAILURE; } diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c index e3c302f5c4..7786f70721 100644 --- a/ext/sockets/sendrecvmsg.c +++ b/ext/sockets/sendrecvmsg.c @@ -265,7 +265,7 @@ PHP_FUNCTION(socket_recvmsg) } } else { SOCKETS_G(last_error) = errno; - php_error_docref(NULL, E_WARNING, "error in recvmsg [%d]: %s", + php_error_docref(NULL, E_WARNING, "Error in recvmsg [%d]: %s", errno, sockets_strerror(errno)); RETURN_FALSE; } diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 322355c3c1..ea76fa9100 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -789,7 +789,7 @@ PHP_FUNCTION(socket_select) } if (!sets) { - php_error_docref(NULL, E_WARNING, "no resource arrays were passed to select"); + php_error_docref(NULL, E_WARNING, "No resource arrays were passed to select"); RETURN_FALSE; } @@ -813,7 +813,7 @@ PHP_FUNCTION(socket_select) if (retval == -1) { SOCKETS_G(last_error) = errno; - php_error_docref(NULL, E_WARNING, "unable to select [%d]: %s", errno, sockets_strerror(errno)); + php_error_docref(NULL, E_WARNING, "Unable to select [%d]: %s", errno, sockets_strerror(errno)); RETURN_FALSE; } @@ -1275,12 +1275,12 @@ PHP_FUNCTION(socket_create) && arg1 != AF_INET6 #endif && arg1 != AF_INET) { - php_error_docref(NULL, E_WARNING, "invalid socket domain [" ZEND_LONG_FMT "] specified for argument 1, assuming AF_INET", arg1); + php_error_docref(NULL, E_WARNING, "Invalid socket domain [" ZEND_LONG_FMT "] specified for argument 1, assuming AF_INET", arg1); arg1 = AF_INET; } if (arg2 > 10) { - php_error_docref(NULL, E_WARNING, "invalid socket type [" ZEND_LONG_FMT "] specified for argument 2, assuming SOCK_STREAM", arg2); + php_error_docref(NULL, E_WARNING, "Invalid socket type [" ZEND_LONG_FMT "] specified for argument 2, assuming SOCK_STREAM", arg2); arg2 = SOCK_STREAM; } @@ -1478,7 +1478,7 @@ PHP_FUNCTION(socket_bind) } #endif default: - php_error_docref(NULL, E_WARNING, "unsupported socket type '%d', must be AF_UNIX, AF_INET, or AF_INET6", php_sock->type); + php_error_docref(NULL, E_WARNING, "Unsupported socket type '%d', must be AF_UNIX, AF_INET, or AF_INET6", php_sock->type); RETURN_FALSE; } @@ -1942,11 +1942,11 @@ PHP_FUNCTION(socket_set_option) opt_ht = Z_ARRVAL_P(arg4); if ((l_onoff = zend_hash_str_find(opt_ht, l_onoff_key, sizeof(l_onoff_key) - 1)) == NULL) { - php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", l_onoff_key); + php_error_docref(NULL, E_WARNING, "No key \"%s\" passed in optval", l_onoff_key); RETURN_FALSE; } if ((l_linger = zend_hash_str_find(opt_ht, l_linger_key, sizeof(l_linger_key) - 1)) == NULL) { - php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", l_linger_key); + php_error_docref(NULL, E_WARNING, "No key \"%s\" passed in optval", l_linger_key); RETURN_FALSE; } @@ -1970,11 +1970,11 @@ PHP_FUNCTION(socket_set_option) opt_ht = Z_ARRVAL_P(arg4); if ((sec = zend_hash_str_find(opt_ht, sec_key, sizeof(sec_key) - 1)) == NULL) { - php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", sec_key); + php_error_docref(NULL, E_WARNING, "No key \"%s\" passed in optval", sec_key); RETURN_FALSE; } if ((usec = zend_hash_str_find(opt_ht, usec_key, sizeof(usec_key) - 1)) == NULL) { - php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", usec_key); + php_error_docref(NULL, E_WARNING, "No key \"%s\" passed in optval", usec_key); RETURN_FALSE; } @@ -2047,18 +2047,18 @@ PHP_FUNCTION(socket_create_pair) && domain != AF_INET6 #endif && domain != AF_UNIX) { - php_error_docref(NULL, E_WARNING, "invalid socket domain [" ZEND_LONG_FMT "] specified for argument 1, assuming AF_INET", domain); + php_error_docref(NULL, E_WARNING, "Invalid socket domain [" ZEND_LONG_FMT "] specified for argument 1, assuming AF_INET", domain); domain = AF_INET; } if (type > 10) { - php_error_docref(NULL, E_WARNING, "invalid socket type [" ZEND_LONG_FMT "] specified for argument 2, assuming SOCK_STREAM", type); + php_error_docref(NULL, E_WARNING, "Invalid socket type [" ZEND_LONG_FMT "] specified for argument 2, assuming SOCK_STREAM", type); type = SOCK_STREAM; } if (socketpair(domain, type, protocol, fds_array) != 0) { SOCKETS_G(last_error) = errno; - php_error_docref(NULL, E_WARNING, "unable to create socket pair [%d]: %s", errno, sockets_strerror(errno)); + php_error_docref(NULL, E_WARNING, "Unable to create socket pair [%d]: %s", errno, sockets_strerror(errno)); efree(php_sock[0]); efree(php_sock[1]); RETURN_FALSE; @@ -2337,7 +2337,7 @@ PHP_FUNCTION(socket_export_stream) stream = php_stream_sock_open_from_socket(socket->bsd_socket, 0); if (stream == NULL) { - php_error_docref(NULL, E_WARNING, "failed to create stream"); + php_error_docref(NULL, E_WARNING, "Failed to create stream"); RETURN_FALSE; } } @@ -2464,14 +2464,14 @@ PHP_FUNCTION(socket_addrinfo_bind) break; } default: - php_error_docref(NULL, E_WARNING, "unsupported socket type '%d', must be AF_UNIX, AF_INET, or AF_INET6", php_sock->type); + php_error_docref(NULL, E_WARNING, "Unsupported socket type '%d', must be AF_UNIX, AF_INET, or AF_INET6", php_sock->type); close(php_sock->bsd_socket); efree(php_sock); RETURN_FALSE; } if (retval != 0) { - PHP_SOCKET_ERROR(php_sock, "unable to bind address", errno); + PHP_SOCKET_ERROR(php_sock, "Unable to bind address", errno); close(php_sock->bsd_socket); efree(php_sock); RETURN_FALSE; @@ -2530,14 +2530,14 @@ PHP_FUNCTION(socket_addrinfo_connect) break; } default: - php_error_docref(NULL, E_WARNING, "unsupported socket type '%d', must be AF_UNIX, AF_INET, or AF_INET6", php_sock->type); + php_error_docref(NULL, E_WARNING, "Unsupported socket type '%d', must be AF_UNIX, AF_INET, or AF_INET6", php_sock->type); close(php_sock->bsd_socket); efree(php_sock); RETURN_FALSE; } if (retval != 0) { - PHP_SOCKET_ERROR(php_sock, "unable to connect address", errno); + PHP_SOCKET_ERROR(php_sock, "Unable to connect address", errno); close(php_sock->bsd_socket); efree(php_sock); RETURN_FALSE; diff --git a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt index 5cf054458a..9216a87046 100644 --- a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt +++ b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt @@ -19,10 +19,10 @@ var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets)); --EXPECTF-- bool(true) -Warning: socket_create_pair(): invalid socket domain [31337] specified for argument 1, assuming AF_INET in %s on line %d +Warning: socket_create_pair(): Invalid socket domain [31337] specified for argument 1, assuming AF_INET in %s on line %d bool(true) -Warning: socket_create_pair(): invalid socket type [31337] specified for argument 2, assuming SOCK_STREAM in %s on line %d +Warning: socket_create_pair(): Invalid socket type [31337] specified for argument 2, assuming SOCK_STREAM in %s on line %d bool(true) --CREDITS-- Till Klampaeckel, till@php.net diff --git a/ext/sockets/tests/socket_create_pair-wrongparams.phpt b/ext/sockets/tests/socket_create_pair-wrongparams.phpt index 41154620ad..a7bc17b86b 100644 --- a/ext/sockets/tests/socket_create_pair-wrongparams.phpt +++ b/ext/sockets/tests/socket_create_pair-wrongparams.phpt @@ -19,17 +19,17 @@ var_dump(socket_create_pair(AF_INET, 31337, 0, $sockets)); ?> --EXPECTF-- -Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d +Warning: socket_create_pair(): Unable to create socket pair [%d]: %s not supported in %s on line %d bool(false) -Warning: socket_create_pair(): invalid socket domain [31337] specified for argument 1, assuming AF_INET in %s on line %d +Warning: socket_create_pair(): Invalid socket domain [31337] specified for argument 1, assuming AF_INET in %s on line %d -Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported in %s on line %d +Warning: socket_create_pair(): Unable to create socket pair [%d]: %s not supported in %s on line %d bool(false) -Warning: socket_create_pair(): invalid socket type [31337] specified for argument 2, assuming SOCK_STREAM in %s on line %d +Warning: socket_create_pair(): Invalid socket type [31337] specified for argument 2, assuming SOCK_STREAM in %s on line %d -Warning: socket_create_pair(): unable to create socket pair [%d]: %s not supported %s on line %d +Warning: socket_create_pair(): Unable to create socket pair [%d]: %s not supported %s on line %d bool(false) --CREDITS-- Till Klampaeckel, till@php.net diff --git a/ext/sockets/tests/socket_import_stream-2.phpt b/ext/sockets/tests/socket_import_stream-2.phpt index dfa291c283..16c25f2307 100644 --- a/ext/sockets/tests/socket_import_stream-2.phpt +++ b/ext/sockets/tests/socket_import_stream-2.phpt @@ -26,7 +26,7 @@ try { echo "Done."; ?> --EXPECTF-- -Warning: socket_import_stream(): cannot represent a stream of type STDIO as a Socket Descriptor in %s on line %d +Warning: socket_import_stream(): Cannot represent a stream of type STDIO as a Socket Descriptor in %s on line %d bool(false) socket_import_stream(): supplied resource is not a valid stream resource resource(%d) of type (stream) diff --git a/ext/sockets/tests/socket_select-wrongparams-1.phpt b/ext/sockets/tests/socket_select-wrongparams-1.phpt index 848088fe45..2658063e36 100644 --- a/ext/sockets/tests/socket_select-wrongparams-1.phpt +++ b/ext/sockets/tests/socket_select-wrongparams-1.phpt @@ -19,7 +19,7 @@ $except = null; $time = -1; var_dump(socket_select($sockets, $write, $except, $time)); --EXPECTF-- -Warning: socket_select(): unable to select [%d]: Invalid argument in %s on line %d +Warning: socket_select(): Unable to select [%d]: Invalid argument in %s on line %d bool(false) --CREDITS-- Till Klampaeckel, till@php.net diff --git a/ext/sockets/tests/socket_select-wrongparams-2.phpt b/ext/sockets/tests/socket_select-wrongparams-2.phpt index a7c423df1b..d45bc4c44a 100644 --- a/ext/sockets/tests/socket_select-wrongparams-2.phpt +++ b/ext/sockets/tests/socket_select-wrongparams-2.phpt @@ -13,7 +13,7 @@ $except = null; $time = 0; var_dump(socket_select($sockets, $write, $except, $time)); --EXPECTF-- -Warning: socket_select(): no resource arrays were passed to select in %s on line %d +Warning: socket_select(): No resource arrays were passed to select in %s on line %d bool(false) --CREDITS-- Till Klampaeckel, till@php.net diff --git a/ext/sockets/tests/socket_set_option_rcvtimeo.phpt b/ext/sockets/tests/socket_set_option_rcvtimeo.phpt index a27d4075db..07238aa9e4 100644 --- a/ext/sockets/tests/socket_set_option_rcvtimeo.phpt +++ b/ext/sockets/tests/socket_set_option_rcvtimeo.phpt @@ -30,7 +30,7 @@ var_dump($retval_3 === $options); socket_close($socket); ?> --EXPECTF-- -Warning: socket_set_option(): no key "sec" passed in optval in %s on line %d +Warning: socket_set_option(): No key "sec" passed in optval in %s on line %d bool(true) bool(true) --CREDITS-- diff --git a/ext/sockets/tests/socket_set_option_seolinger.phpt b/ext/sockets/tests/socket_set_option_seolinger.phpt index 4d171fc70a..d284a37f63 100644 --- a/ext/sockets/tests/socket_set_option_seolinger.phpt +++ b/ext/sockets/tests/socket_set_option_seolinger.phpt @@ -37,9 +37,9 @@ var_dump((bool)$retval_3["l_onoff"] === (bool)$options["l_onoff"]); socket_close($socket); ?> --EXPECTF-- -Warning: socket_set_option(): no key "l_onoff" passed in optval in %s on line %d +Warning: socket_set_option(): No key "l_onoff" passed in optval in %s on line %d -Warning: socket_set_option(): no key "l_linger" passed in optval in %s on line %d +Warning: socket_set_option(): No key "l_linger" passed in optval in %s on line %d bool(false) bool(true) bool(true) diff --git a/ext/sockets/tests/socket_set_option_sndtimeo.phpt b/ext/sockets/tests/socket_set_option_sndtimeo.phpt index 1b4fb5570d..9c79fd8270 100644 --- a/ext/sockets/tests/socket_set_option_sndtimeo.phpt +++ b/ext/sockets/tests/socket_set_option_sndtimeo.phpt @@ -30,7 +30,7 @@ var_dump($retval_3 === $options); socket_close($socket); ?> --EXPECTF-- -Warning: socket_set_option(): no key "sec" passed in optval in %s on line %d +Warning: socket_set_option(): No key "sec" passed in optval in %s on line %d bool(true) bool(true) --CREDITS-- diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 5c42801a75..3fd3604072 100644 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -93,7 +93,7 @@ PHP_FUNCTION(class_parents) } if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) { - zend_type_error("object or string expected"); + zend_type_error("Object or string expected"); RETURN_THROWS(); } @@ -126,7 +126,7 @@ PHP_FUNCTION(class_implements) RETURN_THROWS(); } if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) { - zend_type_error("object or string expected"); + zend_type_error("Object or string expected"); RETURN_THROWS(); } @@ -155,7 +155,7 @@ PHP_FUNCTION(class_uses) RETURN_THROWS(); } if (Z_TYPE_P(obj) != IS_OBJECT && Z_TYPE_P(obj) != IS_STRING) { - zend_type_error("object or string expected"); + zend_type_error("Object or string expected"); RETURN_THROWS(); } diff --git a/ext/spl/tests/class_implements_variation1.phpt b/ext/spl/tests/class_implements_variation1.phpt index 241546694e..26368ca709 100644 --- a/ext/spl/tests/class_implements_variation1.phpt +++ b/ext/spl/tests/class_implements_variation1.phpt @@ -119,61 +119,61 @@ fclose($res); *** Testing class_implements() : variation *** --int 0-- -object or string expected +Object or string expected --int 1-- -object or string expected +Object or string expected --int 12345-- -object or string expected +Object or string expected --int -12345-- -object or string expected +Object or string expected --float 10.5-- -object or string expected +Object or string expected --float -10.5-- -object or string expected +Object or string expected --float 12.3456789000e10-- -object or string expected +Object or string expected --float -12.3456789000e10-- -object or string expected +Object or string expected --float .5-- -object or string expected +Object or string expected --empty array-- -object or string expected +Object or string expected --int indexed array-- -object or string expected +Object or string expected --associative array-- -object or string expected +Object or string expected --nested arrays-- -object or string expected +Object or string expected --uppercase NULL-- -object or string expected +Object or string expected --lowercase null-- -object or string expected +Object or string expected --lowercase true-- -object or string expected +Object or string expected --lowercase false-- -object or string expected +Object or string expected --uppercase TRUE-- -object or string expected +Object or string expected --uppercase FALSE-- -object or string expected +Object or string expected --empty string DQ-- Error: 2 - class_implements(): Class does not exist and could not be loaded, %s(%d) @@ -192,10 +192,10 @@ array(0) { } --undefined var-- -object or string expected +Object or string expected --unset var-- -object or string expected +Object or string expected --resource-- -object or string expected +Object or string expected diff --git a/ext/spl/tests/class_uses_variation1.phpt b/ext/spl/tests/class_uses_variation1.phpt index cb2f30e953..5962e904c4 100644 --- a/ext/spl/tests/class_uses_variation1.phpt +++ b/ext/spl/tests/class_uses_variation1.phpt @@ -119,61 +119,61 @@ fclose($res); *** Testing class_uses() : variation *** --int 0-- -object or string expected +Object or string expected --int 1-- -object or string expected +Object or string expected --int 12345-- -object or string expected +Object or string expected --int -12345-- -object or string expected +Object or string expected --float 10.5-- -object or string expected +Object or string expected --float -10.5-- -object or string expected +Object or string expected --float 12.3456789000e10-- -object or string expected +Object or string expected --float -12.3456789000e10-- -object or string expected +Object or string expected --float .5-- -object or string expected +Object or string expected --empty array-- -object or string expected +Object or string expected --int indexed array-- -object or string expected +Object or string expected --associative array-- -object or string expected +Object or string expected --nested arrays-- -object or string expected +Object or string expected --uppercase NULL-- -object or string expected +Object or string expected --lowercase null-- -object or string expected +Object or string expected --lowercase true-- -object or string expected +Object or string expected --lowercase false-- -object or string expected +Object or string expected --uppercase TRUE-- -object or string expected +Object or string expected --uppercase FALSE-- -object or string expected +Object or string expected --empty string DQ-- Error: 2 - class_uses(): Class does not exist and could not be loaded, %s(%d) @@ -192,10 +192,10 @@ array(0) { } --undefined var-- -object or string expected +Object or string expected --unset var-- -object or string expected +Object or string expected --resource-- -object or string expected +Object or string expected diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 3ceee03231..812758433d 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -1299,7 +1299,7 @@ PHP_METHOD(sqlite3, openBlob) } if (ZEND_NUM_ARGS() >= 4 && CHECK_NULL_PATH(dbname, dbname_len)) { - zend_value_error("dbname must not contain NUL bytes"); + zend_value_error("dbname must not contain null bytes"); RETURN_THROWS(); } @@ -1408,7 +1408,7 @@ PHP_METHOD(sqlite3, backup) if ((ZEND_NUM_ARGS() >= 2 && CHECK_NULL_PATH(source_dbname, source_dbname_length)) || (ZEND_NUM_ARGS() >= 3 && CHECK_NULL_PATH(destination_dbname, destination_dbname_length)) ) { - zend_value_error("dbname must not contain NUL bytes"); + zend_value_error("dbname must not contain null bytes"); RETURN_THROWS(); } diff --git a/ext/standard/array.c b/ext/standard/array.c index 37b7d3cadb..e8f06cf99d 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -728,7 +728,7 @@ PHPAPI zend_long php_count_recursive(HashTable *ht) /* {{{ */ if (!(GC_FLAGS(ht) & GC_IMMUTABLE)) { if (GC_IS_RECURSIVE(ht)) { - php_error_docref(NULL, E_WARNING, "recursion detected"); + php_error_docref(NULL, E_WARNING, "Recursion detected"); return 0; } GC_PROTECT_RECURSION(ht); diff --git a/ext/standard/dns.c b/ext/standard/dns.c index 7a7d11039d..c566f4e6ae 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -127,7 +127,7 @@ PHP_FUNCTION(gethostname) ZEND_PARSE_PARAMETERS_NONE(); if (gethostname(buf, sizeof(buf))) { - php_error_docref(NULL, E_WARNING, "unable to fetch host [%d]: %s", errno, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Unable to fetch host [%d]: %s", errno, strerror(errno)); RETURN_FALSE; } diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c index 6f521ed60c..ab10bc06e9 100644 --- a/ext/standard/filestat.c +++ b/ext/standard/filestat.c @@ -489,7 +489,7 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */ option = PHP_STREAM_META_OWNER_NAME; value = Z_STRVAL_P(user); } else { - php_error_docref(NULL, E_WARNING, "parameter 2 should be string or int, %s given", zend_zval_type_name(user)); + php_error_docref(NULL, E_WARNING, "Parameter 2 should be string or int, %s given", zend_zval_type_name(user)); RETURN_FALSE; } if(wrapper->wops->stream_metadata(wrapper, filename, option, value, NULL)) { @@ -519,7 +519,7 @@ static void php_do_chown(INTERNAL_FUNCTION_PARAMETERS, int do_lchown) /* {{{ */ RETURN_FALSE; } } else { - php_error_docref(NULL, E_WARNING, "parameter 2 should be string or int, %s given", zend_zval_type_name(user)); + php_error_docref(NULL, E_WARNING, "Parameter 2 should be string or int, %s given", zend_zval_type_name(user)); RETURN_FALSE; } diff --git a/ext/standard/filters.c b/ext/standard/filters.c index 0bb83da141..5f7b6af005 100644 --- a/ext/standard/filters.c +++ b/ext/standard/filters.c @@ -1369,14 +1369,14 @@ static int strfilter_convert_append_bucket( switch (err) { case PHP_CONV_ERR_INVALID_SEQ: - php_error_docref(NULL, E_WARNING, "stream filter (%s): invalid byte sequence", inst->filtername); + php_error_docref(NULL, E_WARNING, "Stream filter (%s): invalid byte sequence", inst->filtername); goto out_failure; case PHP_CONV_ERR_MORE: if (ps != NULL) { if (icnt > 0) { if (inst->stub_len >= sizeof(inst->stub)) { - php_error_docref(NULL, E_WARNING, "stream filter (%s): insufficient buffer", inst->filtername); + php_error_docref(NULL, E_WARNING, "Stream filter (%s): insufficient buffer", inst->filtername); goto out_failure; } inst->stub[inst->stub_len++] = *(ps++); @@ -1391,7 +1391,7 @@ static int strfilter_convert_append_bucket( break; case PHP_CONV_ERR_UNEXPECTED_EOS: - php_error_docref(NULL, E_WARNING, "stream filter (%s): unexpected end of stream", inst->filtername); + php_error_docref(NULL, E_WARNING, "Stream filter (%s): unexpected end of stream", inst->filtername); goto out_failure; case PHP_CONV_ERR_TOO_BIG: { @@ -1421,7 +1421,7 @@ static int strfilter_convert_append_bucket( } break; case PHP_CONV_ERR_UNKNOWN: - php_error_docref(NULL, E_WARNING, "stream filter (%s): unknown error", inst->filtername); + php_error_docref(NULL, E_WARNING, "Stream filter (%s): unknown error", inst->filtername); goto out_failure; default: @@ -1437,13 +1437,13 @@ static int strfilter_convert_append_bucket( php_conv_convert(inst->cd, &ps, &icnt, &pd, &ocnt))); switch (err) { case PHP_CONV_ERR_INVALID_SEQ: - php_error_docref(NULL, E_WARNING, "stream filter (%s): invalid byte sequence", inst->filtername); + php_error_docref(NULL, E_WARNING, "Stream filter (%s): invalid byte sequence", inst->filtername); goto out_failure; case PHP_CONV_ERR_MORE: if (ps != NULL) { if (icnt > sizeof(inst->stub)) { - php_error_docref(NULL, E_WARNING, "stream filter (%s): insufficient buffer", inst->filtername); + php_error_docref(NULL, E_WARNING, "Stream filter (%s): insufficient buffer", inst->filtername); goto out_failure; } memcpy(inst->stub, ps, icnt); @@ -1451,7 +1451,7 @@ static int strfilter_convert_append_bucket( ps += icnt; icnt = 0; } else { - php_error_docref(NULL, E_WARNING, "stream filter (%s): unexpected octet values", inst->filtername); + php_error_docref(NULL, E_WARNING, "Stream filter (%s): unexpected octet values", inst->filtername); goto out_failure; } break; @@ -1483,7 +1483,7 @@ static int strfilter_convert_append_bucket( } break; case PHP_CONV_ERR_UNKNOWN: - php_error_docref(NULL, E_WARNING, "stream filter (%s): unknown error", inst->filtername); + php_error_docref(NULL, E_WARNING, "Stream filter (%s): unknown error", inst->filtername); goto out_failure; default: @@ -1583,7 +1583,7 @@ static php_stream_filter *strfilter_convert_create(const char *filtername, zval int conv_mode = 0; if (filterparams != NULL && Z_TYPE_P(filterparams) != IS_ARRAY) { - php_error_docref(NULL, E_WARNING, "stream filter (%s): invalid filter parameter", filtername); + php_error_docref(NULL, E_WARNING, "Stream filter (%s): invalid filter parameter", filtername); return NULL; } diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c index 6ba41f23d5..c0803fbbbb 100644 --- a/ext/standard/fsock.c +++ b/ext/standard/fsock.c @@ -84,7 +84,7 @@ static void php_fsockopen_stream(INTERNAL_FUNCTION_PARAMETERS, int persistent) efree(hostname); } if (stream == NULL) { - php_error_docref(NULL, E_WARNING, "unable to connect to %s:" ZEND_LONG_FMT " (%s)", host, port, errstr == NULL ? "Unknown error" : ZSTR_VAL(errstr)); + php_error_docref(NULL, E_WARNING, "Unable to connect to %s:" ZEND_LONG_FMT " (%s)", host, port, errstr == NULL ? "Unknown error" : ZSTR_VAL(errstr)); } if (hashkey) { diff --git a/ext/standard/image.c b/ext/standard/image.c index d543e4d594..f4d93d3f77 100644 --- a/ext/standard/image.c +++ b/ext/standard/image.c @@ -398,7 +398,7 @@ static unsigned int php_next_marker(php_stream * stream, int last_marker, int ff extraneous++; } if (extraneous) { - php_error_docref(NULL, E_WARNING, "corrupt JPEG data: %zu extraneous bytes before marker", extraneous); + php_error_docref(NULL, E_WARNING, "Corrupt JPEG data: %zu extraneous bytes before marker", extraneous); } } a = 1; diff --git a/ext/standard/mail.c b/ext/standard/mail.c index 4bac24a99b..d08325c3fa 100644 --- a/ext/standard/mail.c +++ b/ext/standard/mail.c @@ -128,7 +128,7 @@ static void php_mail_build_headers_elem(smart_str *s, zend_string *key, zval *va php_mail_build_headers_elems(s, key, val); break; default: - php_error_docref(NULL, E_WARNING, "headers array elements must be string or array (%s)", ZSTR_VAL(key)); + php_error_docref(NULL, E_WARNING, "Headers array elements must be string or array (%s)", ZSTR_VAL(key)); } } diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c index 98f0cc0adc..f6dc9a0584 100644 --- a/ext/standard/proc_open.c +++ b/ext/standard/proc_open.c @@ -641,13 +641,13 @@ PHP_FUNCTION(proc_open) #ifdef PHP_WIN32 descriptors[ndesc].childend = dup_fd_as_handle((int)fd); if (descriptors[ndesc].childend == NULL) { - php_error_docref(NULL, E_WARNING, "unable to dup File-Handle for descriptor %d", nindex); + php_error_docref(NULL, E_WARNING, "Unable to dup File-Handle for descriptor %d", nindex); goto exit_fail; } #else descriptors[ndesc].childend = dup(fd); if (descriptors[ndesc].childend < 0) { - php_error_docref(NULL, E_WARNING, "unable to dup File-Handle for descriptor " ZEND_ULONG_FMT " - %s", nindex, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Unable to dup File-Handle for descriptor " ZEND_ULONG_FMT " - %s", nindex, strerror(errno)); goto exit_fail; } #endif @@ -683,7 +683,7 @@ PHP_FUNCTION(proc_open) descriptors[ndesc].mode = DESC_PIPE; if (0 != pipe(newpipe)) { - php_error_docref(NULL, E_WARNING, "unable to create pipe %s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "Unable to create pipe %s", strerror(errno)); goto exit_fail; } @@ -837,7 +837,7 @@ PHP_FUNCTION(proc_open) /* open things up */ dev_ptmx = open("/dev/ptmx", O_RDWR); if (dev_ptmx == -1) { - php_error_docref(NULL, E_WARNING, "failed to open /dev/ptmx, errno %d", errno); + php_error_docref(NULL, E_WARNING, "Failed to open /dev/ptmx, errno %d", errno); goto exit_fail; } grantpt(dev_ptmx); @@ -845,7 +845,7 @@ PHP_FUNCTION(proc_open) slave_pty = open(ptsname(dev_ptmx), O_RDWR); if (slave_pty == -1) { - php_error_docref(NULL, E_WARNING, "failed to open slave pty, errno %d", errno); + php_error_docref(NULL, E_WARNING, "Failed to open slave pty, errno %d", errno); goto exit_fail; } } @@ -854,7 +854,7 @@ PHP_FUNCTION(proc_open) descriptors[ndesc].parentend = dup(dev_ptmx); descriptors[ndesc].mode_flags = O_RDWR; #else - php_error_docref(NULL, E_WARNING, "pty pseudo terminal not supported on this system"); + php_error_docref(NULL, E_WARNING, "PTY pseudo terminal not supported on this system"); goto exit_fail; #endif } else { @@ -1062,7 +1062,7 @@ PHP_FUNCTION(proc_open) close(descriptors[i].parentend); } - php_error_docref(NULL, E_WARNING, "fork failed - %s", strerror(errno)); + php_error_docref(NULL, E_WARNING, "Fork failed - %s", strerror(errno)); goto exit_fail; diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 88875c051f..aca0d72928 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -63,7 +63,7 @@ PHP_FUNCTION(stream_socket_pair) if (0 != socketpair((int)domain, (int)type, (int)protocol, pair)) { char errbuf[256]; - php_error_docref(NULL, E_WARNING, "failed to create sockets: [%d]: %s", + php_error_docref(NULL, E_WARNING, "Failed to create sockets: [%d]: %s", php_socket_errno(), php_socket_strerror(php_socket_errno(), errbuf, sizeof(errbuf))); RETURN_FALSE; } @@ -144,7 +144,7 @@ PHP_FUNCTION(stream_socket_client) /* host might contain binary characters */ zend_string *quoted_host = php_addslashes(host); - php_error_docref(NULL, E_WARNING, "unable to connect to %s (%s)", ZSTR_VAL(quoted_host), errstr == NULL ? "Unknown error" : ZSTR_VAL(errstr)); + php_error_docref(NULL, E_WARNING, "Unable to connect to %s (%s)", ZSTR_VAL(quoted_host), errstr == NULL ? "Unknown error" : ZSTR_VAL(errstr)); zend_string_release_ex(quoted_host, 0); } @@ -215,7 +215,7 @@ PHP_FUNCTION(stream_socket_server) NULL, NULL, context, &errstr, &err); if (stream == NULL) { - php_error_docref(NULL, E_WARNING, "unable to connect to %s (%s)", host, errstr == NULL ? "Unknown error" : ZSTR_VAL(errstr)); + php_error_docref(NULL, E_WARNING, "Unable to connect to %s (%s)", host, errstr == NULL ? "Unknown error" : ZSTR_VAL(errstr)); } if (stream == NULL) { @@ -281,7 +281,7 @@ PHP_FUNCTION(stream_socket_accept) } php_stream_to_zval(clistream, return_value); } else { - php_error_docref(NULL, E_WARNING, "accept failed: %s", errstr ? ZSTR_VAL(errstr) : "Unknown error"); + php_error_docref(NULL, E_WARNING, "Accept failed: %s", errstr ? ZSTR_VAL(errstr) : "Unknown error"); RETVAL_FALSE; } @@ -857,7 +857,7 @@ static void user_space_stream_notifier(php_stream_context *context, int notifyco ZVAL_LONG(&zvs[5], bytes_max); if (FAILURE == call_user_function_ex(NULL, NULL, callback, &retval, 6, zvs, 0, NULL)) { - php_error_docref(NULL, E_WARNING, "failed to call user notifier"); + php_error_docref(NULL, E_WARNING, "Failed to call user notifier"); } for (i = 0; i < 6; i++) { zval_ptr_dtor(&zvs[i]); diff --git a/ext/standard/tests/array/count_variation3.phpt b/ext/standard/tests/array/count_variation3.phpt index 30cae18964..3455585eab 100644 --- a/ext/standard/tests/array/count_variation3.phpt +++ b/ext/standard/tests/array/count_variation3.phpt @@ -34,6 +34,6 @@ int(4) -- $mode = 1: -- -Warning: count(): recursion detected in %s on line %d +Warning: count(): Recursion detected in %s on line %d int(4) Done diff --git a/ext/standard/tests/dir/dir_variation5.phpt b/ext/standard/tests/dir/dir_variation5.phpt index ea040bed8a..7492ee55fe 100644 --- a/ext/standard/tests/dir/dir_variation5.phpt +++ b/ext/standard/tests/dir/dir_variation5.phpt @@ -30,6 +30,6 @@ echo "Done"; --EXPECTF-- *** Testing dir() : open a file instead of a directory *** -Warning: dir(%s): failed to open dir: %s in %s on line %d +Warning: dir(%s): Failed to open directory: %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/dir/dir_variation6.phpt b/ext/standard/tests/dir/dir_variation6.phpt index c7ce2bc080..ca0a47e818 100644 --- a/ext/standard/tests/dir/dir_variation6.phpt +++ b/ext/standard/tests/dir/dir_variation6.phpt @@ -48,10 +48,10 @@ echo "Done"; *** Testing dir() : open a non-existent directory *** -- opening previously removed directory -- -Warning: dir(%s): failed to open dir: %s in %s on line %d +Warning: dir(%s): Failed to open directory: %s in %s on line %d bool(false) -- opening non-existent directory -- -Warning: dir(%s): failed to open dir: %s in %s on line %d +Warning: dir(%s): Failed to open directory: %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/dir/dir_variation7.phpt b/ext/standard/tests/dir/dir_variation7.phpt index 7993105e36..5083c66d7a 100644 --- a/ext/standard/tests/dir/dir_variation7.phpt +++ b/ext/standard/tests/dir/dir_variation7.phpt @@ -77,10 +77,10 @@ rmdir($parent_dir_path); *** Testing dir() : remove execute permission from the parent dir *** -- After restricting 1st level parent directory -- -Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: dir(%s/dir_variation7/sub_dir/child_dir): Failed to open directory: %s in %s on line %d bool(false) -- After restricting parent directory -- -Warning: dir(%s/dir_variation7/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: dir(%s/dir_variation7/sub_dir/child_dir): Failed to open directory: %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/dir/dir_variation8.phpt b/ext/standard/tests/dir/dir_variation8.phpt index 8664a33e34..3b5aecb8a3 100644 --- a/ext/standard/tests/dir/dir_variation8.phpt +++ b/ext/standard/tests/dir/dir_variation8.phpt @@ -45,16 +45,16 @@ echo "Done"; *** Testing dir() : checking with wildcard characters *** -- wildcard = '*' -- -Warning: dir(%s/dir_var*): failed to open dir: %s in %s on line %d +Warning: dir(%s/dir_var*): Failed to open directory: %s in %s on line %d bool(false) -Warning: dir(%s/*): failed to open dir: %s in %s on line %d +Warning: dir(%s/*): Failed to open directory: %s in %s on line %d bool(false) -- wildcard = '?' -- -Warning: dir(%s/dir_variation81/sub_dir?): failed to open dir: %s in %s on line %d +Warning: dir(%s/dir_variation81/sub_dir?): Failed to open directory: %s in %s on line %d bool(false) -Warning: dir(%s/dir_variation81/sub?dir1): failed to open dir: %s in %s on line %d +Warning: dir(%s/dir_variation81/sub?dir1): Failed to open directory: %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/dir/dir_variation9.phpt b/ext/standard/tests/dir/dir_variation9.phpt index 50f6d6c3ce..5b398c383c 100644 --- a/ext/standard/tests/dir/dir_variation9.phpt +++ b/ext/standard/tests/dir/dir_variation9.phpt @@ -103,15 +103,15 @@ object(Directory)#%d (2) { -- With invalid paths -- -Warning: dir(%s/dir_variation91/sub_dir12/sub_dir111/..): failed to open dir: %s in %s on line %d +Warning: dir(%s/dir_variation91/sub_dir12/sub_dir111/..): Failed to open directory: %s in %s on line %d bool(false) -Warning: dir(%s/dir_variation92/sub_dir21/../dir_variation91): failed to open dir: %s in %s on line %d +Warning: dir(%s/dir_variation92/sub_dir21/../dir_variation91): Failed to open directory: %s in %s on line %d bool(false) -Warning: dir(%s/dir_variation92/sub_dir21/../../dir_variation91/sub_dir12/..): failed to open dir: %s in %s on line %d +Warning: dir(%s/dir_variation92/sub_dir21/../../dir_variation91/sub_dir12/..): Failed to open directory: %s in %s on line %d bool(false) -Warning: dir(%s/dir_variation91/sub_dir11/sub_dir111/../../dir_variation92/sub_dir21/..): failed to open dir: %s in %s on line %d +Warning: dir(%s/dir_variation91/sub_dir11/sub_dir111/../../dir_variation92/sub_dir21/..): Failed to open directory: %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/dir/opendir_error2.phpt b/ext/standard/tests/dir/opendir_error2.phpt index 1eac9a33d8..5d7128921b 100644 --- a/ext/standard/tests/dir/opendir_error2.phpt +++ b/ext/standard/tests/dir/opendir_error2.phpt @@ -32,10 +32,10 @@ var_dump(opendir('idonotexist')); -- Pass a non-existent absolute path: -- -Warning: opendir(%s/idonotexist): failed to open dir: %s in %s on line %d +Warning: opendir(%s/idonotexist): Failed to open directory: %s in %s on line %d bool(false) -- Pass a non-existent relative path: -- -Warning: opendir(idonotexist): failed to open dir: %s in %s on line %d +Warning: opendir(idonotexist): Failed to open directory: %s in %s on line %d bool(false) diff --git a/ext/standard/tests/dir/opendir_variation5.phpt b/ext/standard/tests/dir/opendir_variation5.phpt index cbdc5c302c..f8023288d1 100644 --- a/ext/standard/tests/dir/opendir_variation5.phpt +++ b/ext/standard/tests/dir/opendir_variation5.phpt @@ -83,10 +83,10 @@ rmdir($parent_dir_path); -- After restricting 1st level parent directory -- -Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): Failed to open directory: %s in %s on line %d bool(false) -- After restricting parent directory -- -Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: opendir(%s/opendir_variation5/sub_dir/child_dir): Failed to open directory: %s in %s on line %d bool(false) diff --git a/ext/standard/tests/dir/opendir_variation6-win32.phpt b/ext/standard/tests/dir/opendir_variation6-win32.phpt index 3972f6d5c2..60957b5f9c 100644 --- a/ext/standard/tests/dir/opendir_variation6-win32.phpt +++ b/ext/standard/tests/dir/opendir_variation6-win32.phpt @@ -52,22 +52,22 @@ rmdir($dir_path); Warning: opendir(%s/opendir_var*,%s/opendir_var*): %s in %s on line %d -Warning: opendir(%s/opendir_var*): failed to open dir: %s in %s on line %d +Warning: opendir(%s/opendir_var*): Failed to open directory: %s in %s on line %d bool(false) Warning: opendir(%s/*,%s/*): %s in %s on line %d -Warning: opendir(%s/*): failed to open dir: %s in %s on line %d +Warning: opendir(%s/*): Failed to open directory: %s in %s on line %d bool(false) -- Wildcard = '?' -- Warning: opendir(%s/opendir_variation6/sub_dir?,%s/opendir_variation6/sub_dir?): %s in %s on line %d -Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: %s in %s on line %d +Warning: opendir(%s/opendir_variation6/sub_dir?): Failed to open directory: %s in %s on line %d bool(false) Warning: opendir(%s/opendir_variation6/sub?dir1,%s/opendir_variation6/sub?dir1): %s in %s on line %d -Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d +Warning: opendir(%s/opendir_variation6/sub?dir1): Failed to open directory: %s in %s on line %d bool(false) diff --git a/ext/standard/tests/dir/opendir_variation6.phpt b/ext/standard/tests/dir/opendir_variation6.phpt index a9a0221e6e..da91798dd3 100644 --- a/ext/standard/tests/dir/opendir_variation6.phpt +++ b/ext/standard/tests/dir/opendir_variation6.phpt @@ -50,16 +50,16 @@ rmdir($dir_path); -- Wildcard = '*' -- -Warning: opendir(%s/opendir_var*): failed to open dir: %s in %s on line %d +Warning: opendir(%s/opendir_var*): Failed to open directory: %s in %s on line %d bool(false) -Warning: opendir(%s/*): failed to open dir: %s in %s on line %d +Warning: opendir(%s/*): Failed to open directory: %s in %s on line %d bool(false) -- Wildcard = '?' -- -Warning: opendir(%s/opendir_variation6/sub_dir?): failed to open dir: %s in %s on line %d +Warning: opendir(%s/opendir_variation6/sub_dir?): Failed to open directory: %s in %s on line %d bool(false) -Warning: opendir(%s/opendir_variation6/sub?dir1): failed to open dir: %s in %s on line %d +Warning: opendir(%s/opendir_variation6/sub?dir1): Failed to open directory: %s in %s on line %d bool(false) diff --git a/ext/standard/tests/dir/scandir_error2.phpt b/ext/standard/tests/dir/scandir_error2.phpt index e77b098323..d8eefc3992 100644 --- a/ext/standard/tests/dir/scandir_error2.phpt +++ b/ext/standard/tests/dir/scandir_error2.phpt @@ -32,14 +32,14 @@ var_dump(scandir('/idonotexist')); -- Pass scandir() an absolute path that does not exist -- -Warning: scandir(%s/idonotexist): failed to open dir: %s in %s on line %d +Warning: scandir(%s/idonotexist): Failed to open directory: %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -- Pass scandir() a relative path that does not exist -- -Warning: scandir(/idonotexist): failed to open dir: %s in %s on line %d +Warning: scandir(/idonotexist): Failed to open directory: %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) diff --git a/ext/standard/tests/dir/scandir_variation5.phpt b/ext/standard/tests/dir/scandir_variation5.phpt index 88596c42c5..459ce146ee 100644 --- a/ext/standard/tests/dir/scandir_variation5.phpt +++ b/ext/standard/tests/dir/scandir_variation5.phpt @@ -75,14 +75,14 @@ rmdir($parent_dir_path); -- After restricting 1st level parent directory -- -Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): Failed to open directory: %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -- After restricting parent directory -- -Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): failed to open dir: %s in %s on line %d +Warning: scandir(%s/scandir_variation5/sub_dir/child_dir): Failed to open directory: %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) diff --git a/ext/standard/tests/dir/scandir_variation6.phpt b/ext/standard/tests/dir/scandir_variation6.phpt index 80b934f56f..8947293818 100644 --- a/ext/standard/tests/dir/scandir_variation6.phpt +++ b/ext/standard/tests/dir/scandir_variation6.phpt @@ -51,24 +51,24 @@ rmdir($dir_path); -- Wildcard = '*' -- -Warning: scandir(%s/scandir_var*): failed to open dir: %s in %s on line %d +Warning: scandir(%s/scandir_var*): Failed to open directory: %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -Warning: scandir(%s/*): failed to open dir: %s in %s on line %d +Warning: scandir(%s/*): Failed to open directory: %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -- Wildcard = '?' -- -Warning: scandir(%s/scandir_variation6/sub_dir?): failed to open dir: %s in %s on line %d +Warning: scandir(%s/scandir_variation6/sub_dir?): Failed to open directory: %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) -Warning: scandir(%s/scandir_variation6/sub?dir1): failed to open dir: %s in %s on line %d +Warning: scandir(%s/scandir_variation6/sub?dir1): Failed to open directory: %s in %s on line %d Warning: scandir(): (errno %d): %s in %s on line %d bool(false) diff --git a/ext/standard/tests/file/007_variation1.phpt b/ext/standard/tests/file/007_variation1.phpt index f22fdc0dc9..5de97e32cc 100644 --- a/ext/standard/tests/file/007_variation1.phpt +++ b/ext/standard/tests/file/007_variation1.phpt @@ -49,7 +49,7 @@ string(20) "line line of text li" -Notice: fwrite(): write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) bool(true) string(7) "Unknown" diff --git a/ext/standard/tests/file/007_variation11-win32-mb.phpt b/ext/standard/tests/file/007_variation11-win32-mb.phpt index fc24ba3853..785305c927 100644 --- a/ext/standard/tests/file/007_variation11-win32-mb.phpt +++ b/ext/standard/tests/file/007_variation11-win32-mb.phpt @@ -69,7 +69,7 @@ int(0) int(37) int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) diff --git a/ext/standard/tests/file/007_variation11-win32.phpt b/ext/standard/tests/file/007_variation11-win32.phpt index f52e211ea5..619f51a208 100644 --- a/ext/standard/tests/file/007_variation11-win32.phpt +++ b/ext/standard/tests/file/007_variation11-win32.phpt @@ -67,7 +67,7 @@ int(0) int(37) int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) diff --git a/ext/standard/tests/file/007_variation11.phpt b/ext/standard/tests/file/007_variation11.phpt index 6bc9975104..817e92bdea 100644 --- a/ext/standard/tests/file/007_variation11.phpt +++ b/ext/standard/tests/file/007_variation11.phpt @@ -67,7 +67,7 @@ int(0) int(37) int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) diff --git a/ext/standard/tests/file/007_variation13-win32.phpt b/ext/standard/tests/file/007_variation13-win32.phpt index d588cc4235..dcb3c83670 100644 --- a/ext/standard/tests/file/007_variation13-win32.phpt +++ b/ext/standard/tests/file/007_variation13-win32.phpt @@ -57,7 +57,7 @@ resource(%d) of type (stream) string(6) "stream" int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) diff --git a/ext/standard/tests/file/007_variation13.phpt b/ext/standard/tests/file/007_variation13.phpt index 742d06a487..09fbb237a3 100644 --- a/ext/standard/tests/file/007_variation13.phpt +++ b/ext/standard/tests/file/007_variation13.phpt @@ -57,7 +57,7 @@ resource(%d) of type (stream) string(6) "stream" int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) diff --git a/ext/standard/tests/file/007_variation15.phpt b/ext/standard/tests/file/007_variation15.phpt index 128ed2fc46..fa6c1f9951 100644 --- a/ext/standard/tests/file/007_variation15.phpt +++ b/ext/standard/tests/file/007_variation15.phpt @@ -50,11 +50,11 @@ int(0) int(37) int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(%s): Failed to open stream: File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation16.phpt b/ext/standard/tests/file/007_variation16.phpt index 9173138db4..150067b391 100644 --- a/ext/standard/tests/file/007_variation16.phpt +++ b/ext/standard/tests/file/007_variation16.phpt @@ -56,5 +56,5 @@ int(37) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(%s): Failed to open stream: File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation17.phpt b/ext/standard/tests/file/007_variation17.phpt index b817526365..d37d983b70 100644 --- a/ext/standard/tests/file/007_variation17.phpt +++ b/ext/standard/tests/file/007_variation17.phpt @@ -49,7 +49,7 @@ string(20) "line line of text li" -Notice: fwrite(): write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) bool(true) string(7) "Unknown" diff --git a/ext/standard/tests/file/007_variation19.phpt b/ext/standard/tests/file/007_variation19.phpt index 316616fa14..09e171bad1 100644 --- a/ext/standard/tests/file/007_variation19.phpt +++ b/ext/standard/tests/file/007_variation19.phpt @@ -62,7 +62,7 @@ int(0) int(37) int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) diff --git a/ext/standard/tests/file/007_variation21.phpt b/ext/standard/tests/file/007_variation21.phpt index 37b1797491..3d0eaa5863 100644 --- a/ext/standard/tests/file/007_variation21.phpt +++ b/ext/standard/tests/file/007_variation21.phpt @@ -52,7 +52,7 @@ resource(%d) of type (stream) string(6) "stream" int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) diff --git a/ext/standard/tests/file/007_variation23.phpt b/ext/standard/tests/file/007_variation23.phpt index eafa408eac..ef9d532585 100644 --- a/ext/standard/tests/file/007_variation23.phpt +++ b/ext/standard/tests/file/007_variation23.phpt @@ -50,11 +50,11 @@ int(0) int(37) int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(%s): Failed to open stream: File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation24.phpt b/ext/standard/tests/file/007_variation24.phpt index 86b7347a1c..61d83712cd 100644 --- a/ext/standard/tests/file/007_variation24.phpt +++ b/ext/standard/tests/file/007_variation24.phpt @@ -56,5 +56,5 @@ int(37) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(%s): Failed to open stream: File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation3.phpt b/ext/standard/tests/file/007_variation3.phpt index 59fb4587f9..8838a4d783 100644 --- a/ext/standard/tests/file/007_variation3.phpt +++ b/ext/standard/tests/file/007_variation3.phpt @@ -62,7 +62,7 @@ int(0) int(37) int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) diff --git a/ext/standard/tests/file/007_variation5.phpt b/ext/standard/tests/file/007_variation5.phpt index 5e4fc5c9db..69b0ae6332 100644 --- a/ext/standard/tests/file/007_variation5.phpt +++ b/ext/standard/tests/file/007_variation5.phpt @@ -52,7 +52,7 @@ resource(%d) of type (stream) string(6) "stream" int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) diff --git a/ext/standard/tests/file/007_variation7.phpt b/ext/standard/tests/file/007_variation7.phpt index 40e22c4655..6c8613c57d 100644 --- a/ext/standard/tests/file/007_variation7.phpt +++ b/ext/standard/tests/file/007_variation7.phpt @@ -50,11 +50,11 @@ int(0) int(37) int(37) -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(%s): Failed to open stream: File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation8.phpt b/ext/standard/tests/file/007_variation8.phpt index b19fbaf9ec..bc26245b87 100644 --- a/ext/standard/tests/file/007_variation8.phpt +++ b/ext/standard/tests/file/007_variation8.phpt @@ -56,5 +56,5 @@ int(37) bool(true) string(7) "Unknown" -Warning: fopen(%s): failed to open stream: File exists in %s on line %d +Warning: fopen(%s): Failed to open stream: File exists in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/007_variation9.phpt b/ext/standard/tests/file/007_variation9.phpt index c20d3b4cf1..a21a807d20 100644 --- a/ext/standard/tests/file/007_variation9.phpt +++ b/ext/standard/tests/file/007_variation9.phpt @@ -49,7 +49,7 @@ string(20) "line line of text li" -Notice: fwrite(): write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 37 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) bool(true) string(7) "Unknown" diff --git a/ext/standard/tests/file/bug35740.phpt b/ext/standard/tests/file/bug35740.phpt index 29e8d8ebf8..29ab0248d8 100644 --- a/ext/standard/tests/file/bug35740.phpt +++ b/ext/standard/tests/file/bug35740.phpt @@ -8,7 +8,7 @@ include (__DIR__); echo "Done\n"; ?> --EXPECTF-- -Warning: include(%s): failed to open stream: %s in %s on line %d +Warning: include(%s): Failed to open stream: %s in %s on line %d Warning: include(): Failed opening '%s' for inclusion (include_path='%s') in %s on line %d Done diff --git a/ext/standard/tests/file/bug35781.phpt b/ext/standard/tests/file/bug35781.phpt index 30b49beb78..c07900e9d7 100644 --- a/ext/standard/tests/file/bug35781.phpt +++ b/ext/standard/tests/file/bug35781.phpt @@ -19,7 +19,7 @@ var_dump(file_get_contents($filename)); echo "Done\n"; ?> --EXPECTF-- -Notice: fpassthru(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fpassthru(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d string(15) "Guvf vf n grfg " Done diff --git a/ext/standard/tests/file/bug43353.phpt b/ext/standard/tests/file/bug43353.phpt index d9576f24e2..6089fabadd 100644 --- a/ext/standard/tests/file/bug43353.phpt +++ b/ext/standard/tests/file/bug43353.phpt @@ -16,5 +16,5 @@ bool(false) bool(false) string(3) "foo" -Warning: file_get_contents(datafoo:text/plain,foo): failed to open stream: No such file or directory in %s +Warning: file_get_contents(datafoo:text/plain,foo): Failed to open stream: No such file or directory in %s bool(false) diff --git a/ext/standard/tests/file/bug45303.phpt b/ext/standard/tests/file/bug45303.phpt index 0a4b33bcff..927c459fb5 100644 --- a/ext/standard/tests/file/bug45303.phpt +++ b/ext/standard/tests/file/bug45303.phpt @@ -9,5 +9,5 @@ var_dump(fseek($fd, 1024*1024, SEEK_SET)); --EXPECTF-- resource(%d) of type (stream) -Warning: fseek(): stream does not support seeking in %s +Warning: fseek(): Stream does not support seeking in %s int(-1) diff --git a/ext/standard/tests/file/bug47517.phpt b/ext/standard/tests/file/bug47517.phpt index 9a95ff52e7..4eaf9a132c 100644 --- a/ext/standard/tests/file/bug47517.phpt +++ b/ext/standard/tests/file/bug47517.phpt @@ -16,4 +16,4 @@ if (!$status) { file_put_contents('C:\Program Files\myfile.txt', 'hello'); ?> --EXPECTF-- -Warning: file_put_contents(C:\Program Files\myfile.txt): failed to open stream: Permission denied in %sbug47517.php on line %d +Warning: file_put_contents(C:\Program Files\myfile.txt): Failed to open stream: Permission denied in %sbug47517.php on line %d diff --git a/ext/standard/tests/file/bug69442.phpt b/ext/standard/tests/file/bug69442.phpt index d7063f429d..60192d3c9b 100644 --- a/ext/standard/tests/file/bug69442.phpt +++ b/ext/standard/tests/file/bug69442.phpt @@ -17,7 +17,7 @@ EOC; $output = join("\n", $output); unlink($tmpFile); - if (strstr($output, "pty pseudo terminal not supported on this system") !== false) { + if (strstr($output, "PTY pseudo terminal not supported on this system") !== false) { die("skip PTY pseudo terminals are not supported"); } --FILE-- diff --git a/ext/standard/tests/file/chown.phpt b/ext/standard/tests/file/chown.phpt index 049073e7a0..1654e550b6 100644 --- a/ext/standard/tests/file/chown.phpt +++ b/ext/standard/tests/file/chown.phpt @@ -11,5 +11,5 @@ chown("sjhgfskhagkfdgskjfhgskfsdgfkdsajf", NULL); echo "ALIVE\n"; ?> --EXPECTF-- -Warning: chown(): parameter 2 should be string or int, null given in %schown.php on line %d +Warning: chown(): Parameter 2 should be string or int, null given in %schown.php on line %d ALIVE diff --git a/ext/standard/tests/file/copy_error.phpt b/ext/standard/tests/file/copy_error.phpt index 36eb58fc2a..761c4403f7 100644 --- a/ext/standard/tests/file/copy_error.phpt +++ b/ext/standard/tests/file/copy_error.phpt @@ -16,6 +16,6 @@ echo "*** Done ***\n"; --EXPECTF-- *** Testing copy() function: error conditions -- -Warning: copy(/no/file): failed to open stream: No such file or directory in %s on line %d +Warning: copy(/no/file): Failed to open stream: No such file or directory in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/copy_variation16-win32.phpt b/ext/standard/tests/file/copy_variation16-win32.phpt index b6e8a26684..ae79b79984 100644 --- a/ext/standard/tests/file/copy_variation16-win32.phpt +++ b/ext/standard/tests/file/copy_variation16-win32.phpt @@ -130,7 +130,7 @@ Size of destination file => int(3500) -- Iteration 7 -- Size of source file => int(3500) Copy operation => -Warning: copy(%s): failed to open stream: No such file or directory in %s on line %d +Warning: copy(%s): Failed to open stream: No such file or directory in %s on line %d bool(false) Existence of destination file => bool(false) diff --git a/ext/standard/tests/file/copy_variation6-win32.phpt b/ext/standard/tests/file/copy_variation6-win32.phpt index 59a82236d2..4e94c148c5 100644 --- a/ext/standard/tests/file/copy_variation6-win32.phpt +++ b/ext/standard/tests/file/copy_variation6-win32.phpt @@ -129,7 +129,7 @@ Size of destination file => int(0) -- Iteration 7 -- Copy operation => -Warning: copy(%s/copy_variation6/copy_variation6_sub///../*): failed to open stream: No such file or directory in %s on line %d +Warning: copy(%s/copy_variation6/copy_variation6_sub///../*): Failed to open stream: No such file or directory in %s on line %d bool(false) Existence of destination file => bool(false) diff --git a/ext/standard/tests/file/fgetc_variation3.phpt b/ext/standard/tests/file/fgetc_variation3.phpt index 67f5c76ff4..e8cd705abd 100644 --- a/ext/standard/tests/file/fgetc_variation3.phpt +++ b/ext/standard/tests/file/fgetc_variation3.phpt @@ -56,7 +56,7 @@ bool(true) int(0) bool(false) -Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetc(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -65,7 +65,7 @@ bool(true) int(0) bool(false) -Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetc(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -74,7 +74,7 @@ bool(true) int(0) bool(false) -Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetc(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -83,7 +83,7 @@ bool(true) int(0) bool(false) -Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetc(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -92,7 +92,7 @@ bool(true) int(0) bool(false) -Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetc(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -101,7 +101,7 @@ bool(true) int(0) bool(false) -Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetc(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -110,7 +110,7 @@ bool(true) int(0) bool(false) -Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetc(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -119,7 +119,7 @@ bool(true) int(0) bool(false) -Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetc(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -128,7 +128,7 @@ bool(true) int(0) bool(false) -Notice: fgetc(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetc(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) diff --git a/ext/standard/tests/file/fgetcsv_variation26.phpt b/ext/standard/tests/file/fgetcsv_variation26.phpt index 289972acb3..3b708c77df 100644 --- a/ext/standard/tests/file/fgetcsv_variation26.phpt +++ b/ext/standard/tests/file/fgetcsv_variation26.phpt @@ -81,504 +81,504 @@ echo "Done\n"; -- Testing fgetcsv() with file opened using w mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using ab mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using at mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using ab mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using at mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using ab mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using at mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using ab mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using at mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using ab mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using at mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using ab mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using at mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using ab mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using at mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using w mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using wt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using a mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using ab mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using at mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using x mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xb mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) -- Testing fgetcsv() with file opened using xt mode -- -Notice: fgetcsv(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgetcsv(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) diff --git a/ext/standard/tests/file/fgets_variation1.phpt b/ext/standard/tests/file/fgets_variation1.phpt index 50856df2e0..1556540a2e 100644 --- a/ext/standard/tests/file/fgets_variation1.phpt +++ b/ext/standard/tests/file/fgets_variation1.phpt @@ -55,7 +55,7 @@ bool(true) int(0) bool(false) -Notice: fgets(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgets(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -64,7 +64,7 @@ bool(true) int(0) bool(false) -Notice: fgets(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgets(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -73,7 +73,7 @@ bool(true) int(0) bool(false) -Notice: fgets(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgets(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -82,7 +82,7 @@ bool(true) int(0) bool(false) -Notice: fgets(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgets(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -91,7 +91,7 @@ bool(true) int(0) bool(false) -Notice: fgets(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgets(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -100,7 +100,7 @@ bool(true) int(0) bool(false) -Notice: fgets(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgets(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -109,7 +109,7 @@ bool(true) int(0) bool(false) -Notice: fgets(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgets(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -118,7 +118,7 @@ bool(true) int(0) bool(false) -Notice: fgets(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgets(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -127,7 +127,7 @@ bool(true) int(0) bool(false) -Notice: fgets(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fgets(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) diff --git a/ext/standard/tests/file/file_error.phpt b/ext/standard/tests/file/file_error.phpt index cd714cca0b..f0e0c32ada 100644 --- a/ext/standard/tests/file/file_error.phpt +++ b/ext/standard/tests/file/file_error.phpt @@ -29,7 +29,7 @@ unlink($file_path."/file.tmp"); array(0) { } -Warning: file(temp.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(temp.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) --- Done --- diff --git a/ext/standard/tests/file/file_get_contents_error.phpt b/ext/standard/tests/file/file_get_contents_error.phpt index 8304105ccc..47c528ddb5 100644 --- a/ext/standard/tests/file/file_get_contents_error.phpt +++ b/ext/standard/tests/file/file_get_contents_error.phpt @@ -48,7 +48,7 @@ if(file_exists($file_path."/file_put_contents1.tmp")) { -- Testing with Non-existing file -- -Warning: file_get_contents(/no/such/file/or/dir): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(/no/such/file/or/dir): Failed to open stream: No such file or directory in %s on line %d -- Testing for invalid negative maxlen values -- Length must be greater than or equal to zero diff --git a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt index b111ff9f5d..12c0ee6753 100644 --- a/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt +++ b/ext/standard/tests/file/file_get_contents_file_put_contents_error.phpt @@ -44,7 +44,7 @@ unlink($file_path."/file_put_contents1.tmp"); -- Testing with Non-existing file -- -Warning: file_get_contents(/no/such/file/or/dir): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(/no/such/file/or/dir): Failed to open stream: No such file or directory in %s on line %d -- Testing for invalid negative maxlen values -- Length must be greater than or equal to zero diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt index 0f2c58a86d..48711ddf43 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32-mb.phpt @@ -84,12 +84,12 @@ string(%d) "contents read" -- Iteration 5 -- -Warning: file_get_contents(%sfileGetContentsVar7私はガラスを食べられます.dir\fileGetContentsVar7Sub私はガラスを食べられます\..\\\fileGetContentsVar7Sub私はガラスを食べられます\\..\\..\fileGetContentsVar7Sub私はガラスを食べられます\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(%sfileGetContentsVar7私はガラスを食べられます.dir\fileGetContentsVar7Sub私はガラスを食べられます\..\\\fileGetContentsVar7Sub私はガラスを食べられます\\..\\..\fileGetContentsVar7Sub私はガラスを食べられます\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: file_get_contents(%sfileGetContentsVar7私はガラスを食べられます.dir\fileGetContentsVar7Sub私はガラスを食べられます\BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(%sfileGetContentsVar7私はガラスを食べられます.dir\fileGetContentsVar7Sub私はガラスを食べられます\BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -106,7 +106,7 @@ string(%d) "contents read" -- Iteration 11 -- -Warning: file_get_contents(BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 12 -- diff --git a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt index 8e9f34520a..d4e877d9ab 100644 --- a/ext/standard/tests/file/file_get_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7-win32.phpt @@ -84,12 +84,12 @@ string(%d) "contents read" -- Iteration 5 -- -Warning: file_get_contents(%sfileGetContentsVar7.dir\fileGetContentsVar7Sub\..\\\fileGetContentsVar7Sub\\..\\..\fileGetContentsVar7Sub\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(%sfileGetContentsVar7.dir\fileGetContentsVar7Sub\..\\\fileGetContentsVar7Sub\\..\\..\fileGetContentsVar7Sub\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: file_get_contents(%sfileGetContentsVar7.dir\fileGetContentsVar7Sub\BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(%sfileGetContentsVar7.dir\fileGetContentsVar7Sub\BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -106,7 +106,7 @@ string(%d) "contents read" -- Iteration 11 -- -Warning: file_get_contents(BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 12 -- diff --git a/ext/standard/tests/file/file_get_contents_variation7.phpt b/ext/standard/tests/file/file_get_contents_variation7.phpt index e2d317a4a0..627ef8f849 100644 --- a/ext/standard/tests/file/file_get_contents_variation7.phpt +++ b/ext/standard/tests/file/file_get_contents_variation7.phpt @@ -76,12 +76,12 @@ string(%d) "contents read" -- Iteration 5 -- -Warning: file_get_contents(%sfileGetContentsVar7.dir/fileGetContentsVar7Sub/..///fileGetContentsVar7Sub//..//../fileGetContentsVar7Sub/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(%sfileGetContentsVar7.dir/fileGetContentsVar7Sub/..///fileGetContentsVar7Sub//..//../fileGetContentsVar7Sub/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: file_get_contents(%sfileGetContentsVar7.dir/fileGetContentsVar7Sub/BADDIR/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(%sfileGetContentsVar7.dir/fileGetContentsVar7Sub/BADDIR/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -98,7 +98,7 @@ string(%d) "contents read" -- Iteration 11 -- -Warning: file_get_contents(BADDIR/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(BADDIR/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt index e0fed02054..1edd46a9cb 100644 --- a/ext/standard/tests/file/file_get_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8-win32.phpt @@ -53,12 +53,12 @@ foreach($names_arr as $key =>$value) { -- Filename: -1 -- -Warning: file_get_contents(-1): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(-1): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Filename: TRUE -- -Warning: file_get_contents(1): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(1): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Filename: FALSE -- @@ -78,7 +78,7 @@ bool(false) -- Filename: " " -- -Warning: file_get_contents( ): failed to open stream: Permission denied in %s on line %d +Warning: file_get_contents( ): Failed to open stream: Permission denied in %s on line %d bool(false) -- Filename: \0 -- @@ -89,10 +89,10 @@ file_get_contents() expects parameter 1 to be a valid path, array given -- Filename: /no/such/file/dir -- -Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(/no/such/file/dir): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Filename: php/php -- -Warning: file_get_contents(php/php): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(php/php): Failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/standard/tests/file/file_get_contents_variation8.phpt b/ext/standard/tests/file/file_get_contents_variation8.phpt index 9a7087c821..9277106992 100644 --- a/ext/standard/tests/file/file_get_contents_variation8.phpt +++ b/ext/standard/tests/file/file_get_contents_variation8.phpt @@ -52,11 +52,11 @@ echo "\n*** Done ***\n"; *** Testing file_get_contents() : variation *** -- Iteration 0 -- -Warning: file_get_contents(-1): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(-1): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 1 -- -Warning: file_get_contents(1): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(1): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 2 -- @@ -72,7 +72,7 @@ Warning: file_get_contents(): Filename cannot be empty in %s on line %d bool(false) -- Iteration 5 -- -Warning: file_get_contents( ): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents( ): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 6 -- file_get_contents() expects parameter 1 to be a valid path, string given @@ -80,11 +80,11 @@ file_get_contents() expects parameter 1 to be a valid path, string given file_get_contents() expects parameter 1 to be a valid path, array given -- Iteration 8 -- -Warning: file_get_contents(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(/no/such/file/dir): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 9 -- -Warning: file_get_contents(php/php): failed to open stream: No such file or directory in %s on line %d +Warning: file_get_contents(php/php): Failed to open stream: No such file or directory in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt index 138b4ede84..6a3d41797a 100644 --- a/ext/standard/tests/file/file_put_contents_variation7-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7-win32.phpt @@ -99,12 +99,12 @@ Data written correctly -- Iteration 5 -- -Warning: file_put_contents(%sfilePutContentsVar7.dir\filePutContentsVar7Sub\..\\\filePutContentsVar7Sub\\..\\..\filePutContentsVar7Sub\FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(%sfilePutContentsVar7.dir\filePutContentsVar7Sub\..\\\filePutContentsVar7Sub\\..\\..\filePutContentsVar7Sub\FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d No data written -- Iteration 6 -- -Warning: file_put_contents(%sfilePutContentsVar7.dir\filePutContentsVar7Sub\BADDIR\FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(%sfilePutContentsVar7.dir\filePutContentsVar7Sub\BADDIR\FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d No data written -- Iteration 7 -- @@ -121,7 +121,7 @@ Data written correctly -- Iteration 11 -- -Warning: file_put_contents(BADDIR\FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(BADDIR\FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d No data written -- Iteration 12 -- diff --git a/ext/standard/tests/file/file_put_contents_variation7.phpt b/ext/standard/tests/file/file_put_contents_variation7.phpt index 561c78b374..1c55b1bb58 100644 --- a/ext/standard/tests/file/file_put_contents_variation7.phpt +++ b/ext/standard/tests/file/file_put_contents_variation7.phpt @@ -91,12 +91,12 @@ Data written correctly -- Iteration 5 -- -Warning: file_put_contents(%sfilePutContentsVar7.dir/filePutContentsVar7Sub/..///filePutContentsVar7Sub//..//../filePutContentsVar7Sub/FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(%sfilePutContentsVar7.dir/filePutContentsVar7Sub/..///filePutContentsVar7Sub//..//../filePutContentsVar7Sub/FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d No data written -- Iteration 6 -- -Warning: file_put_contents(%sfilePutContentsVar7.dir/filePutContentsVar7Sub/BADDIR/FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(%sfilePutContentsVar7.dir/filePutContentsVar7Sub/BADDIR/FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d No data written -- Iteration 7 -- @@ -113,7 +113,7 @@ Data written correctly -- Iteration 11 -- -Warning: file_put_contents(BADDIR/FileGetContentsVar7.tmp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(BADDIR/FileGetContentsVar7.tmp): Failed to open stream: %s in %s on line %d No data written *** Done *** diff --git a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt index 656bea5d34..71e672e8e9 100644 --- a/ext/standard/tests/file/file_put_contents_variation8-win32.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8-win32.phpt @@ -78,7 +78,7 @@ Failed to write data to: "" -- Filename: " " -- -Warning: file_put_contents( ): failed to open stream: Permission denied in %s on line %d +Warning: file_put_contents( ): Failed to open stream: Permission denied in %s on line %d Failed to write data to: " " -- Filename: \0 -- @@ -89,10 +89,10 @@ file_put_contents() expects parameter 1 to be a valid path, array given -- Filename: /no/such/file/dir -- -Warning: file_put_contents(/no/such/file/dir): failed to open stream: %s in %s on line %d +Warning: file_put_contents(/no/such/file/dir): Failed to open stream: %s in %s on line %d Failed to write data to: /no/such/file/dir -- Filename: php/php -- -Warning: file_put_contents(php/php): failed to open stream: %s in %s on line %d +Warning: file_put_contents(php/php): Failed to open stream: %s in %s on line %d Failed to write data to: php/php diff --git a/ext/standard/tests/file/file_put_contents_variation8.phpt b/ext/standard/tests/file/file_put_contents_variation8.phpt index be20782c4e..7c72ca8516 100644 --- a/ext/standard/tests/file/file_put_contents_variation8.phpt +++ b/ext/standard/tests/file/file_put_contents_variation8.phpt @@ -86,11 +86,11 @@ file_put_contents() expects parameter 1 to be a valid path, string given file_put_contents() expects parameter 1 to be a valid path, array given -- Iteration 8 -- -Warning: file_put_contents(%sdir): failed to open stream: %s in %s on line %d +Warning: file_put_contents(%sdir): Failed to open stream: %s in %s on line %d Failed to write data to: %sdir -- Iteration 9 -- -Warning: file_put_contents(%sphp): failed to open stream: %s in %s on line %d +Warning: file_put_contents(%sphp): Failed to open stream: %s in %s on line %d Failed to write data to: %sphp *** Done *** diff --git a/ext/standard/tests/file/file_variation8-win32.phpt b/ext/standard/tests/file/file_variation8-win32.phpt index b5a2004473..1bd68f5ed5 100644 --- a/ext/standard/tests/file/file_variation8-win32.phpt +++ b/ext/standard/tests/file/file_variation8-win32.phpt @@ -96,12 +96,12 @@ array(1) { -- Iteration 5 -- -Warning: file(%sfileVar8.dir\fileVar8Sub\..\\\fileVar8Sub\\..\\..\fileVar8Sub\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(%sfileVar8.dir\fileVar8Sub\..\\\fileVar8Sub\\..\\..\fileVar8Sub\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: file(%sfileVar8.dir\fileVar8Sub\BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(%sfileVar8.dir\fileVar8Sub\BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -130,7 +130,7 @@ array(1) { -- Iteration 11 -- -Warning: file(BADDIR\FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(BADDIR\FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 12 -- diff --git a/ext/standard/tests/file/file_variation8.phpt b/ext/standard/tests/file/file_variation8.phpt index f56ca9af7d..18908df15d 100644 --- a/ext/standard/tests/file/file_variation8.phpt +++ b/ext/standard/tests/file/file_variation8.phpt @@ -88,12 +88,12 @@ array(1) { -- Iteration 5 -- -Warning: file(%sfileVar8.dir/fileVar8Sub/..///fileVar8Sub//..//../fileVar8Sub/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(%sfileVar8.dir/fileVar8Sub/..///fileVar8Sub//..//../fileVar8Sub/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: file(%sfileVar8.dir/fileVar8Sub/BADDIR/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(%sfileVar8.dir/fileVar8Sub/BADDIR/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -122,7 +122,7 @@ array(1) { -- Iteration 11 -- -Warning: file(BADDIR/FileGetContentsVar7.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: file(BADDIR/FileGetContentsVar7.tmp): Failed to open stream: No such file or directory in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/fopen_variation10-win32.phpt b/ext/standard/tests/file/fopen_variation10-win32.phpt index ab6dc4f7bd..97e2d8a6fb 100644 --- a/ext/standard/tests/file/fopen_variation10-win32.phpt +++ b/ext/standard/tests/file/fopen_variation10-win32.phpt @@ -94,21 +94,21 @@ file in root --c-- -Warning: fopen(c\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(c\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --\-- -Warning: fopen(\\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(\\fopen_variation10.tmp): Failed to open stream: Invalid argument in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --/-- -Warning: fopen(/\fopen_variation10.tmp): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(/\fopen_variation10.tmp): Failed to open stream: Invalid argument in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d @@ -118,7 +118,7 @@ file in fopen10.tmpdirTwo --c:adir-- -Warning: fopen(c:adir\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(c:adir\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d @@ -140,7 +140,7 @@ file in fopen10.tmpDir --/sortout-- -Warning: fopen(/sortout\fopen_variation10.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(/sortout\fopen_variation10.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d diff --git a/ext/standard/tests/file/fopen_variation11-win32.phpt b/ext/standard/tests/file/fopen_variation11-win32.phpt index 60c41b9a64..a1d4c4c4e7 100644 --- a/ext/standard/tests/file/fopen_variation11-win32.phpt +++ b/ext/standard/tests/file/fopen_variation11-win32.phpt @@ -92,21 +92,21 @@ file in root --c-- -Warning: fopen(c\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(c\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --\-- -Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: Invalid argument in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d --/-- -Warning: fopen(\\FOPEN_VARIATION11.TMP): failed to open stream: Invalid argument in %s on line %d +Warning: fopen(\\FOPEN_VARIATION11.TMP): Failed to open stream: Invalid argument in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d @@ -116,7 +116,7 @@ file in fopen11.tmpdirTwo --c:adir-- -Warning: fopen(c:adir\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(c:adir\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d @@ -138,7 +138,7 @@ file in fopen11.tmpDir --/sortout-- -Warning: fopen(/sortout\fopen_variation11.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: fopen(/sortout\fopen_variation11.tmp): Failed to open stream: No such file or directory in %s on line %d file not opened for read Warning: fclose() expects parameter 1 to be resource, bool given in %s on line %d diff --git a/ext/standard/tests/file/fopen_variation14-win32.phpt b/ext/standard/tests/file/fopen_variation14-win32.phpt index ef8c2114c0..470a2efd1e 100644 --- a/ext/standard/tests/file/fopen_variation14-win32.phpt +++ b/ext/standard/tests/file/fopen_variation14-win32.phpt @@ -102,44 +102,44 @@ function runtest($fileURIs) { *** Testing fopen() : variation *** --- READ: file://fopen14.tmpDir\fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir\fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen14.tmpDir\fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir\fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://./fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://./fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://.\fopen14.tmpDir\fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://.\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://.\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://.\fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://.\fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://.\fopen14.tmpDir\fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://.\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://.\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://.\fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://.\fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- WRITE: file://%s/fopen14.tmpDir/fopen_variation14.tmp --- @@ -154,24 +154,24 @@ test passed test passed --- READ: file://../fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://../fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://..\fopen14.tmpDir\fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://..\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://..\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://..\fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://..\fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://..\fopen14.tmpDir\fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://..\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://..\fopen14.tmpDir\fopen_variation14.tmp in %s on line %d -Warning: fopen(file://..\fopen14.tmpDir\fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://..\fopen14.tmpDir\fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- WRITE: file://%s/fopen14.tmpDir/fopen_variation14.tmp --- diff --git a/ext/standard/tests/file/fopen_variation14.phpt b/ext/standard/tests/file/fopen_variation14.phpt index 4728eca2db..df9f115d14 100644 --- a/ext/standard/tests/file/fopen_variation14.phpt +++ b/ext/standard/tests/file/fopen_variation14.phpt @@ -94,38 +94,38 @@ function runtest($fileURIs) { *** Testing fopen() : variation *** --- READ: file://fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://./fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://./fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://./fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://./fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- READ: file://../fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://../fopen14.tmpDir/fopen_variation14.tmp --- -Warning: fopen(): remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://../fopen14.tmpDir/fopen_variation14.tmp in %s on line %d -Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://../fopen14.tmpDir/fopen_variation14.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- test passed --- WRITE: file:///%s/fopen14.tmpDir/fopen_variation14.tmp --- diff --git a/ext/standard/tests/file/fopen_variation15-win32.phpt b/ext/standard/tests/file/fopen_variation15-win32.phpt index 5439e0f637..9daac25c00 100644 --- a/ext/standard/tests/file/fopen_variation15-win32.phpt +++ b/ext/standard/tests/file/fopen_variation15-win32.phpt @@ -106,44 +106,44 @@ function runtest($fileURIs) { *** Testing fopen() : variation *** --- READ: file://fopen15.tmpDir\fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir\fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen15.tmpDir\fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir\fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://./fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://./fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://.\fopen15.tmpDir\fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://.\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://.\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://.\fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://.\fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://.\fopen15.tmpDir\fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://.\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://.\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://.\fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://.\fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- WRITE: file://%s/fopen15.tmpDir/fopen_variation15.tmp --- @@ -158,24 +158,24 @@ test passed test passed --- READ: file://../fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://../fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://..\fopen15.tmpDir\fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://..\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://..\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://..\fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://..\fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://..\fopen15.tmpDir\fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://..\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://..\fopen15.tmpDir\fopen_variation15.tmp in %s on line %d -Warning: fopen(file://..\fopen15.tmpDir\fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://..\fopen15.tmpDir\fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- WRITE: file://%s/fopen15.tmpDir/fopen_variation15.tmp --- diff --git a/ext/standard/tests/file/fopen_variation15.phpt b/ext/standard/tests/file/fopen_variation15.phpt index 9d0bdc51cb..36b1455250 100644 --- a/ext/standard/tests/file/fopen_variation15.phpt +++ b/ext/standard/tests/file/fopen_variation15.phpt @@ -98,38 +98,38 @@ function runtest($fileURIs) { *** Testing fopen() : variation *** --- READ: file://fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file://./fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://./fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://./fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://./fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- READ: file://../fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- WRITE: file://../fopen15.tmpDir/fopen_variation15.tmp --- -Warning: fopen(): remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d +Warning: fopen(): Remote host file access not supported, file://../fopen15.tmpDir/fopen_variation15.tmp in %s on line %d -Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://../fopen15.tmpDir/fopen_variation15.tmp): Failed to open stream: no suitable wrapper could be found in %s on line %d --- READ: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- test passed --- WRITE: file:///%s/fopen15.tmpDir/fopen_variation15.tmp --- diff --git a/ext/standard/tests/file/fputcsv_variation14.phpt b/ext/standard/tests/file/fputcsv_variation14.phpt index 79576e4656..64c2f290ff 100644 --- a/ext/standard/tests/file/fputcsv_variation14.phpt +++ b/ext/standard/tests/file/fputcsv_variation14.phpt @@ -90,7 +90,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 12 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 12 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -102,7 +102,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 12 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 12 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -114,7 +114,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 12 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 12 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -126,7 +126,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 15 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 15 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -138,7 +138,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 15 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 15 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -150,7 +150,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 15 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 15 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -162,7 +162,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -174,7 +174,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -186,7 +186,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -198,7 +198,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -210,7 +210,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -222,7 +222,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -234,7 +234,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -246,7 +246,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -258,7 +258,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -270,7 +270,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -282,7 +282,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -294,7 +294,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 16 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -306,7 +306,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -318,7 +318,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -330,7 +330,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 18 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -342,7 +342,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 22 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 22 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -354,7 +354,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 22 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 22 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -366,7 +366,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 22 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 22 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -378,7 +378,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 24 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 24 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -390,7 +390,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 24 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 24 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) @@ -402,7 +402,7 @@ Notice: fputcsv(): delimiter must be a single character in %s on line %d Notice: fputcsv(): enclosure must be a single character in %s on line %d -Notice: fputcsv(): write of 24 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fputcsv(): Write of 24 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) diff --git a/ext/standard/tests/file/fread_variation2.phpt b/ext/standard/tests/file/fread_variation2.phpt index bd7d050555..07ed6c3e6f 100644 --- a/ext/standard/tests/file/fread_variation2.phpt +++ b/ext/standard/tests/file/fread_variation2.phpt @@ -112,7 +112,7 @@ echo "Done\n"; int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -121,7 +121,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -131,7 +131,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -140,7 +140,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -150,7 +150,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -159,7 +159,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -169,7 +169,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -178,7 +178,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -188,7 +188,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -197,7 +197,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -207,7 +207,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -216,7 +216,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -226,7 +226,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -235,7 +235,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -245,7 +245,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -254,7 +254,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -264,7 +264,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -273,7 +273,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -285,7 +285,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -294,7 +294,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -304,7 +304,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -313,7 +313,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -323,7 +323,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -332,7 +332,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -342,7 +342,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -351,7 +351,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -361,7 +361,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -370,7 +370,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -380,7 +380,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -389,7 +389,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -399,7 +399,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -408,7 +408,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -418,7 +418,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -427,7 +427,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -437,7 +437,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -446,7 +446,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -458,7 +458,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -467,7 +467,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -477,7 +477,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -486,7 +486,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -496,7 +496,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -505,7 +505,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -515,7 +515,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -524,7 +524,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -534,7 +534,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -543,7 +543,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -553,7 +553,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -562,7 +562,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -572,7 +572,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -581,7 +581,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -591,7 +591,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -600,7 +600,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -610,7 +610,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -619,7 +619,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -631,7 +631,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -640,7 +640,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -650,7 +650,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -659,7 +659,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -669,7 +669,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -678,7 +678,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -688,7 +688,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -697,7 +697,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -707,7 +707,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -716,7 +716,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -726,7 +726,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -735,7 +735,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -745,7 +745,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -754,7 +754,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -764,7 +764,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -773,7 +773,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -783,7 +783,7 @@ bool(false) int(0) bool(false) Reading 1024 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -792,7 +792,7 @@ bool(false) int(0) bool(false) Reading 1000 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) diff --git a/ext/standard/tests/file/fread_variation4.phpt b/ext/standard/tests/file/fread_variation4.phpt index 9c94a9932d..953158e594 100644 --- a/ext/standard/tests/file/fread_variation4.phpt +++ b/ext/standard/tests/file/fread_variation4.phpt @@ -110,7 +110,7 @@ echo"Done\n"; int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -118,7 +118,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -127,7 +127,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -135,7 +135,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -144,7 +144,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -152,7 +152,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -161,7 +161,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -169,7 +169,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -178,7 +178,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -186,7 +186,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -195,7 +195,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -203,7 +203,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -212,7 +212,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -220,7 +220,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -229,7 +229,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -237,7 +237,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -246,7 +246,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -254,7 +254,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -265,7 +265,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -273,7 +273,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -282,7 +282,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -290,7 +290,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -299,7 +299,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -307,7 +307,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -316,7 +316,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -324,7 +324,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -333,7 +333,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -341,7 +341,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -350,7 +350,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -358,7 +358,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -367,7 +367,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -375,7 +375,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -384,7 +384,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -392,7 +392,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -401,7 +401,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -409,7 +409,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -420,7 +420,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -428,7 +428,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -437,7 +437,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -445,7 +445,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -454,7 +454,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -462,7 +462,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -471,7 +471,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -479,7 +479,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -488,7 +488,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -496,7 +496,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -505,7 +505,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -513,7 +513,7 @@ bool(false) int(%r1024|1137%r) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(%r1024|1137%r) bool(false) @@ -522,7 +522,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -530,7 +530,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -539,7 +539,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -547,7 +547,7 @@ bool(false) int(1024) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(1024) bool(false) @@ -556,7 +556,7 @@ bool(false) int(0) bool(false) Reading 1030 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(0) bool(false) @@ -564,7 +564,7 @@ bool(false) int(%r1024|1137%r) bool(false) Reading 10 bytes from file, expecting 0 bytes ... -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d OK int(%r1024|1137%r) bool(false) diff --git a/ext/standard/tests/file/fscanf_variation51.phpt b/ext/standard/tests/file/fscanf_variation51.phpt index 712e1e18c7..61530e74b8 100644 --- a/ext/standard/tests/file/fscanf_variation51.phpt +++ b/ext/standard/tests/file/fscanf_variation51.phpt @@ -70,209 +70,209 @@ if(file_exists($filename)) { -- iteration 1 -- -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -- iteration 2 -- -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -- iteration 3 -- -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -- iteration 4 -- -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -- iteration 5 -- -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -- iteration 6 -- -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -- iteration 7 -- -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -- iteration 8 -- -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -- iteration 9 -- -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) -Notice: fscanf(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fscanf(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/fwrite.phpt b/ext/standard/tests/file/fwrite.phpt index f2005d7e68..90e158d048 100644 --- a/ext/standard/tests/file/fwrite.phpt +++ b/ext/standard/tests/file/fwrite.phpt @@ -27,7 +27,7 @@ echo "Done\n"; --EXPECTF-- int(0) -Notice: fwrite(): write of 4 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 4 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) int(4) diff --git a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt index 706c765f8c..92d4a38b05 100644 --- a/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt +++ b/ext/standard/tests/file/fwrite_variation1-win32-mb.phpt @@ -85,13 +85,13 @@ echo "Done\n"; -- Opening file in r -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -101,13 +101,13 @@ string(32) "950b7457d1deb6332f2fc5d42f3129d6" -- Opening file in rb -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -117,13 +117,13 @@ string(32) "950b7457d1deb6332f2fc5d42f3129d6" -- Opening file in rt -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -135,13 +135,13 @@ string(32) "950b7457d1deb6332f2fc5d42f3129d6" -- Opening file in r -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -151,13 +151,13 @@ string(32) "e486000c4c8452774f746a27658d87fa" -- Opening file in rb -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -167,13 +167,13 @@ string(32) "e486000c4c8452774f746a27658d87fa" -- Opening file in rt -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -185,13 +185,13 @@ string(32) "e486000c4c8452774f746a27658d87fa" -- Opening file in r -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -201,13 +201,13 @@ string(32) "b09c8026a64a88d36d4c2f17983964bb" -- Opening file in rb -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -217,13 +217,13 @@ string(32) "b09c8026a64a88d36d4c2f17983964bb" -- Opening file in rt -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -235,13 +235,13 @@ string(32) "b09c8026a64a88d36d4c2f17983964bb" -- Opening file in r -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -251,13 +251,13 @@ string(32) "3fabd48d8eaa65c14e0d93d6880c560c" -- Opening file in rb -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -267,13 +267,13 @@ string(32) "3fabd48d8eaa65c14e0d93d6880c560c" -- Opening file in rt -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) diff --git a/ext/standard/tests/file/fwrite_variation1.phpt b/ext/standard/tests/file/fwrite_variation1.phpt index 20bde9b71a..5ce8c4f2fa 100644 --- a/ext/standard/tests/file/fwrite_variation1.phpt +++ b/ext/standard/tests/file/fwrite_variation1.phpt @@ -77,13 +77,13 @@ echo "Done\n"; -- Opening file in r -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -93,13 +93,13 @@ string(32) "950b7457d1deb6332f2fc5d42f3129d6" -- Opening file in rb -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -109,13 +109,13 @@ string(32) "950b7457d1deb6332f2fc5d42f3129d6" -- Opening file in rt -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -127,13 +127,13 @@ string(32) "950b7457d1deb6332f2fc5d42f3129d6" -- Opening file in r -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -143,13 +143,13 @@ string(32) "e486000c4c8452774f746a27658d87fa" -- Opening file in rb -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -159,13 +159,13 @@ string(32) "e486000c4c8452774f746a27658d87fa" -- Opening file in rt -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -177,13 +177,13 @@ string(32) "e486000c4c8452774f746a27658d87fa" -- Opening file in r -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -193,13 +193,13 @@ string(32) "b09c8026a64a88d36d4c2f17983964bb" -- Opening file in rb -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -209,13 +209,13 @@ string(32) "b09c8026a64a88d36d4c2f17983964bb" -- Opening file in rt -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -227,13 +227,13 @@ string(32) "b09c8026a64a88d36d4c2f17983964bb" -- Opening file in r -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -243,13 +243,13 @@ string(32) "3fabd48d8eaa65c14e0d93d6880c560c" -- Opening file in rb -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) @@ -259,13 +259,13 @@ string(32) "3fabd48d8eaa65c14e0d93d6880c560c" -- Opening file in rt -- int(0) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(0) bool(false) int(2) -Notice: fwrite(): write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fwrite(): Write of 1024 bytes failed with errno=9 Bad file descriptor in %s on line %d bool(false) int(2) bool(false) diff --git a/ext/standard/tests/file/include_userstream_002.phpt b/ext/standard/tests/file/include_userstream_002.phpt index cc1887c446..208248f873 100644 --- a/ext/standard/tests/file/include_userstream_002.phpt +++ b/ext/standard/tests/file/include_userstream_002.phpt @@ -99,8 +99,8 @@ include "test2://hello"; Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_include=0 in %sinclude_userstream_002.php on line 10 -Warning: fopen(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_002.php on line 10 +Warning: fopen(test1://hello): Failed to open stream: no suitable wrapper could be found in %sinclude_userstream_002.php on line 10 -Warning: include(test2://hello): failed to open stream: "test::stream_open" call failed in %sinclude_userstream_002.php on line 89 +Warning: include(test2://hello): Failed to open stream: "test::stream_open" call failed in %sinclude_userstream_002.php on line 89 Warning: include(): Failed opening 'test2://hello' for inclusion (include_path='%s') in %sinclude_userstream_002.php on line 89 diff --git a/ext/standard/tests/file/include_userstream_003.phpt b/ext/standard/tests/file/include_userstream_003.phpt index 71f8920d53..5ffe28a840 100644 --- a/ext/standard/tests/file/include_userstream_003.phpt +++ b/ext/standard/tests/file/include_userstream_003.phpt @@ -98,26 +98,26 @@ Deprecated: Directive 'allow_url_include' is deprecated in Unknown on line 0 Warning: file_get_contents(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 86 -Warning: file_get_contents(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 86 +Warning: file_get_contents(test1://hello): Failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 86 Warning: include(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 87 -Warning: include(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 87 +Warning: include(test1://hello): Failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 87 Warning: include(): Failed opening 'test1://hello' for inclusion (include_path='%s') in %sinclude_userstream_003.php on line 87 Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 10 -Warning: fopen(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 10 +Warning: fopen(test1://hello): Failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 10 -Warning: file_get_contents(test2://hello): failed to open stream: "test::stream_open" call failed in %sinclude_userstream_003.php on line 88 +Warning: file_get_contents(test2://hello): Failed to open stream: "test::stream_open" call failed in %sinclude_userstream_003.php on line 88 Warning: fopen(): test1:// wrapper is disabled in the server configuration by allow_url_fopen=0 in %sinclude_userstream_003.php on line 10 -Warning: fopen(test1://hello): failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 10 +Warning: fopen(test1://hello): Failed to open stream: no suitable wrapper could be found in %sinclude_userstream_003.php on line 10 -Warning: include(test2://hello): failed to open stream: "test::stream_open" call failed in %sinclude_userstream_003.php on line 89 +Warning: include(test2://hello): Failed to open stream: "test::stream_open" call failed in %sinclude_userstream_003.php on line 89 Warning: include(): Failed opening 'test2://hello' for inclusion (include_path='%s') in %sinclude_userstream_003.php on line 89 diff --git a/ext/standard/tests/file/parse_ini_file_error.phpt b/ext/standard/tests/file/parse_ini_file_error.phpt index 5c812d7b9a..41a8f13786 100644 --- a/ext/standard/tests/file/parse_ini_file_error.phpt +++ b/ext/standard/tests/file/parse_ini_file_error.phpt @@ -28,11 +28,11 @@ echo "Done"; -- Testing parse_ini_file() function with more than expected no. of arguments -- -Warning: parse_ini_file(%s): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(%s): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Testing parse_ini_file() function with a non-existent file -- -Warning: parse_ini_file(%s): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(%s): Failed to open stream: No such file or directory in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt index df98a632b4..aac0426e96 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32-mb.phpt @@ -97,12 +97,12 @@ array(1) { -- Iteration 5 -- -Warning: parse_ini_file(%sparseIniFileVar私はガラスを食べられます.dir\parseIniFileVar私はガラスを食べられますSub\..\\\parseIniFileVar私はガラスを食べられますSub\\..\\..\parseIniFileVar私はガラスを食べられますSub\parseIniFileVar私はガラスを食べられます.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(%sparseIniFileVar私はガラスを食べられます.dir\parseIniFileVar私はガラスを食べられますSub\..\\\parseIniFileVar私はガラスを食べられますSub\\..\\..\parseIniFileVar私はガラスを食べられますSub\parseIniFileVar私はガラスを食べられます.ini): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: parse_ini_file(%sparseIniFileVar私はガラスを食べられます.dir\parseIniFileVar私はガラスを食べられますSub\BADDIR\parseIniFileVar私はガラスを食べられます.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(%sparseIniFileVar私はガラスを食べられます.dir\parseIniFileVar私はガラスを食べられますSub\BADDIR\parseIniFileVar私はガラスを食べられます.ini): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -131,7 +131,7 @@ array(1) { -- Iteration 11 -- -Warning: parse_ini_file(BADDIR\parseIniFileVar私はガラスを食べられます.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(BADDIR\parseIniFileVar私はガラスを食べられます.ini): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 12 -- diff --git a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt index 2ef1d88fcc..a0fb9878b3 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6-win32.phpt @@ -97,12 +97,12 @@ array(1) { -- Iteration 5 -- -Warning: parse_ini_file(%sparseIniFileVar6.dir\parseIniFileVar6Sub\..\\\parseIniFileVar6Sub\\..\\..\parseIniFileVar6Sub\ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(%sparseIniFileVar6.dir\parseIniFileVar6Sub\..\\\parseIniFileVar6Sub\\..\\..\parseIniFileVar6Sub\ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: parse_ini_file(%sparseIniFileVar6.dir\parseIniFileVar6Sub\BADDIR\ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(%sparseIniFileVar6.dir\parseIniFileVar6Sub\BADDIR\ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -131,7 +131,7 @@ array(1) { -- Iteration 11 -- -Warning: parse_ini_file(BADDIR\ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(BADDIR\ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 12 -- diff --git a/ext/standard/tests/file/parse_ini_file_variation6.phpt b/ext/standard/tests/file/parse_ini_file_variation6.phpt index 7c6d8ab4cb..e0af048e8b 100644 --- a/ext/standard/tests/file/parse_ini_file_variation6.phpt +++ b/ext/standard/tests/file/parse_ini_file_variation6.phpt @@ -89,12 +89,12 @@ array(1) { -- Iteration 5 -- -Warning: parse_ini_file(%sparseIniFileVar6.dir/parseIniFileVar6Sub/..///parseIniFileVar6Sub//..//../parseIniFileVar6Sub/ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(%sparseIniFileVar6.dir/parseIniFileVar6Sub/..///parseIniFileVar6Sub//..//../parseIniFileVar6Sub/ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 6 -- -Warning: parse_ini_file(%sparseIniFileVar6.dir/parseIniFileVar6Sub/BADDIR/ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(%sparseIniFileVar6.dir/parseIniFileVar6Sub/BADDIR/ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Iteration 7 -- @@ -123,7 +123,7 @@ array(1) { -- Iteration 11 -- -Warning: parse_ini_file(BADDIR/ParseIniFileVar6.ini): failed to open stream: No such file or directory in %s on line %d +Warning: parse_ini_file(BADDIR/ParseIniFileVar6.ini): Failed to open stream: No such file or directory in %s on line %d bool(false) *** Done *** diff --git a/ext/standard/tests/file/php_fd_wrapper_03.phpt b/ext/standard/tests/file/php_fd_wrapper_03.phpt index c004a4319f..75e05620aa 100644 --- a/ext/standard/tests/file/php_fd_wrapper_03.phpt +++ b/ext/standard/tests/file/php_fd_wrapper_03.phpt @@ -11,12 +11,12 @@ echo "\nDone.\n"; --EXPECTF-- Warning: fopen(): Invalid php:// URL specified in %s on line %d -Warning: fopen(php://fd): failed to open stream: operation failed in %s on line 2 +Warning: fopen(php://fd): Failed to open stream: operation failed in %s on line 2 -Warning: fopen(php://fd/): failed to open stream: php://fd/ stream must be specified in the form php://fd/<orig fd> in %s on line %d +Warning: fopen(php://fd/): Failed to open stream: php://fd/ stream must be specified in the form php://fd/<orig fd> in %s on line %d -Warning: fopen(php://fd/-2): failed to open stream: The file descriptors must be non-negative numbers smaller than %d in %s on line %d +Warning: fopen(php://fd/-2): Failed to open stream: The file descriptors must be non-negative numbers smaller than %d in %s on line %d -Warning: fopen(php://fd/1/): failed to open stream: php://fd/ stream must be specified in the form php://fd/<orig fd> in %s on line %d +Warning: fopen(php://fd/1/): Failed to open stream: php://fd/ stream must be specified in the form php://fd/<orig fd> in %s on line %d Done. diff --git a/ext/standard/tests/file/php_fd_wrapper_04.phpt b/ext/standard/tests/file/php_fd_wrapper_04.phpt index ea3a1aff6e..142f70abb4 100644 --- a/ext/standard/tests/file/php_fd_wrapper_04.phpt +++ b/ext/standard/tests/file/php_fd_wrapper_04.phpt @@ -6,6 +6,6 @@ fopen("php://fd/1023", "w"); echo "\nDone.\n"; --EXPECTF-- -Warning: fopen(php://fd/1023): failed to open stream: Error duping file descriptor 1023; possibly it doesn't exist: [9]: %s in %s on line %d +Warning: fopen(php://fd/1023): Failed to open stream: Error duping file descriptor 1023; possibly it doesn't exist: [9]: %s in %s on line %d Done. diff --git a/ext/standard/tests/file/readfile_error.phpt b/ext/standard/tests/file/readfile_error.phpt index 9e5c6e5702..b0ada5ea21 100644 --- a/ext/standard/tests/file/readfile_error.phpt +++ b/ext/standard/tests/file/readfile_error.phpt @@ -38,6 +38,6 @@ bool(false) -- Testing readfile() with non-existent file -- -Warning: readfile(%s/non_existent_file.tmp): failed to open stream: %s in %s on line %d +Warning: readfile(%s/non_existent_file.tmp): Failed to open stream: %s in %s on line %d bool(false) Done diff --git a/ext/standard/tests/file/readfile_variation10-win32.phpt b/ext/standard/tests/file/readfile_variation10-win32.phpt index 88349e18d9..c6c3f87a36 100644 --- a/ext/standard/tests/file/readfile_variation10-win32.phpt +++ b/ext/standard/tests/file/readfile_variation10-win32.phpt @@ -52,11 +52,11 @@ foreach($names_arr as $key => $value) { -- Filename: -1 -- -Warning: readfile(-1): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(-1): Failed to open stream: No such file or directory in %s on line %d -- Filename: TRUE -- -Warning: readfile(1): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(1): Failed to open stream: No such file or directory in %s on line %d -- Filename: FALSE -- @@ -72,7 +72,7 @@ Warning: readfile(): Filename cannot be empty in %s on line %d -- Filename: " " -- -Warning: readfile( ): failed to open stream: Permission denied in %s on line %d +Warning: readfile( ): Failed to open stream: Permission denied in %s on line %d -- Filename: \0 -- readfile() expects parameter 1 to be a valid path, string given @@ -82,8 +82,8 @@ readfile() expects parameter 1 to be a valid path, array given -- Filename: /no/such/file/dir -- -Warning: readfile(/no/such/file/dir): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(/no/such/file/dir): Failed to open stream: No such file or directory in %s on line %d -- Filename: php/php -- -Warning: readfile(php/php): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(php/php): Failed to open stream: No such file or directory in %s on line %d diff --git a/ext/standard/tests/file/readfile_variation10.phpt b/ext/standard/tests/file/readfile_variation10.phpt Binary files differindex 351b03d565..fd501eaef5 100644 --- a/ext/standard/tests/file/readfile_variation10.phpt +++ b/ext/standard/tests/file/readfile_variation10.phpt diff --git a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt index 4ca719266f..acf968d6fd 100644 --- a/ext/standard/tests/file/readfile_variation8-win32-mb.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32-mb.phpt @@ -86,11 +86,11 @@ The File Contents The File Contents -- %s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\..\\\readfileVar私はガラスを食べられます8Sub\\..\\..\readfileVar私はガラスを食べられます8Sub -- -Warning: readfile(%s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\..\\\readfileVar私はガラスを食べられます8Sub\\..\\..\readfileVar私はガラスを食べられます8Sub\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(%s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\..\\\readfileVar私はガラスを食べられます8Sub\\..\\..\readfileVar私はガラスを食べられます8Sub\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d -- %s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\BADDIR -- -Warning: readfile(%s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\BADDIR\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(%s\readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub\BADDIR\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d -- readfileVar私はガラスを食べられます8\readfileVar私はガラスを食べられます8Sub -- The File Contents @@ -102,7 +102,7 @@ The File Contents The File Contents -- BADDIR -- -Warning: readfile(BADDIR\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(BADDIR\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d -- /%s/readfileVar私はガラスを食べられます8/readfileVar私はガラスを食べられます8Sub -- The File Contents diff --git a/ext/standard/tests/file/readfile_variation8-win32.phpt b/ext/standard/tests/file/readfile_variation8-win32.phpt index c914786407..ebd15ae618 100644 --- a/ext/standard/tests/file/readfile_variation8-win32.phpt +++ b/ext/standard/tests/file/readfile_variation8-win32.phpt @@ -86,11 +86,11 @@ The File Contents The File Contents -- %s\readfileVar8\readfileVar8Sub\..\\\readfileVar8Sub\\..\\..\readfileVar8Sub -- -Warning: readfile(%s\readfileVar8\readfileVar8Sub\..\\\readfileVar8Sub\\..\\..\readfileVar8Sub\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(%s\readfileVar8\readfileVar8Sub\..\\\readfileVar8Sub\\..\\..\readfileVar8Sub\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d -- %s\readfileVar8\readfileVar8Sub\BADDIR -- -Warning: readfile(%s\readfileVar8\readfileVar8Sub\BADDIR\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(%s\readfileVar8\readfileVar8Sub\BADDIR\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d -- readfileVar8\readfileVar8Sub -- The File Contents @@ -102,7 +102,7 @@ The File Contents The File Contents -- BADDIR -- -Warning: readfile(BADDIR\fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(BADDIR\fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d -- /%s/readfileVar8/readfileVar8Sub -- The File Contents diff --git a/ext/standard/tests/file/readfile_variation9.phpt b/ext/standard/tests/file/readfile_variation9.phpt index 1d536e61f1..a6ca560d6d 100644 --- a/ext/standard/tests/file/readfile_variation9.phpt +++ b/ext/standard/tests/file/readfile_variation9.phpt @@ -78,11 +78,11 @@ The File Contents The File Contents -- Iteration 5 -- -Warning: readfile(%sreadfileVar8Sub/..///readfileVar8Sub//..//../readfileVar8Sub/fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(%sreadfileVar8Sub/..///readfileVar8Sub//..//../readfileVar8Sub/fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d -- Iteration 6 -- -Warning: readfile(%sreadfileVar8Sub/BADDIR/fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(%sreadfileVar8Sub/BADDIR/fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d -- Iteration 7 -- The File Contents @@ -94,6 +94,6 @@ The File Contents The File Contents -- Iteration 11 -- -Warning: readfile(BADDIR/fileToRead.tmp): failed to open stream: No such file or directory in %s on line %d +Warning: readfile(BADDIR/fileToRead.tmp): Failed to open stream: No such file or directory in %s on line %d *** Done *** diff --git a/ext/standard/tests/file/stream_001.phpt b/ext/standard/tests/file/stream_001.phpt index 6e692c554a..6a203c6772 100644 --- a/ext/standard/tests/file/stream_001.phpt +++ b/ext/standard/tests/file/stream_001.phpt @@ -17,7 +17,7 @@ Warning: fopen(): Unable to find the wrapper "file" - did you forget to enable i Warning: fopen(): file:// wrapper is disabled in the server configuration in %s on line %d -Warning: fopen(file://%s): failed to open stream: no suitable wrapper could be found in %s on line %d +Warning: fopen(file://%s): Failed to open stream: no suitable wrapper could be found in %s on line %d bool(false) bool(true) resource(%d) of type (stream) diff --git a/ext/standard/tests/file/stream_002.phpt b/ext/standard/tests/file/stream_002.phpt index 84f3b78f06..4aab2240ee 100644 --- a/ext/standard/tests/file/stream_002.phpt +++ b/ext/standard/tests/file/stream_002.phpt @@ -19,27 +19,27 @@ var_dump($a, $b); echo "Done\n"; ?> --EXPECTF-- -Warning: stream_socket_client(): unable to connect to (Failed to parse address "") in %s on line %d +Warning: stream_socket_client(): Unable to connect to (Failed to parse address "") in %s on line %d bool(false) int(0) string(26) "Failed to parse address """ -Warning: stream_socket_client(): unable to connect to [ (Failed to parse address "[") in %s on line %d +Warning: stream_socket_client(): Unable to connect to [ (Failed to parse address "[") in %s on line %d bool(false) int(0) string(27) "Failed to parse address "["" -Warning: stream_socket_client(): unable to connect to [ (Failed to parse%saddress "[ ") in %s on line %d +Warning: stream_socket_client(): Unable to connect to [ (Failed to parse%saddress "[ ") in %s on line %d bool(false) int(0) string(%d) "Failed to parse%saddress "[ "" -Warning: stream_socket_client(): unable to connect to . (Failed to parse address ".") in %s on line %d +Warning: stream_socket_client(): Unable to connect to . (Failed to parse address ".") in %s on line %d bool(false) int(0) string(27) "Failed to parse address "."" -Warning: stream_socket_client(): unable to connect to 1 (Failed to parse address "1") in %s on line %d +Warning: stream_socket_client(): Unable to connect to 1 (Failed to parse address "1") in %s on line %d bool(false) int(0) string(27) "Failed to parse address "1"" diff --git a/ext/standard/tests/file/stream_rfc2397_002.phpt b/ext/standard/tests/file/stream_rfc2397_002.phpt index 9ec21fb90a..162f1ea9ea 100644 --- a/ext/standard/tests/file/stream_rfc2397_002.phpt +++ b/ext/standard/tests/file/stream_rfc2397_002.phpt @@ -51,7 +51,7 @@ array(7) { } NULL -Warning: fopen(data://): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d +Warning: fopen(data://): Failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d array(7) { ["base64"]=> bool(true) @@ -70,11 +70,11 @@ array(7) { } NULL -Warning: fopen(data://;base64): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d +Warning: fopen(data://;base64): Failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d -Warning: fopen(data://foo,): failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d +Warning: fopen(data://foo,): Failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d -Warning: fopen(data://foo=bar,): failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d +Warning: fopen(data://foo=bar,): Failed to open stream: rfc2397: illegal media type in %sstream_rfc2397_002.php on line %d array(8) { ["mediatype"]=> string(10) "text/plain" @@ -95,7 +95,7 @@ array(8) { } NULL -Warning: fopen(data://text/plain;foo,): failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d +Warning: fopen(data://text/plain;foo,): Failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d array(9) { ["mediatype"]=> string(10) "text/plain" @@ -118,7 +118,7 @@ array(9) { } string(3) "bar" -Warning: fopen(data://text/plain;foo=bar;bla,): failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d +Warning: fopen(data://text/plain;foo=bar;bla,): Failed to open stream: rfc2397: illegal parameter in %sstream_rfc2397_002.php on line %d array(9) { ["mediatype"]=> string(10) "text/plain" @@ -141,7 +141,7 @@ array(9) { } string(3) "bar" -Warning: fopen(data://text/plain;foo=bar;bar=baz): failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d +Warning: fopen(data://text/plain;foo=bar;bar=baz): Failed to open stream: rfc2397: no comma in URL in %sstream_rfc2397_002.php on line %d array(10) { ["mediatype"]=> string(10) "text/plain" diff --git a/ext/standard/tests/file/stream_rfc2397_006.phpt b/ext/standard/tests/file/stream_rfc2397_006.phpt index bc959bb3a9..7caf1b666e 100644 --- a/ext/standard/tests/file/stream_rfc2397_006.phpt +++ b/ext/standard/tests/file/stream_rfc2397_006.phpt @@ -26,8 +26,8 @@ foreach($streams as $stream) file_get_contents() expects parameter 1 to be a valid path, string given file_get_contents() expects parameter 1 to be a valid path, string given -Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhcg==): failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d +Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhcg==): Failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d bool(false) -Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhc=): failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d +Warning: file_get_contents(data:;base64,#Zm9vYmFyIGZvb2Jhc=): Failed to open stream: rfc2397: unable to decode in %sstream_rfc2397_006.php on line %d bool(false) diff --git a/ext/standard/tests/file/userstreams_002.phpt b/ext/standard/tests/file/userstreams_002.phpt index 41aad59b5d..b625e46f26 100644 --- a/ext/standard/tests/file/userstreams_002.phpt +++ b/ext/standard/tests/file/userstreams_002.phpt @@ -54,33 +54,33 @@ bool(true) Warning: stream_select(): test_wrapper_base::stream_cast is not implemented! in %s -Warning: stream_select(): cannot represent a stream of type user-space as a select()able descriptor in %s +Warning: stream_select(): Cannot represent a stream of type user-space as a select()able descriptor in %s No stream arrays were passed ------ return value is false: ------- -Warning: stream_select(): cannot represent a stream of type user-space as a select()able descriptor in %s +Warning: stream_select(): Cannot represent a stream of type user-space as a select()able descriptor in %s No stream arrays were passed ------ return value not a stream resource: ------- Warning: stream_select(): test_wrapper::stream_cast must return a stream resource in %s -Warning: stream_select(): cannot represent a stream of type user-space as a select()able descriptor in %s +Warning: stream_select(): Cannot represent a stream of type user-space as a select()able descriptor in %s No stream arrays were passed ------ return value is stream itself: ------- Warning: stream_select(): test_wrapper::stream_cast must not return itself in %s -Warning: stream_select(): cannot represent a stream of type user-space as a select()able descriptor in %s +Warning: stream_select(): Cannot represent a stream of type user-space as a select()able descriptor in %s No stream arrays were passed ------ return value cannot be casted: ------- Warning: stream_select(): test_wrapper_base::stream_cast is not implemented! in %s -Warning: stream_select(): cannot represent a stream of type user-space as a select()able descriptor in %s +Warning: stream_select(): Cannot represent a stream of type user-space as a select()able descriptor in %s -Warning: stream_select(): cannot represent a stream of type user-space as a select()able descriptor in %s +Warning: stream_select(): Cannot represent a stream of type user-space as a select()able descriptor in %s No stream arrays were passed diff --git a/ext/standard/tests/filters/bug35916.phpt b/ext/standard/tests/filters/bug35916.phpt index 578e462bd9..a890b41a57 100644 --- a/ext/standard/tests/filters/bug35916.phpt +++ b/ext/standard/tests/filters/bug35916.phpt @@ -39,6 +39,6 @@ unlink($file); --EXPECTF-- fffffffffff -Notice: fread(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: fread(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d hello THANK YOU diff --git a/ext/standard/tests/filters/filter_errors_convert_base64_decode.phpt b/ext/standard/tests/filters/filter_errors_convert_base64_decode.phpt index 4c043be3b6..1264cada03 100644 --- a/ext/standard/tests/filters/filter_errors_convert_base64_decode.phpt +++ b/ext/standard/tests/filters/filter_errors_convert_base64_decode.phpt @@ -10,9 +10,9 @@ filter_errors_test('convert.base64-decode', '==='); --EXPECTF-- test filtering of buffered data -Warning: stream_filter_append(): stream filter (convert.base64-decode): invalid byte sequence in %s +Warning: stream_filter_append(): Stream filter (convert.base64-decode): invalid byte sequence in %s Warning: stream_filter_append(): Filter failed to process pre-buffered data in %s test filtering of non buffered data -Warning: stream_get_contents(): stream filter (convert.base64-decode): invalid byte sequence in %s +Warning: stream_get_contents(): Stream filter (convert.base64-decode): invalid byte sequence in %s diff --git a/ext/standard/tests/filters/object_init_failure.phpt b/ext/standard/tests/filters/object_init_failure.phpt index 8175bbe44b..6375969e03 100644 --- a/ext/standard/tests/filters/object_init_failure.phpt +++ b/ext/standard/tests/filters/object_init_failure.phpt @@ -13,7 +13,7 @@ try { } ?> --EXPECTF-- -Warning: file_get_contents(): unable to create or locate filter "sample.filter" in %s on line %d +Warning: file_get_contents(): Unable to create or locate filter "sample.filter" in %s on line %d Warning: file_get_contents(): Unable to create filter (sample.filter) in %s on line %d Undefined constant 'FOO' diff --git a/ext/standard/tests/filters/object_init_failure_2.phpt b/ext/standard/tests/filters/object_init_failure_2.phpt index a3ff299520..251ebf519c 100644 --- a/ext/standard/tests/filters/object_init_failure_2.phpt +++ b/ext/standard/tests/filters/object_init_failure_2.phpt @@ -13,7 +13,7 @@ try { } ?> --EXPECTF-- -Warning: main(): unable to create or locate filter "sample.filter" in %s on line %d +Warning: main(): Unable to create or locate filter "sample.filter" in %s on line %d Warning: main(): Unable to create filter (sample.filter) in %s on line %d Undefined constant 'FOO' diff --git a/ext/standard/tests/general_functions/bug44295.phpt b/ext/standard/tests/general_functions/bug44295.phpt index c9744e64dd..12cfb819a4 100644 --- a/ext/standard/tests/general_functions/bug44295.phpt +++ b/ext/standard/tests/general_functions/bug44295.phpt @@ -25,5 +25,5 @@ try { <?php exit(0); ?> --EXPECT-- before -in catch: DirectoryIterator::__construct(/this/path/does/not/exist): failed to open dir: No such file or directory +in catch: DirectoryIterator::__construct(/this/path/does/not/exist): Failed to open directory: No such file or directory ==DONE== diff --git a/ext/standard/tests/general_functions/ob_get_flush_error.phpt b/ext/standard/tests/general_functions/ob_get_flush_error.phpt index d070c50c60..c45e810841 100644 --- a/ext/standard/tests/general_functions/ob_get_flush_error.phpt +++ b/ext/standard/tests/general_functions/ob_get_flush_error.phpt @@ -19,5 +19,5 @@ var_dump( ob_get_flush() ); --EXPECTF-- *** Testing ob_get_flush() : error conditions *** -Notice: ob_get_flush(): failed to delete and flush buffer. No buffer to delete or flush in %s on line %d +Notice: ob_get_flush(): Failed to delete and flush buffer. No buffer to delete or flush in %s on line %d bool(false) diff --git a/ext/standard/tests/general_functions/parse_ini_file.phpt b/ext/standard/tests/general_functions/parse_ini_file.phpt index 201bb481fc..8b0db68a54 100644 --- a/ext/standard/tests/general_functions/parse_ini_file.phpt +++ b/ext/standard/tests/general_functions/parse_ini_file.phpt @@ -119,10 +119,10 @@ var_dump(parse_ini_file($filename, true)); echo "Done\n"; ?> --EXPECTF-- -Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such file or directory in %sparse_ini_file.php on line %d +Warning: parse_ini_file(%sparse_ini_file.dat): Failed to open stream: No such file or directory in %sparse_ini_file.php on line %d bool(false) -Warning: parse_ini_file(%sparse_ini_file.dat): failed to open stream: No such file or directory in %sparse_ini_file.php on line %d +Warning: parse_ini_file(%sparse_ini_file.dat): Failed to open stream: No such file or directory in %sparse_ini_file.php on line %d bool(false) array(1) { ["test"]=> diff --git a/ext/standard/tests/general_functions/proc_open_pipes3.phpt b/ext/standard/tests/general_functions/proc_open_pipes3.phpt index b83a0e1a07..0cb9f03eb8 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes3.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes3.phpt @@ -44,7 +44,7 @@ array(4) { resource(%d) of type (Unknown) } -Warning: proc_open(test): failed to open stream: %s in %s on line %d +Warning: proc_open(test): Failed to open stream: %s in %s on line %d array(4) { [3]=> resource(%d) of type (Unknown) diff --git a/ext/standard/tests/http/bug38802.phpt b/ext/standard/tests/http/bug38802.phpt index 5e9fd10273..53a607655d 100644 --- a/ext/standard/tests/http/bug38802.phpt +++ b/ext/standard/tests/http/bug38802.phpt @@ -105,7 +105,7 @@ Connection: close " -- Test: fail after 2 redirections -- -Warning: fopen(http://127.0.0.1:12342/foo/bar): failed to open stream: Redirection limit reached, aborting in %s +Warning: fopen(http://127.0.0.1:12342/foo/bar): Failed to open stream: Redirection limit reached, aborting in %s bool(false) string(%d) "GET /foo/bar HTTP/1.0 Host: 127.0.0.1:12342 @@ -118,7 +118,7 @@ Connection: close " -- Test: fail at first redirection -- -Warning: fopen(http://127.0.0.1:12342/foo/bar): failed to open stream: Redirection limit reached, aborting in %s +Warning: fopen(http://127.0.0.1:12342/foo/bar): Failed to open stream: Redirection limit reached, aborting in %s bool(false) string(%d) "GET /foo/bar HTTP/1.0 Host: 127.0.0.1:12342 @@ -127,7 +127,7 @@ Connection: close " -- Test: fail at first redirection (2) -- -Warning: fopen(http://127.0.0.1:12342/foo/bar): failed to open stream: Redirection limit reached, aborting in %s +Warning: fopen(http://127.0.0.1:12342/foo/bar): Failed to open stream: Redirection limit reached, aborting in %s bool(false) string(%d) "GET /foo/bar HTTP/1.0 Host: 127.0.0.1:12342 diff --git a/ext/standard/tests/http/bug60570.phpt b/ext/standard/tests/http/bug60570.phpt index 5996df369a..b72011d5e2 100644 --- a/ext/standard/tests/http/bug60570.phpt +++ b/ext/standard/tests/http/bug60570.phpt @@ -38,13 +38,13 @@ function do_test() { do_test(); --EXPECTF-- -Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found +Warning: file_get_contents(http://127.0.0.1:12342/): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found in %s on line %d -Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found +Warning: file_get_contents(http://127.0.0.1:12342/): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found in %s on line %d -Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found +Warning: file_get_contents(http://127.0.0.1:12342/): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found in %s on line %d leak? penultimate iteration: %d, last one: %d bool(true) diff --git a/ext/standard/tests/http/bug69337.phpt b/ext/standard/tests/http/bug69337.phpt index 223a4def7d..c9c2a199dd 100644 --- a/ext/standard/tests/http/bug69337.phpt +++ b/ext/standard/tests/http/bug69337.phpt @@ -33,5 +33,5 @@ http_server_kill($pid); var_dump($f); ?> --EXPECTF-- -Warning: file_get_contents(http://127.0.0.1:22345/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%ain %s on line %d +Warning: file_get_contents(http://127.0.0.1:22345/): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%ain %s on line %d bool(false) diff --git a/ext/standard/tests/http/bug76342.phpt b/ext/standard/tests/http/bug76342.phpt index ee943ca365..10de23fdf3 100644 --- a/ext/standard/tests/http/bug76342.phpt +++ b/ext/standard/tests/http/bug76342.phpt @@ -31,5 +31,5 @@ http_server_kill($pid); ?> DONE --EXPECTF-- -Warning: file_get_contents(http://127.0.0.1:12342/): failed to open stream: HTTP request failed! in %s on line %d +Warning: file_get_contents(http://127.0.0.1:12342/): Failed to open stream: HTTP request failed! in %s on line %d DONE diff --git a/ext/standard/tests/http/http_response_header_03.phpt b/ext/standard/tests/http/http_response_header_03.phpt index dedd2c3550..1b743259ad 100644 --- a/ext/standard/tests/http/http_response_header_03.phpt +++ b/ext/standard/tests/http/http_response_header_03.phpt @@ -26,7 +26,7 @@ test(); http_server_kill($pid); ?> --EXPECTF-- -Warning: file_get_contents(http://127.0.0.1:22348/): failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%a +Warning: file_get_contents(http://127.0.0.1:22348/): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not Found%a bool(false) array(5) { [0]=> diff --git a/ext/standard/tests/http/ignore_errors.phpt b/ext/standard/tests/http/ignore_errors.phpt index 54a0073b5e..176d6dd2ce 100644 --- a/ext/standard/tests/http/ignore_errors.phpt +++ b/ext/standard/tests/http/ignore_errors.phpt @@ -68,7 +68,7 @@ Connection: close " -Warning: fopen(http://127.0.0.1:12342/foo/bar): failed to open stream: HTTP request failed! HTTP/1.0 404 Not found +Warning: fopen(http://127.0.0.1:12342/foo/bar): Failed to open stream: HTTP request failed! HTTP/1.0 404 Not found in %s on line %d bool(false) string(%d) "GET /foo/bar HTTP/1.0 diff --git a/ext/standard/tests/image/bug13213.phpt b/ext/standard/tests/image/bug13213.phpt index 7af1549586..61fe245efe 100644 --- a/ext/standard/tests/image/bug13213.phpt +++ b/ext/standard/tests/image/bug13213.phpt @@ -5,7 +5,7 @@ Bug #13213 (GetImageSize and wrong JPEG Comments) var_dump(GetImageSize(__DIR__.'/bug13213.jpg')); ?> --EXPECTF-- -Warning: getimagesize(): corrupt JPEG data: 2 extraneous bytes before marker in %s%ebug13213.php on line %d +Warning: getimagesize(): Corrupt JPEG data: 2 extraneous bytes before marker in %s%ebug13213.php on line %d array(7) { [0]=> int(1) diff --git a/ext/standard/tests/image/bug72278.phpt b/ext/standard/tests/image/bug72278.phpt index 292aaf0952..074338c18a 100644 --- a/ext/standard/tests/image/bug72278.phpt +++ b/ext/standard/tests/image/bug72278.phpt @@ -7,7 +7,7 @@ define('FILENAME', __DIR__ . DIRECTORY_SEPARATOR . 'bug72278.jpg'); var_dump(getimagesize(FILENAME)); ?> --EXPECTF-- -Warning: getimagesize(): corrupt JPEG data: 3 extraneous bytes before marker in %s%ebug72278.php on line %d +Warning: getimagesize(): Corrupt JPEG data: 3 extraneous bytes before marker in %s%ebug72278.php on line %d array(7) { [0]=> int(300) diff --git a/ext/standard/tests/image/getimagesize_variation3.phpt b/ext/standard/tests/image/getimagesize_variation3.phpt index 20efd1afbc..f65869af9e 100644 --- a/ext/standard/tests/image/getimagesize_variation3.phpt +++ b/ext/standard/tests/image/getimagesize_variation3.phpt @@ -49,10 +49,10 @@ array(0) { -- Non-existent file (nofile.ext) -- -Warning: getimagesize(%snofile.ext): failed to open stream: No such file or directory in %s on line %d +Warning: getimagesize(%snofile.ext): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: getimagesize(%snofile.ext): failed to open stream: No such file or directory in %s on line %d +Warning: getimagesize(%snofile.ext): Failed to open stream: No such file or directory in %s on line %d bool(false) array(0) { } diff --git a/ext/standard/tests/network/bug74764.phpt b/ext/standard/tests/network/bug74764.phpt index e946167008..7357f1c6f5 100644 --- a/ext/standard/tests/network/bug74764.phpt +++ b/ext/standard/tests/network/bug74764.phpt @@ -19,6 +19,6 @@ $context = stream_context_create( $socket = stream_socket_client('tcp://localhost:1443', $errno, $errstr, 5, STREAM_CLIENT_CONNECT, $context); ?> --EXPECTF-- -Warning: stream_socket_client(): unable to connect to tcp://localhost:1443 (%s) in %s on line %d +Warning: stream_socket_client(): Unable to connect to tcp://localhost:1443 (%s) in %s on line %d -Warning: stream_socket_client(): unable to connect to tcp://localhost:1443 (%s) in %s on line %d +Warning: stream_socket_client(): Unable to connect to tcp://localhost:1443 (%s) in %s on line %d diff --git a/ext/standard/tests/network/fsockopen_error.phpt b/ext/standard/tests/network/fsockopen_error.phpt index ea08335f2d..d5b6944192 100644 --- a/ext/standard/tests/network/fsockopen_error.phpt +++ b/ext/standard/tests/network/fsockopen_error.phpt @@ -36,13 +36,13 @@ echo "Done"; -- Attempting to connect to a non-existent socket -- -Warning: fsockopen(): unable to connect to tcp://127.0.0.1:31337 (%a) in %s on line %d +Warning: fsockopen(): Unable to connect to tcp://127.0.0.1:31337 (%a) in %s on line %d bool(false) string(%d) "%a" -- Attempting to connect using an invalid protocol -- -Warning: fsockopen(): unable to connect to invalid://127.0.0.1:31337 (Unable to find the socket transport "invalid" - did you forget to enable it when you configured PHP?) in %s on line %d +Warning: fsockopen(): Unable to connect to invalid://127.0.0.1:31337 (Unable to find the socket transport "invalid" - did you forget to enable it when you configured PHP?) in %s on line %d bool(false) string(100) "Unable to find the socket transport "invalid" - did you forget to enable it when you configured PHP?" Done diff --git a/ext/standard/tests/serialize/bug69152.phpt b/ext/standard/tests/serialize/bug69152.phpt index abd0281a12..b11591ffc2 100644 --- a/ext/standard/tests/serialize/bug69152.phpt +++ b/ext/standard/tests/serialize/bug69152.phpt @@ -9,6 +9,6 @@ $x->test(); ?> --EXPECTF-- -Fatal error: Uncaught TypeError: trace is not an array in %s:%d +Fatal error: Uncaught TypeError: Trace is not an array in %s:%d %a thrown in %s on line %d diff --git a/ext/standard/tests/streams/bug49936_win32.phpt b/ext/standard/tests/streams/bug49936_win32.phpt index 594fcae4be..0f0ef4feb1 100644 --- a/ext/standard/tests/streams/bug49936_win32.phpt +++ b/ext/standard/tests/streams/bug49936_win32.phpt @@ -20,11 +20,11 @@ var_dump(opendir($dir)); Warning: opendir(): connect() failed: %s in %s on line %d -Warning: opendir(ftp://...@localhost/): failed to open dir: operation failed in %s on line %d +Warning: opendir(ftp://...@localhost/): Failed to open directory: operation failed in %s on line %d bool(false) Warning: opendir(): connect() failed: %s in %s on line %d -Warning: opendir(ftp://...@localhost/): failed to open dir: operation failed in %s on line %d +Warning: opendir(ftp://...@localhost/): Failed to open directory: operation failed in %s on line %d bool(false) diff --git a/ext/standard/tests/streams/bug54946.phpt b/ext/standard/tests/streams/bug54946.phpt index d057766ff2..3be2a1367b 100644 --- a/ext/standard/tests/streams/bug54946.phpt +++ b/ext/standard/tests/streams/bug54946.phpt @@ -31,11 +31,11 @@ fclose($stream); unlink($filename); ?> --EXPECTF-- -Notice: stream_get_contents(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: stream_get_contents(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d string(0) "" -Notice: stream_get_contents(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: stream_get_contents(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d string(0) "" -Notice: stream_get_contents(): read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d +Notice: stream_get_contents(): Read of 8192 bytes failed with errno=9 Bad file descriptor in %s on line %d string(0) "" diff --git a/ext/standard/tests/streams/bug72771.phpt b/ext/standard/tests/streams/bug72771.phpt index 1b94b334e4..335f7934ce 100644 --- a/ext/standard/tests/streams/bug72771.phpt +++ b/ext/standard/tests/streams/bug72771.phpt @@ -17,5 +17,5 @@ $ds=opendir($path, $context); var_dump($ds); ?> --EXPECTF-- -Warning: opendir(ftps://127.0.0.1:%d/): failed to open dir: Server doesn't support FTPS. in %s on line %d +Warning: opendir(ftps://127.0.0.1:%d/): Failed to open directory: Server doesn't support FTPS. in %s on line %d bool(false) diff --git a/ext/standard/tests/streams/bug73457.phpt b/ext/standard/tests/streams/bug73457.phpt index f60d65385e..f0f709e1aa 100644 --- a/ext/standard/tests/streams/bug73457.phpt +++ b/ext/standard/tests/streams/bug73457.phpt @@ -17,5 +17,5 @@ $ds=file_get_contents($path); var_dump($ds); ?> --EXPECTF-- -Warning: file_get_contents(ftp://127.0.0.1:%d/bug73457): failed to open stream: Failed to set up data channel: Connection refused in %s on line %d +Warning: file_get_contents(ftp://127.0.0.1:%d/bug73457): Failed to open stream: Failed to set up data channel: Connection refused in %s on line %d bool(false) diff --git a/ext/standard/tests/streams/bug74951.phpt b/ext/standard/tests/streams/bug74951.phpt index b45bee7c3b..ccfd302a1c 100644 --- a/ext/standard/tests/streams/bug74951.phpt +++ b/ext/standard/tests/streams/bug74951.phpt @@ -9,4 +9,4 @@ trait Stream00ploiter{ stream_wrapper_register('e0ploit','Stream00ploiter'); $s=fopen('e0ploit://',0); --EXPECTF-- -Warning: fopen(e0ploit://): failed to open stream: operation failed in %s%ebug74951.php on line 7 +Warning: fopen(e0ploit://): Failed to open stream: operation failed in %s%ebug74951.php on line 7 diff --git a/ext/standard/tests/streams/glob-wrapper.phpt b/ext/standard/tests/streams/glob-wrapper.phpt index 0e4438fdcc..331ed3e9b6 100644 --- a/ext/standard/tests/streams/glob-wrapper.phpt +++ b/ext/standard/tests/streams/glob-wrapper.phpt @@ -25,11 +25,11 @@ foreach ( [ __DIR__, "glob://".__DIR__ ] as $spec) { Warning: opendir(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (/does_not_exist) in %s%eglob-wrapper.php on line 5 -Warning: opendir(%s): failed to open dir: Operation not permitted in %s%eglob-wrapper.php on line 5 +Warning: opendir(%s): Failed to open directory: Operation not permitted in %s%eglob-wrapper.php on line 5 Failed to open %s ** Opening glob://%s Warning: opendir(): open_basedir restriction in effect. File(%s) is not within the allowed path(s): (/does_not_exist) in %s%eglob-wrapper.php on line 5 -Warning: opendir(glob://%s): failed to open dir: operation failed in %s%eglob-wrapper.php on line 5 +Warning: opendir(glob://%s): Failed to open directory: operation failed in %s%eglob-wrapper.php on line 5 Failed to open glob://%s diff --git a/ext/standard/tests/streams/opendir-001.phpt b/ext/standard/tests/streams/opendir-001.phpt index 5659d57920..7fa9bbfd7b 100644 --- a/ext/standard/tests/streams/opendir-001.phpt +++ b/ext/standard/tests/streams/opendir-001.phpt @@ -15,6 +15,6 @@ $path="ftp://localhost:" . $port."/bogusdir"; var_dump(opendir($path)); ?> --EXPECTF-- -Warning: opendir(ftp://localhost:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory +Warning: opendir(ftp://localhost:%d/bogusdir): Failed to open directory: FTP server reports 250 /bogusdir: No such file or directory in %s on line %d bool(false) diff --git a/ext/standard/tests/streams/opendir-003.phpt b/ext/standard/tests/streams/opendir-003.phpt index 0d9f656261..ab8f670680 100644 --- a/ext/standard/tests/streams/opendir-003.phpt +++ b/ext/standard/tests/streams/opendir-003.phpt @@ -19,6 +19,6 @@ $context = stream_context_create(array('ssl' => array('cafile' => __DIR__ . '/. var_dump(opendir($path, $context)); ?> --EXPECTF-- -Warning: opendir(ftps://127.0.0.1:%d/bogusdir): failed to open dir: FTP server reports 250 /bogusdir: No such file or directory +Warning: opendir(ftps://127.0.0.1:%d/bogusdir): Failed to open directory: FTP server reports 250 /bogusdir: No such file or directory in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/006.phpt b/ext/standard/tests/strings/006.phpt index 4c83d93c5e..5f36d9aa8d 100644 --- a/ext/standard/tests/strings/006.phpt +++ b/ext/standard/tests/strings/006.phpt @@ -12,7 +12,7 @@ var_dump(ob_get_contents()); ?> --EXPECTF-- -Warning: highlight_file(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): failed to open stream: %s006.php on line %d +Warning: highlight_file(AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA): Failed to open stream: %s006.php on line %d Warning: highlight_file(): Failed opening 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' for highlighting in %s006.php on line %d bool(false) diff --git a/ext/standard/tests/strings/007-win32.phpt b/ext/standard/tests/strings/007-win32.phpt index 665a45bf0f..4dce8f0e13 100644 --- a/ext/standard/tests/strings/007-win32.phpt +++ b/ext/standard/tests/strings/007-win32.phpt @@ -13,6 +13,6 @@ var_dump(ob_get_contents()); ?> --EXPECTF-- -Warning: php_strip_whitespace(%s): failed to open stream: No such file or directory in %s on line %d +Warning: php_strip_whitespace(%s): Failed to open stream: No such file or directory in %s on line %d string(0) "" bool(false) diff --git a/ext/standard/tests/strings/007.phpt b/ext/standard/tests/strings/007.phpt index 91b6edb717..ecbab6d2e6 100644 --- a/ext/standard/tests/strings/007.phpt +++ b/ext/standard/tests/strings/007.phpt @@ -13,6 +13,6 @@ var_dump(ob_get_contents()); ?> --EXPECTF-- -Warning: php_strip_whitespace(%s): failed to open stream: File name too long in %s007.php on line %d +Warning: php_strip_whitespace(%s): Failed to open stream: File name too long in %s007.php on line %d string(0) "" bool(false) diff --git a/ext/standard/tests/strings/bug68996.phpt b/ext/standard/tests/strings/bug68996.phpt index 3f1e6c4929..bd5be022fd 100644 --- a/ext/standard/tests/strings/bug68996.phpt +++ b/ext/standard/tests/strings/bug68996.phpt @@ -8,4 +8,4 @@ fopen("\xfc\x63", "r"); ?> --EXPECTF-- <br /> -<b>Warning</b>: : failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br /> +<b>Warning</b>: : Failed to open stream: No such file or directory in <b>%sbug68996.php</b> on line <b>%d</b><br /> diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt index 895e53358c..ac78aa38fd 100644 --- a/ext/standard/tests/strings/highlight_file.phpt +++ b/ext/standard/tests/strings/highlight_file.phpt @@ -38,7 +38,7 @@ echo "Done\n"; --EXPECTF-- Deprecated: Directive 'allow_url_include' is deprecated in Unknown on line 0 -Warning: highlight_file(%shighlight_file.dat): failed to open stream: No such file or directory in %s on line %d +Warning: highlight_file(%shighlight_file.dat): Failed to open stream: No such file or directory in %s on line %d Warning: highlight_file(): Failed opening '%shighlight_file.dat' for highlighting in %s on line %d bool(false) diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt Binary files differindex e56987cd6a..200bb3b739 100644 --- a/ext/standard/tests/strings/md5_file.phpt +++ b/ext/standard/tests/strings/md5_file.phpt diff --git a/ext/standard/tests/strings/php_strip_whitespace.phpt b/ext/standard/tests/strings/php_strip_whitespace.phpt index 5fb314c168..cdc599fc91 100644 --- a/ext/standard/tests/strings/php_strip_whitespace.phpt +++ b/ext/standard/tests/strings/php_strip_whitespace.phpt @@ -39,7 +39,7 @@ var_dump(php_strip_whitespace($filename)); echo "Done\n"; ?> --EXPECTF-- -Warning: php_strip_whitespace(%sphp_strip_whitespace.dat): failed to open stream: No such file or directory in %s on line %d +Warning: php_strip_whitespace(%sphp_strip_whitespace.dat): Failed to open stream: No such file or directory in %s on line %d string(0) "" string(18) "/* test comment */" string(9) "<?php ?>" diff --git a/ext/standard/tests/strings/sha1.phpt b/ext/standard/tests/strings/sha1.phpt index 1dc73881ef..4473598d06 100644 --- a/ext/standard/tests/strings/sha1.phpt +++ b/ext/standard/tests/strings/sha1.phpt @@ -47,5 +47,5 @@ bool(true) string(20) "%a" string(20) "%a" -Warning: sha1_file(%ssha1.dat): failed to open stream: No such file or directory in %s on line %d +Warning: sha1_file(%ssha1.dat): Failed to open stream: No such file or directory in %s on line %d Done diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt index 4b43eeee3c..7a55cedee6 100644 --- a/ext/standard/tests/strings/sha1_file.phpt +++ b/ext/standard/tests/strings/sha1_file.phpt @@ -75,12 +75,12 @@ bool(false) -- invalid filename -- -Warning: sha1_file(rewncwYcn89q): failed to open stream: No such file or directory in %s on line %d +Warning: sha1_file(rewncwYcn89q): Failed to open stream: No such file or directory in %s on line %d bool(false) -- Scalar value as filename -- -Warning: sha1_file(12): failed to open stream: No such file or directory in %s on line %d +Warning: sha1_file(12): Failed to open stream: No such file or directory in %s on line %d bool(false) -- NULL as filename -- diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index dd8d12efba..0d98ffa824 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -197,7 +197,7 @@ php_stream_filter_status_t userfilter_filter( convert_to_long(&retval); ret = (int)Z_LVAL(retval); } else if (call_result == FAILURE) { - php_error_docref(NULL, E_WARNING, "failed to call filter function"); + php_error_docref(NULL, E_WARNING, "Failed to call filter function"); } if (bytes_consumed) { @@ -257,7 +257,7 @@ static php_stream_filter *user_filter_factory_create(const char *filtername, /* some sanity checks */ if (persistent) { php_error_docref(NULL, E_WARNING, - "cannot use a user-space filter with a persistent stream"); + "Cannot use a user-space filter with a persistent stream"); return NULL; } @@ -302,7 +302,7 @@ static php_stream_filter *user_filter_factory_create(const char *filtername, if (fdat->ce == NULL) { if (NULL == (fdat->ce = zend_lookup_class(fdat->classname))) { php_error_docref(NULL, E_WARNING, - "user-filter \"%s\" requires class \"%s\", but that class is not defined", + "User-filter \"%s\" requires class \"%s\", but that class is not defined", filtername, ZSTR_VAL(fdat->classname)); return NULL; } diff --git a/ext/sysvmsg/sysvmsg.c b/ext/sysvmsg/sysvmsg.c index cb1db920bb..b9bedfa9de 100644 --- a/ext/sysvmsg/sysvmsg.c +++ b/ext/sysvmsg/sysvmsg.c @@ -241,7 +241,7 @@ PHP_FUNCTION(msg_get_queue) /* doesn't already exist; create it */ mq->id = msgget(key, IPC_CREAT | IPC_EXCL | perms); if (mq->id < 0) { - php_error_docref(NULL, E_WARNING, "failed for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); efree(mq); RETURN_FALSE; } @@ -294,7 +294,7 @@ PHP_FUNCTION(msg_receive) } if (maxsize <= 0) { - php_error_docref(NULL, E_WARNING, "maximum size of the message has to be greater than zero"); + php_error_docref(NULL, E_WARNING, "Maximum size of the message has to be greater than zero"); return; } @@ -338,7 +338,7 @@ PHP_FUNCTION(msg_receive) PHP_VAR_UNSERIALIZE_INIT(var_hash); if (!php_var_unserialize(&tmp, &p, p + result, &var_hash)) { - php_error_docref(NULL, E_WARNING, "message corrupted"); + php_error_docref(NULL, E_WARNING, "Message corrupted"); ZEND_TRY_ASSIGN_REF_FALSE(out_message); RETVAL_FALSE; } else { diff --git a/ext/sysvmsg/tests/002.phpt b/ext/sysvmsg/tests/002.phpt index 7e20e86056..82233a4755 100644 --- a/ext/sysvmsg/tests/002.phpt +++ b/ext/sysvmsg/tests/002.phpt @@ -18,6 +18,6 @@ if (!msg_remove_queue($queue)) { echo "Done\n"; ?> --EXPECTF-- -Warning: msg_receive(): message corrupted in %s002.php on line %d +Warning: msg_receive(): Message corrupted in %s002.php on line %d bool(false) Done diff --git a/ext/sysvmsg/tests/005.phpt b/ext/sysvmsg/tests/005.phpt index 0016ab82c2..506e383ba0 100644 --- a/ext/sysvmsg/tests/005.phpt +++ b/ext/sysvmsg/tests/005.phpt @@ -43,7 +43,7 @@ bool(false) bool(false) bool(true) -Warning: msg_receive(): maximum size of the message has to be greater than zero in %s on line %d +Warning: msg_receive(): Maximum size of the message has to be greater than zero in %s on line %d bool(false) Warning: msg_send(): msgsnd failed: Invalid argument in %s on line %d @@ -55,7 +55,7 @@ bool(false) bool(false) bool(true) -Warning: msg_receive(): maximum size of the message has to be greater than zero in %s on line %d +Warning: msg_receive(): Maximum size of the message has to be greater than zero in %s on line %d bool(false) Warning: msg_send(): msgsnd failed: Invalid argument in %s on line %d diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c index e9e8a34244..b936dfe7aa 100644 --- a/ext/sysvsem/sysvsem.c +++ b/ext/sysvsem/sysvsem.c @@ -192,7 +192,7 @@ PHP_FUNCTION(sem_get) semid = semget(key, 3, perm|IPC_CREAT); if (semid == -1) { - php_error_docref(NULL, E_WARNING, "failed for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); RETURN_FALSE; } @@ -224,7 +224,7 @@ PHP_FUNCTION(sem_get) sop[2].sem_flg = SEM_UNDO; while (semop(semid, sop, 3) == -1) { if (errno != EINTR) { - php_error_docref(NULL, E_WARNING, "failed acquiring SYSVSEM_SETVAL for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed acquiring SYSVSEM_SETVAL for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); break; } } @@ -232,7 +232,7 @@ PHP_FUNCTION(sem_get) /* Get the usage count. */ count = semctl(semid, SYSVSEM_USAGE, GETVAL, NULL); if (count == -1) { - php_error_docref(NULL, E_WARNING, "failed for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); } /* If we are the only user, then take this opportunity to set the max. */ @@ -243,17 +243,17 @@ PHP_FUNCTION(sem_get) union semun semarg; semarg.val = max_acquire; if (semctl(semid, SYSVSEM_SEM, SETVAL, semarg) == -1) { - php_error_docref(NULL, E_WARNING, "failed for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); } #elif defined(SETVAL_WANTS_PTR) /* This is correct for Solaris 2.6 which does not have union semun. */ if (semctl(semid, SYSVSEM_SEM, SETVAL, &max_acquire) == -1) { - php_error_docref(NULL, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed for key 0x%lx: %s", key, strerror(errno)); } #else /* This works for i.e. AIX */ if (semctl(semid, SYSVSEM_SEM, SETVAL, max_acquire) == -1) { - php_error_docref(NULL, E_WARNING, "failed for key 0x%lx: %s", key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed for key 0x%lx: %s", key, strerror(errno)); } #endif } @@ -265,7 +265,7 @@ PHP_FUNCTION(sem_get) sop[0].sem_flg = SEM_UNDO; while (semop(semid, sop, 1) == -1) { if (errno != EINTR) { - php_error_docref(NULL, E_WARNING, "failed releasing SYSVSEM_SETVAL for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed releasing SYSVSEM_SETVAL for key 0x" ZEND_XLONG_FMT ": %s", key, strerror(errno)); break; } } @@ -316,7 +316,7 @@ static void php_sysvsem_semop(INTERNAL_FUNCTION_PARAMETERS, int acquire) while (semop(sem_ptr->semid, &sop, 1) == -1) { if (errno != EINTR) { if (errno != EAGAIN) { - php_error_docref(NULL, E_WARNING, "failed to %s key 0x%x: %s", acquire ? "acquire" : "release", sem_ptr->key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed to %s key 0x%x: %s", acquire ? "acquire" : "release", sem_ptr->key, strerror(errno)); } RETURN_FALSE; } @@ -383,7 +383,7 @@ PHP_FUNCTION(sem_remove) #else if (semctl(sem_ptr->semid, 0, IPC_RMID, NULL) < 0) { #endif - php_error_docref(NULL, E_WARNING, "failed for SysV semaphore " ZEND_LONG_FMT ": %s", Z_LVAL_P(arg_id), strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed for SysV semaphore " ZEND_LONG_FMT ": %s", Z_LVAL_P(arg_id), strerror(errno)); RETURN_FALSE; } diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c index d101479ed6..29a4298a5d 100644 --- a/ext/sysvshm/sysvshm.c +++ b/ext/sysvshm/sysvshm.c @@ -141,19 +141,19 @@ PHP_FUNCTION(shm_attach) /* get the id from a specified key or create new shared memory */ if ((shm_id = shmget(shm_key, 0, 0)) < 0) { if (shm_size < (zend_long)sizeof(sysvshm_chunk_head)) { - php_error_docref(NULL, E_WARNING, "failed for key 0x" ZEND_XLONG_FMT ": memorysize too small", shm_key); + php_error_docref(NULL, E_WARNING, "Failed for key 0x" ZEND_XLONG_FMT ": memorysize too small", shm_key); efree(shm_list_ptr); RETURN_FALSE; } if ((shm_id = shmget(shm_key, shm_size, shm_flag | IPC_CREAT | IPC_EXCL)) < 0) { - php_error_docref(NULL, E_WARNING, "failed for key 0x" ZEND_XLONG_FMT ": %s", shm_key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed for key 0x" ZEND_XLONG_FMT ": %s", shm_key, strerror(errno)); efree(shm_list_ptr); RETURN_FALSE; } } if ((shm_ptr = shmat(shm_id, NULL, 0)) == (void *) -1) { - php_error_docref(NULL, E_WARNING, "failed for key 0x" ZEND_XLONG_FMT ": %s", shm_key, strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed for key 0x" ZEND_XLONG_FMT ": %s", shm_key, strerror(errno)); efree(shm_list_ptr); RETURN_FALSE; } @@ -204,7 +204,7 @@ PHP_FUNCTION(shm_remove) SHM_FETCH_RESOURCE(shm_list_ptr, shm_id); if (shmctl(shm_list_ptr->id, IPC_RMID, NULL) < 0) { - php_error_docref(NULL, E_WARNING, "failed for key 0x%x, id " ZEND_LONG_FMT ": %s", shm_list_ptr->key, Z_LVAL_P(shm_id), strerror(errno)); + php_error_docref(NULL, E_WARNING, "Failed for key 0x%x, id " ZEND_LONG_FMT ": %s", shm_list_ptr->key, Z_LVAL_P(shm_id), strerror(errno)); RETURN_FALSE; } @@ -245,7 +245,7 @@ PHP_FUNCTION(shm_put_var) smart_str_free(&shm_var); if (ret == -1) { - php_error_docref(NULL, E_WARNING, "not enough shared memory left"); + php_error_docref(NULL, E_WARNING, "Not enough shared memory left"); RETURN_FALSE; } RETURN_TRUE; @@ -274,7 +274,7 @@ PHP_FUNCTION(shm_get_var) shm_varpos = php_check_shm_data((shm_list_ptr->ptr), shm_key); if (shm_varpos < 0) { - php_error_docref(NULL, E_WARNING, "variable key " ZEND_LONG_FMT " doesn't exist", shm_key); + php_error_docref(NULL, E_WARNING, "Variable key " ZEND_LONG_FMT " doesn't exist", shm_key); RETURN_FALSE; } shm_var = (sysvshm_chunk*) ((char *)shm_list_ptr->ptr + shm_varpos); @@ -282,7 +282,7 @@ PHP_FUNCTION(shm_get_var) PHP_VAR_UNSERIALIZE_INIT(var_hash); if (php_var_unserialize(return_value, (const unsigned char **) &shm_data, (unsigned char *) shm_data + shm_var->length, &var_hash) != 1) { - php_error_docref(NULL, E_WARNING, "variable data in shared memory is corrupted"); + php_error_docref(NULL, E_WARNING, "Variable data in shared memory is corrupted"); RETVAL_FALSE; } PHP_VAR_UNSERIALIZE_DESTROY(var_hash); @@ -321,7 +321,7 @@ PHP_FUNCTION(shm_remove_var) shm_varpos = php_check_shm_data((shm_list_ptr->ptr), shm_key); if (shm_varpos < 0) { - php_error_docref(NULL, E_WARNING, "variable key " ZEND_LONG_FMT " doesn't exist", shm_key); + php_error_docref(NULL, E_WARNING, "Variable key " ZEND_LONG_FMT " doesn't exist", shm_key); RETURN_FALSE; } php_remove_shm_data((shm_list_ptr->ptr), shm_varpos); diff --git a/ext/sysvshm/tests/004.phpt b/ext/sysvshm/tests/004.phpt index 23496f5c1c..40ab751ea7 100644 --- a/ext/sysvshm/tests/004.phpt +++ b/ext/sysvshm/tests/004.phpt @@ -27,6 +27,6 @@ bool(true) bool(true) bool(true) -Warning: shm_put_var(): not enough shared memory left in %s004.php on line %d +Warning: shm_put_var(): Not enough shared memory left in %s004.php on line %d bool(false) Done diff --git a/ext/sysvshm/tests/005.phpt b/ext/sysvshm/tests/005.phpt index 879be31c13..0670002700 100644 --- a/ext/sysvshm/tests/005.phpt +++ b/ext/sysvshm/tests/005.phpt @@ -36,10 +36,10 @@ shm_remove($s); echo "Done\n"; ?> --EXPECTF-- -Warning: shm_get_var(): variable key 1000 doesn't exist in %s005.php on line %d +Warning: shm_get_var(): Variable key 1000 doesn't exist in %s005.php on line %d bool(false) -Warning: shm_get_var(): variable key -10000 doesn't exist in %s005.php on line %d +Warning: shm_get_var(): Variable key -10000 doesn't exist in %s005.php on line %d bool(false) string(11) "test string" object(stdClass)#%d (0) { diff --git a/ext/sysvshm/tests/006.phpt b/ext/sysvshm/tests/006.phpt index 278838f063..a3e38e2c5c 100644 --- a/ext/sysvshm/tests/006.phpt +++ b/ext/sysvshm/tests/006.phpt @@ -27,17 +27,17 @@ shm_remove($s); echo "Done\n"; ?> --EXPECTF-- -Warning: shm_remove_var(): variable key -10 doesn't exist in %s006.php on line %d +Warning: shm_remove_var(): Variable key -10 doesn't exist in %s006.php on line %d bool(false) string(11) "test string" bool(true) -Warning: shm_get_var(): variable key 1 doesn't exist in %s006.php on line %d +Warning: shm_get_var(): Variable key 1 doesn't exist in %s006.php on line %d bool(false) -Warning: shm_remove_var(): variable key 1 doesn't exist in %s006.php on line %d +Warning: shm_remove_var(): Variable key 1 doesn't exist in %s006.php on line %d bool(false) -Warning: shm_get_var(): variable key 1 doesn't exist in %s006.php on line %d +Warning: shm_get_var(): Variable key 1 doesn't exist in %s006.php on line %d bool(false) Done diff --git a/ext/sysvshm/tests/bug72858.phpt b/ext/sysvshm/tests/bug72858.phpt index 70e4b64223..efa72edb5b 100644 --- a/ext/sysvshm/tests/bug72858.phpt +++ b/ext/sysvshm/tests/bug72858.phpt @@ -15,4 +15,4 @@ shm_attach($v1,$v2); ?> --EXPECTF-- -Warning: shm_attach(): failed for key 0x64: Not enough space in %s on line %d +Warning: shm_attach(): Failed for key 0x64: Not enough space in %s on line %d diff --git a/ext/xml/xml.c b/ext/xml/xml.c index e764f48fde..e46dce1783 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1084,7 +1084,7 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp } else if (strcasecmp(encoding_param, "US-ASCII") == 0) { encoding = (XML_Char*)"US-ASCII"; } else { - php_error_docref(NULL, E_WARNING, "unsupported source encoding \"%s\"", encoding_param); + php_error_docref(NULL, E_WARNING, "Unsupported source encoding \"%s\"", encoding_param); RETURN_FALSE; } } else { diff --git a/ext/xmlrpc/tests/bug45556.phpt b/ext/xmlrpc/tests/bug45556.phpt index 34897d8c9b..29d689dc6d 100644 --- a/ext/xmlrpc/tests/bug45556.phpt +++ b/ext/xmlrpc/tests/bug45556.phpt @@ -29,6 +29,6 @@ xmlrpc_server_call_method ($server, $request, NULL, $options); --EXPECTF-- Warning: xmlrpc_server_call_method(): Invalid callback 'foobar' passed in %s on line %d -Warning: xmlrpc_server_call_method(): xml parse error: [line 1, column 1, message: Invalid document end] Unable to add introspection data returned from bar::test() in %s on line %d +Warning: xmlrpc_server_call_method(): XML parse error: [line 1, column 1, message: Invalid document end] Unable to add introspection data returned from bar::test() in %s on line %d Warning: xmlrpc_server_call_method(): Invalid callback 'foo::bar' passed in %s on line %d diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index a8050c32a9..28515f6cd7 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -877,7 +877,7 @@ static void php_xmlrpc_introspection_callback(XMLRPC_SERVER server, void* data) } else { /* could not create description */ if (err.xml_elem_error.parser_code) { - php_error_docref(NULL, E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to add introspection data returned from %s()", + php_error_docref(NULL, E_WARNING, "XML parse error: [line %ld, column %ld, message: %s] Unable to add introspection data returned from %s()", err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error, ZSTR_VAL(php_function_name)); } else { php_error_docref(NULL, E_WARNING, "Unable to add introspection data returned from %s()", ZSTR_VAL(php_function_name)); @@ -1111,13 +1111,13 @@ PHP_FUNCTION(xmlrpc_parse_method_descriptions) } else { /* could not create description */ if (err.xml_elem_error.parser_code) { - php_error_docref(NULL, E_WARNING, "xml parse error: [line %ld, column %ld, message: %s] Unable to create introspection data", + php_error_docref(NULL, E_WARNING, "XML parse error: [line %ld, column %ld, message: %s] Unable to create introspection data", err.xml_elem_error.column, err.xml_elem_error.line, err.xml_elem_error.parser_error); } else { php_error_docref(NULL, E_WARNING, "Invalid xml structure. Unable to create introspection data"); } - php_error_docref(NULL, E_WARNING, "xml parse error. no method description created"); + php_error_docref(NULL, E_WARNING, "XML parse error. no method description created"); } } } diff --git a/ext/zip/tests/bug53603.phpt b/ext/zip/tests/bug53603.phpt index 0a501071e5..eb8b169f03 100644 --- a/ext/zip/tests/bug53603.phpt +++ b/ext/zip/tests/bug53603.phpt @@ -28,5 +28,5 @@ if ($zip->open($file) !== TRUE) { $a = $zip->extractTo('teststream://test'); var_dump($a); --EXPECTF-- -Warning: ZipArchive::extractTo(teststream://test/foo): failed to open stream: "TestStream::stream_open" call failed in %s on line %d +Warning: ZipArchive::extractTo(teststream://test/foo): Failed to open stream: "TestStream::stream_open" call failed in %s on line %d bool(false) diff --git a/ext/zip/tests/oo_encryption.phpt b/ext/zip/tests/oo_encryption.phpt index 99ab22cf00..79ad18a041 100644 --- a/ext/zip/tests/oo_encryption.phpt +++ b/ext/zip/tests/oo_encryption.phpt @@ -59,7 +59,7 @@ string(3) "bar" == Stream string(3) "foo" -Warning: file_get_contents(%s): failed to open stream: operation failed in %s on line %d +Warning: file_get_contents(%s): Failed to open stream: operation failed in %s on line %d bool(false) string(3) "bar" == Done diff --git a/ext/zlib/tests/004-mb.phpt b/ext/zlib/tests/004-mb.phpt index 2b27beb66b..84e40d3013 100644 --- a/ext/zlib/tests/004-mb.phpt +++ b/ext/zlib/tests/004-mb.phpt @@ -13,7 +13,7 @@ var_dump(gzfile(__DIR__."/004私はガラスを食べられます.txt.gz", 1)); echo "Done\n"; ?> --EXPECTF-- -Warning: gzfile(nonexistent_file_gzfile): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(nonexistent_file_gzfile): Failed to open stream: No such file or directory in %s on line %d bool(false) array(6) { [0]=> diff --git a/ext/zlib/tests/004.phpt b/ext/zlib/tests/004.phpt index 94e0beba62..4921ad496c 100644 --- a/ext/zlib/tests/004.phpt +++ b/ext/zlib/tests/004.phpt @@ -13,7 +13,7 @@ var_dump(gzfile(__DIR__."/004.txt.gz", 1)); echo "Done\n"; ?> --EXPECTF-- -Warning: gzfile(nonexistent_file_gzfile): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(nonexistent_file_gzfile): Failed to open stream: No such file or directory in %s on line %d bool(false) array(6) { [0]=> diff --git a/ext/zlib/tests/dictionary_usage.phpt b/ext/zlib/tests/dictionary_usage.phpt index 0823b3ca94..195e9b216d 100644 --- a/ext/zlib/tests/dictionary_usage.phpt +++ b/ext/zlib/tests/dictionary_usage.phpt @@ -28,5 +28,5 @@ string(%d) "%s" bool(true) string(6) "abdcde" -Warning: inflate_add(): dictionary does not match expected dictionary (incorrect adler32 hash) in %s on line %d +Warning: inflate_add(): Dictionary does not match expected dictionary (incorrect adler32 hash) in %s on line %d bool(false) diff --git a/ext/zlib/tests/gzfile_variation4.phpt b/ext/zlib/tests/gzfile_variation4.phpt index 386b235375..e3a90207a0 100644 --- a/ext/zlib/tests/gzfile_variation4.phpt +++ b/ext/zlib/tests/gzfile_variation4.phpt @@ -25,17 +25,17 @@ foreach ( $variation as $var ) { } ?> --EXPECTF-- -Warning: gzfile(10.5): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(10.5): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: gzfile(-10.5): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(-10.5): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: gzfile(123456789000): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(123456789000): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: gzfile(-123456789000): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(-123456789000): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: gzfile(0.5): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(0.5): Failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/zlib/tests/gzfile_variation5.phpt b/ext/zlib/tests/gzfile_variation5.phpt index 99b12f980e..be3a95f600 100644 --- a/ext/zlib/tests/gzfile_variation5.phpt +++ b/ext/zlib/tests/gzfile_variation5.phpt @@ -24,14 +24,14 @@ foreach ( $variation as $var ) { } ?> --EXPECTF-- -Warning: gzfile(0): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(0): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: gzfile(1): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(1): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: gzfile(12345): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(12345): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: gzfile(-2345): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(-2345): Failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/zlib/tests/gzfile_variation7.phpt b/ext/zlib/tests/gzfile_variation7.phpt index 78af689f4d..6c9807b733 100644 --- a/ext/zlib/tests/gzfile_variation7.phpt +++ b/ext/zlib/tests/gzfile_variation7.phpt @@ -28,14 +28,14 @@ foreach ( $variation_array as $var ) { } ?> --EXPECTF-- -Warning: gzfile(string): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(string): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: gzfile(string): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(string): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: gzfile(sTrInG): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(sTrInG): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: gzfile(hello world): failed to open stream: No such file or directory in %s on line %d +Warning: gzfile(hello world): Failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/zlib/tests/gzopen_basic2.phpt b/ext/zlib/tests/gzopen_basic2.phpt index 30fda88685..5893270bb5 100644 --- a/ext/zlib/tests/gzopen_basic2.phpt +++ b/ext/zlib/tests/gzopen_basic2.phpt @@ -46,5 +46,5 @@ testing mode -- w -- This was the information that was written testing mode -- w+ -- -Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d +Warning: gzopen(): Cannot open a zlib stream for reading and writing at the same time! in %s on line %d bool(false) diff --git a/ext/zlib/tests/gzopen_variation4.phpt b/ext/zlib/tests/gzopen_variation4.phpt index 2d41c70ebb..2c9214ff43 100644 --- a/ext/zlib/tests/gzopen_variation4.phpt +++ b/ext/zlib/tests/gzopen_variation4.phpt @@ -124,15 +124,15 @@ This is a file in script dir ** testing with mode=r+ ** -Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d +Warning: gzopen(): Cannot open a zlib stream for reading and writing at the same time! in %s on line %d -Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d +Warning: gzopen(): Cannot open a zlib stream for reading and writing at the same time! in %s on line %d -Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d +Warning: gzopen(): Cannot open a zlib stream for reading and writing at the same time! in %s on line %d -Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d +Warning: gzopen(): Cannot open a zlib stream for reading and writing at the same time! in %s on line %d -Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d +Warning: gzopen(): Cannot open a zlib stream for reading and writing at the same time! in %s on line %d ** testing with mode=rt ** This is a file in dir2 diff --git a/ext/zlib/tests/gzopen_variation9.phpt b/ext/zlib/tests/gzopen_variation9.phpt index c6ba91b851..d2148973db 100644 --- a/ext/zlib/tests/gzopen_variation9.phpt +++ b/ext/zlib/tests/gzopen_variation9.phpt @@ -35,7 +35,7 @@ foreach ($modes as $mode) { *** Testing gzopen() : variation *** mode=r+ -Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d +Warning: gzopen(): Cannot open a zlib stream for reading and writing at the same time! in %s on line %d gzopen=bool(false) mode=rf @@ -43,11 +43,11 @@ gzopen=resource(%d) of type (stream) mode=w+ -Warning: gzopen(): cannot open a zlib stream for reading and writing at the same time! in %s on line %d +Warning: gzopen(): Cannot open a zlib stream for reading and writing at the same time! in %s on line %d gzopen=bool(false) mode=e -Warning: gzopen(%s/004.txt.gz): failed to open stream: %s in %s on line %d +Warning: gzopen(%s/004.txt.gz): Failed to open stream: %s in %s on line %d gzopen=bool(false) diff --git a/ext/zlib/tests/readgzfile_variation4.phpt b/ext/zlib/tests/readgzfile_variation4.phpt index 8a71a602ab..8d86085010 100644 --- a/ext/zlib/tests/readgzfile_variation4.phpt +++ b/ext/zlib/tests/readgzfile_variation4.phpt @@ -25,17 +25,17 @@ foreach ( $variation as $var ) { } ?> --EXPECTF-- -Warning: readgzfile(10.5): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(10.5): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: readgzfile(-10.5): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(-10.5): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: readgzfile(123456789000): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(123456789000): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: readgzfile(-123456789000): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(-123456789000): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: readgzfile(0.5): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(0.5): Failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/zlib/tests/readgzfile_variation5.phpt b/ext/zlib/tests/readgzfile_variation5.phpt index 7c58b131b4..fe95bb4dbc 100644 --- a/ext/zlib/tests/readgzfile_variation5.phpt +++ b/ext/zlib/tests/readgzfile_variation5.phpt @@ -24,14 +24,14 @@ foreach ( $variation as $var ) { } ?> --EXPECTF-- -Warning: readgzfile(0): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(0): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: readgzfile(1): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(1): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: readgzfile(12345): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(12345): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: readgzfile(-2345): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(-2345): Failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/zlib/tests/readgzfile_variation7.phpt b/ext/zlib/tests/readgzfile_variation7.phpt index d8c7081d01..e60c01cb79 100644 --- a/ext/zlib/tests/readgzfile_variation7.phpt +++ b/ext/zlib/tests/readgzfile_variation7.phpt @@ -28,14 +28,14 @@ foreach ( $variation_array as $var ) { } ?> --EXPECTF-- -Warning: readgzfile(string): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(string): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: readgzfile(string): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(string): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: readgzfile(sTrInG): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(sTrInG): Failed to open stream: No such file or directory in %s on line %d bool(false) -Warning: readgzfile(hello world): failed to open stream: No such file or directory in %s on line %d +Warning: readgzfile(hello world): Failed to open stream: No such file or directory in %s on line %d bool(false) diff --git a/ext/zlib/tests/zlib_scheme_dir_basic.phpt b/ext/zlib/tests/zlib_scheme_dir_basic.phpt index 5a036c51cd..f0e155e899 100644 --- a/ext/zlib/tests/zlib_scheme_dir_basic.phpt +++ b/ext/zlib/tests/zlib_scheme_dir_basic.phpt @@ -19,6 +19,6 @@ var_dump(rmdir($srcFile)); bool(false) bool(false) -Warning: opendir(compress.zlib://%s/dir.gz): failed to open dir: not implemented in %s on line %d +Warning: opendir(compress.zlib://%s/dir.gz): Failed to open directory: not implemented in %s on line %d bool(false) bool(false) diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index e4f7c14b23..abc855c752 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -819,7 +819,7 @@ static zend_bool zlib_create_dictionary_string(HashTable *options, char **dict, } break; default: - zend_type_error("dictionary must be of type zero-terminated string or array, got %s", zend_get_type_by_const(Z_TYPE_P(option_buffer))); + zend_type_error("Dictionary must be of type zero-terminated string or array, got %s", zend_get_type_by_const(Z_TYPE_P(option_buffer))); return 0; } } @@ -886,7 +886,7 @@ PHP_FUNCTION(inflate_init) php_ctx->inflateDict = NULL; break; case Z_DATA_ERROR: - php_error_docref(NULL, E_WARNING, "dictionary does not match expected dictionary (incorrect adler32 hash)"); + php_error_docref(NULL, E_WARNING, "Dictionary does not match expected dictionary (incorrect adler32 hash)"); efree(php_ctx->inflateDict); php_ctx->inflateDict = NULL; EMPTY_SWITCH_DEFAULT_CASE() @@ -895,7 +895,7 @@ PHP_FUNCTION(inflate_init) RETURN_RES(zend_register_resource(ctx, le_inflate)); } else { efree(ctx); - php_error_docref(NULL, E_WARNING, "failed allocating zlib.inflate context"); + php_error_docref(NULL, E_WARNING, "Failed allocating zlib.inflate context"); RETURN_FALSE; } } @@ -992,7 +992,7 @@ PHP_FUNCTION(inflate_add) php_ctx->inflateDict = NULL; break; case Z_DATA_ERROR: - php_error_docref(NULL, E_WARNING, "dictionary does not match expected dictionary (incorrect adler32 hash)"); + php_error_docref(NULL, E_WARNING, "Dictionary does not match expected dictionary (incorrect adler32 hash)"); efree(php_ctx->inflateDict); zend_string_release_ex(out, 0); php_ctx->inflateDict = NULL; @@ -1001,7 +1001,7 @@ PHP_FUNCTION(inflate_add) } break; } else { - php_error_docref(NULL, E_WARNING, "inflating this data requires a preset dictionary, please specify it in the options array of inflate_init()"); + php_error_docref(NULL, E_WARNING, "Inflating this data requires a preset dictionary, please specify it in the options array of inflate_init()"); RETURN_FALSE; } default: @@ -1147,7 +1147,7 @@ PHP_FUNCTION(deflate_init) RETURN_RES(zend_register_resource(ctx, le_deflate)); } else { efree(ctx); - php_error_docref(NULL, E_WARNING, "failed allocating zlib.deflate context"); + php_error_docref(NULL, E_WARNING, "Failed allocating zlib.deflate context"); RETURN_FALSE; } } diff --git a/ext/zlib/zlib_fopen_wrapper.c b/ext/zlib/zlib_fopen_wrapper.c index 316c121bff..ef26aaf787 100644 --- a/ext/zlib/zlib_fopen_wrapper.c +++ b/ext/zlib/zlib_fopen_wrapper.c @@ -112,7 +112,7 @@ php_stream *php_stream_gzopen(php_stream_wrapper *wrapper, const char *path, con /* sanity check the stream: it can be either read-only or write-only */ if (strchr(mode, '+')) { if (options & REPORT_ERRORS) { - php_error_docref(NULL, E_WARNING, "cannot open a zlib stream for reading and writing at the same time!"); + php_error_docref(NULL, E_WARNING, "Cannot open a zlib stream for reading and writing at the same time!"); } return NULL; } |