summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyson Andre <tysonandre775@hotmail.com>2017-11-05 10:01:44 -0800
committerJoe Watkins <krakjoe@php.net>2017-11-06 07:24:42 +0000
commit5cdf37e6033cf7053132126157747511c2c039f2 (patch)
treed7488f2bdeafd4c3f32eb2e4898ef9cb20273db7
parent88e94a0bd14af65f31e5a56dd13dc16d902c57b7 (diff)
downloadphp-git-5cdf37e6033cf7053132126157747511c2c039f2.tar.gz
Fix proto documents for new global functions
See NEWS and UPGRADING (or arginfo/implementation) for details.
-rw-r--r--ext/mbstring/mbstring.c6
-rw-r--r--ext/standard/streamsfuncs.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index d2e778bff5..f963ba6d97 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -5109,7 +5109,7 @@ static inline zend_long php_mb_ord(const char* str, size_t str_len, const char*
}
-/* {{{ proto bool mb_ord([string str[, string encoding]]) */
+/* {{{ proto int|false mb_ord([string str[, string encoding]]) */
PHP_FUNCTION(mb_ord)
{
char* str;
@@ -5233,7 +5233,7 @@ static inline char* php_mb_chr(zend_long cp, const char* enc, size_t *output_len
}
-/* {{{ proto bool mb_ord([int cp[, string encoding]]) */
+/* {{{ proto string|false mb_chr([int cp[, string encoding]]) */
PHP_FUNCTION(mb_chr)
{
zend_long cp;
@@ -5268,7 +5268,7 @@ static inline char* php_mb_scrub(const char* str, size_t str_len, const char* en
}
-/* {{{ proto bool mb_scrub([string str[, string encoding]]) */
+/* {{{ proto string|false mb_scrub([string str[, string encoding]]) */
PHP_FUNCTION(mb_scrub)
{
char* str;
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 1c0c07b79b..34a5d97495 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -1620,7 +1620,7 @@ PHP_FUNCTION(stream_supports_lock)
RETURN_TRUE;
}
-/* {{{ proto proto stream_isatty(resource stream)
+/* {{{ proto bool stream_isatty(resource stream)
Check if a stream is a TTY.
*/
PHP_FUNCTION(stream_isatty)
@@ -1658,7 +1658,7 @@ PHP_FUNCTION(stream_isatty)
}
#ifdef PHP_WIN32
-/* {{{ proto proto sapi_windows_vt100_support(resource stream[, bool enable])
+/* {{{ proto bool sapi_windows_vt100_support(resource stream[, bool enable])
Get or set VT100 support for the specified stream associated to an
output buffer of a Windows console.
*/