Update MAY_BE_NULL info for more ext/standard functions

diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c
index 935cd7f5ba8b1e0c4c7e836cfa8ba3597f19eec8..dfb4451b2e0f5b5009fd53a22c05e70ce22ea4f6 100644 (file)
--- a/ext/opcache/Optimizer/zend_func_info.c
+++ b/ext/opcache/Optimizer/zend_func_info.c
@@ -153,100 +153,100 @@ static const func_info_t func_infos[] = {
 #endif
        F0("flush",                        MAY_BE_NULL),
        F1("wordwrap",                     MAY_BE_FALSE | MAY_BE_STRING),
-       F1("htmlspecialchars",             MAY_BE_NULL | MAY_BE_STRING),
-       F1("htmlentities",                 MAY_BE_NULL | MAY_BE_STRING),
-       FN("html_entity_decode",           MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       FN("htmlspecialchars_decode",      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("get_html_translation_table",   MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
-       F1("sha1",                         MAY_BE_NULL | MAY_BE_STRING),
-       F1("sha1_file",                    MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("md5",                          MAY_BE_NULL | MAY_BE_STRING),
-       F1("md5_file",                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F0("crc32",                        MAY_BE_NULL | MAY_BE_LONG),
-       F1("iptcparse",                    MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ARRAY),
-       F1("iptcembed",                    MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("getimagesize",                 MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING),
-       F1("getimagesizefromstring",       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING),
-       F1("image_type_to_mime_type",      MAY_BE_NULL | MAY_BE_STRING),
+       F1("htmlspecialchars",             MAY_BE_STRING),
+       F1("htmlentities",                 MAY_BE_STRING),
+       FN("html_entity_decode",           MAY_BE_FALSE | MAY_BE_STRING),
+       FN("htmlspecialchars_decode",      MAY_BE_FALSE | MAY_BE_STRING),
+       F1("get_html_translation_table",   MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
+       F1("sha1",                         MAY_BE_STRING),
+       F1("sha1_file",                    MAY_BE_FALSE | MAY_BE_STRING),
+       F1("md5",                          MAY_BE_STRING),
+       F1("md5_file",                     MAY_BE_FALSE | MAY_BE_STRING),
+       F0("crc32",                        MAY_BE_LONG),
+       F1("iptcparse",                    MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ARRAY),
+       F1("iptcembed",                    MAY_BE_FALSE | MAY_BE_STRING),
+       F1("getimagesize",                 MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING),
+       F1("getimagesizefromstring",       MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING),
+       F1("image_type_to_mime_type",      MAY_BE_STRING),
        F1("image_type_to_extension",      MAY_BE_FALSE | MAY_BE_STRING),
-       F0("phpinfo",                      MAY_BE_NULL | MAY_BE_TRUE),
-       F1("phpversion",                   MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F0("phpcredits",                   MAY_BE_NULL | MAY_BE_TRUE),
+       F0("phpinfo",                      MAY_BE_TRUE),
+       F1("phpversion",                   MAY_BE_FALSE | MAY_BE_STRING),
+       F0("phpcredits",                   MAY_BE_TRUE),
        F1("php_sapi_name",                MAY_BE_FALSE | MAY_BE_STRING),
-       F1("php_uname",                    MAY_BE_NULL | MAY_BE_STRING),
+       F1("php_uname",                    MAY_BE_STRING),
        F1("php_ini_scanned_files",        MAY_BE_FALSE | MAY_BE_STRING),
        F1("php_ini_loaded_file",          MAY_BE_FALSE | MAY_BE_STRING),
-       F0("strnatcmp",                    MAY_BE_NULL | MAY_BE_LONG),
-       F0("strnatcasecmp",                MAY_BE_NULL | MAY_BE_LONG),
-       F0("substr_count",                 MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("strspn",                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("strcspn",                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F1("strtok",                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       FN("strtoupper",                   MAY_BE_NULL | MAY_BE_STRING),
-       FN("strtolower",                   MAY_BE_NULL | MAY_BE_STRING),
-       F0("strpos",                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("stripos",                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("strrpos",                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F0("strripos",                     MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG),
-       F1("strrev",                       MAY_BE_NULL | MAY_BE_STRING),
-       F1("hebrev",                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("hebrevc",                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("nl2br",                        MAY_BE_NULL | MAY_BE_STRING),
-       F1("basename",                     MAY_BE_NULL | MAY_BE_STRING),
+       F0("strnatcmp",                    MAY_BE_LONG),
+       F0("strnatcasecmp",                MAY_BE_LONG),
+       F0("substr_count",                 MAY_BE_FALSE | MAY_BE_LONG),
+       F0("strspn",                       MAY_BE_FALSE | MAY_BE_LONG),
+       F0("strcspn",                      MAY_BE_FALSE | MAY_BE_LONG),
+       F1("strtok",                       MAY_BE_FALSE | MAY_BE_STRING),
+       FN("strtoupper",                   MAY_BE_STRING),
+       FN("strtolower",                   MAY_BE_STRING),
+       F0("strpos",                       MAY_BE_FALSE | MAY_BE_LONG),
+       F0("stripos",                      MAY_BE_FALSE | MAY_BE_LONG),
+       F0("strrpos",                      MAY_BE_FALSE | MAY_BE_LONG),
+       F0("strripos",                     MAY_BE_FALSE | MAY_BE_LONG),
+       F1("strrev",                       MAY_BE_STRING),
+       F1("hebrev",                       MAY_BE_FALSE | MAY_BE_STRING),
+       F1("hebrevc",                      MAY_BE_FALSE | MAY_BE_STRING),
+       FN("nl2br",                        MAY_BE_STRING),
+       F1("basename",                     MAY_BE_STRING),
        F1("dirname",                      MAY_BE_NULL | MAY_BE_STRING),
-       F1("pathinfo",                     MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
-       F1("stripslashes",                 MAY_BE_NULL | MAY_BE_STRING),
-       F1("stripcslashes",                MAY_BE_NULL | MAY_BE_STRING),
-       F1("strstr",                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("stristr",                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F1("strrchr",                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
+       F1("pathinfo",                     MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_STRING),
+       F1("stripslashes",                 MAY_BE_STRING),
+       F1("stripcslashes",                MAY_BE_STRING),
+       F1("strstr",                       MAY_BE_FALSE | MAY_BE_STRING),
+       F1("stristr",                      MAY_BE_FALSE | MAY_BE_STRING),
+       F1("strrchr",                      MAY_BE_FALSE | MAY_BE_STRING),
        F1("str_shuffle",                  MAY_BE_NULL | MAY_BE_STRING),
-       F1("str_word_count",               MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
-       F1("str_split",                    MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
+       F1("str_word_count",               MAY_BE_FALSE | MAY_BE_LONG | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
+       F1("str_split",                    MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
        F1("strpbrk",                      MAY_BE_FALSE | MAY_BE_STRING),
        F0("substr_compare",               MAY_BE_FALSE | MAY_BE_LONG),
 #ifdef HAVE_STRCOLL
-       F0("strcoll",                      MAY_BE_NULL | MAY_BE_LONG),
+       F0("strcoll",                      MAY_BE_LONG),
 #endif
 #ifdef HAVE_STRFMON
-       F1("money_format",                 MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
+       F1("money_format",                 MAY_BE_STRING),
 #endif
-       FN("substr",                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       FN("substr_replace",               MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING),
-       F1("quotemeta",                    MAY_BE_NULL | MAY_BE_STRING),
-       FN("ucfirst",                      MAY_BE_NULL | MAY_BE_STRING),
-       FN("lcfirst",                      MAY_BE_NULL | MAY_BE_STRING),
-       F1("ucwords",                      MAY_BE_NULL | MAY_BE_STRING),
-       FN("strtr",                        MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       FN("addslashes",                   MAY_BE_NULL | MAY_BE_STRING),
-       F1("addcslashes",                  MAY_BE_NULL | MAY_BE_STRING),
-       FN("rtrim",                        MAY_BE_NULL | MAY_BE_STRING),
-       FN("str_replace",                  MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT),
-       FN("str_ireplace",                 MAY_BE_NULL | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT),
+       FN("substr",                       MAY_BE_FALSE | MAY_BE_STRING),
+       FN("substr_replace",               MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING),
+       F1("quotemeta",                    MAY_BE_STRING),
+       FN("ucfirst",                      MAY_BE_STRING),
+       FN("lcfirst",                      MAY_BE_STRING),
+       F1("ucwords",                      MAY_BE_STRING),
+       FN("strtr",                        MAY_BE_FALSE | MAY_BE_STRING),
+       FN("addslashes",                   MAY_BE_STRING),
+       F1("addcslashes",                  MAY_BE_STRING),
+       FN("rtrim",                        MAY_BE_STRING),
+       FN("str_replace",                  MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT),
+       FN("str_ireplace",                 MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY | MAY_BE_ARRAY_OF_OBJECT),
        F1("str_repeat",                   MAY_BE_NULL | MAY_BE_STRING),
-       F1("count_chars",                  MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
-       F1("chunk_split",                  MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       FN("trim",                         MAY_BE_NULL | MAY_BE_STRING),
-       FN("ltrim",                        MAY_BE_NULL | MAY_BE_STRING),
-       F1("strip_tags",                   MAY_BE_NULL | MAY_BE_STRING),
-       F0("similar_text",                 MAY_BE_NULL | MAY_BE_LONG),
-       F1("explode",                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
+       F1("count_chars",                  MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_LONG),
+       F1("chunk_split",                  MAY_BE_FALSE | MAY_BE_STRING),
+       FN("trim",                         MAY_BE_STRING),
+       FN("ltrim",                        MAY_BE_STRING),
+       F1("strip_tags",                   MAY_BE_STRING),
+       F0("similar_text",                 MAY_BE_LONG),
+       F1("explode",                      MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_STRING),
        FN("implode",                      MAY_BE_NULL | MAY_BE_STRING),
        FN("join",                         MAY_BE_NULL | MAY_BE_STRING),
-       FN("setlocale",                    MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
+       FN("setlocale",                    MAY_BE_FALSE | MAY_BE_STRING),
        F1("localeconv",                   MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_LONG | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
 #if HAVE_NL_LANGINFO
-       F1("nl_langinfo",                  MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
+       F1("nl_langinfo",                  MAY_BE_FALSE | MAY_BE_STRING),
 #endif
-       F1("soundex",                      MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
-       F0("levenshtein",                  MAY_BE_NULL | MAY_BE_LONG),
-       F1("chr",                          MAY_BE_NULL | MAY_BE_STRING),
-       F0("ord",                          MAY_BE_NULL | MAY_BE_LONG),
+       F1("soundex",                      MAY_BE_FALSE | MAY_BE_STRING),
+       F0("levenshtein",                  MAY_BE_LONG),
+       F1("chr",                          MAY_BE_STRING),
+       F0("ord",                          MAY_BE_LONG),
        F0("parse_str",                    MAY_BE_NULL),
        F1("str_getcsv",                   MAY_BE_NULL | MAY_BE_ARRAY | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_LONG | MAY_BE_ARRAY_OF_NULL | MAY_BE_ARRAY_OF_STRING),
        F1("str_pad",                      MAY_BE_NULL | MAY_BE_STRING),
        F1("chop",                         MAY_BE_NULL | MAY_BE_STRING),
-       F1("strchr",                       MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_STRING),
+       F1("strchr",                       MAY_BE_STRING),
        F1("sprintf",                      MAY_BE_FALSE | MAY_BE_STRING),
        F0("printf",                       MAY_BE_FALSE | MAY_BE_LONG),
        F0("vprintf",                      MAY_BE_FALSE | MAY_BE_LONG),

diff --git a/ext/standard/image.c b/ext/standard/image.c
index 53c42a0e51066c47348966810486a64b15f3c7eb..acc49bbc3e4430c86f92b6e59b0290d09aaaa313 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -1223,7 +1223,7 @@ PHP_FUNCTION(image_type_to_mime_type)
 }
 /* }}} */
 
-/* {{{ proto string image_type_to_extension(int imagetype [, bool include_dot])
+/* {{{ proto string|false image_type_to_extension(int imagetype [, bool include_dot])
    Get file extension for image-type returned by getimagesize, exif_read_data, exif_thumbnail, exif_imagetype */
 PHP_FUNCTION(image_type_to_extension)
 {
@@ -1510,7 +1510,7 @@ static void php_getimagesize_from_any(INTERNAL_FUNCTION_PARAMETERS, int mode) {
        }
 
        if (!stream) {
-                  RETURN_FALSE;
+               RETURN_FALSE;
        }
 
        php_getimagesize_from_stream(stream, info, INTERNAL_FUNCTION_PARAM_PASSTHRU);
@@ -1518,7 +1518,7 @@ static void php_getimagesize_from_any(INTERNAL_FUNCTION_PARAMETERS, int mode) {
 }
 /* }}} */
 
-/* {{{ proto array getimagesize(string imagefile [, array info])
+/* {{{ proto array|false getimagesize(string imagefile [, array info])
    Get the size of an image as 4-element array */
 PHP_FUNCTION(getimagesize)
 {
@@ -1526,7 +1526,7 @@ PHP_FUNCTION(getimagesize)
 }
 /* }}} */
 
-/* {{{ proto array getimagesizefromstring(string data [, array info])
+/* {{{ proto array|false getimagesizefromstring(string data [, array info])
    Get the size of an image as 4-element array */
 PHP_FUNCTION(getimagesizefromstring)
 {

diff --git a/ext/standard/info.c b/ext/standard/info.c
index 1e58b31a0fb2597665552591212fe949f8e44663..922663ab482f44eb73eab8cb93c4f4299eac07cd 100644 (file)
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -1245,7 +1245,7 @@ void register_phpinfo_constants(INIT_FUNC_ARGS)
 }
 /* }}} */
 
-/* {{{ proto void phpinfo([int what])
+/* {{{ proto bool phpinfo([int what])
    Output a page of useful information about PHP and the current request */
 PHP_FUNCTION(phpinfo)
 {
@@ -1266,7 +1266,7 @@ PHP_FUNCTION(phpinfo)
 
 /* }}} */
 
-/* {{{ proto string phpversion([string extension])
+/* {{{ proto string|false phpversion([string extension])
    Return the current PHP version */
 PHP_FUNCTION(phpversion)
 {
@@ -1291,7 +1291,7 @@ PHP_FUNCTION(phpversion)
 }
 /* }}} */
 
-/* {{{ proto void phpcredits([int flag])
+/* {{{ proto bool phpcredits([int flag])
    Prints the list of people who've contributed to the PHP project */
 PHP_FUNCTION(phpcredits)
 {
@@ -1307,7 +1307,7 @@ PHP_FUNCTION(phpcredits)
 }
 /* }}} */
 
-/* {{{ proto string php_sapi_name(void)
+/* {{{ proto string|false php_sapi_name(void)
    Return the current SAPI module name */
 PHP_FUNCTION(php_sapi_name)
 {
@@ -1341,7 +1341,7 @@ PHP_FUNCTION(php_uname)
 
 /* }}} */
 
-/* {{{ proto string php_ini_scanned_files(void)
+/* {{{ proto string|false php_ini_scanned_files(void)
    Return comma-separated string of .ini files parsed from the additional ini dir */
 PHP_FUNCTION(php_ini_scanned_files)
 {
@@ -1357,7 +1357,7 @@ PHP_FUNCTION(php_ini_scanned_files)
 }
 /* }}} */
 
-/* {{{ proto string php_ini_loaded_file(void)
+/* {{{ proto string|false php_ini_loaded_file(void)
    Return the actual loaded ini filename */
 PHP_FUNCTION(php_ini_loaded_file)
 {

diff --git a/ext/standard/iptc.c b/ext/standard/iptc.c
index f3c17dadd92546f54bdad66d1eaa0d5b7bf50026..f907da694eb7fc5d11e7be8646264d53e9f71fe4 100644 (file)
--- a/ext/standard/iptc.c
+++ b/ext/standard/iptc.c
@@ -180,7 +180,7 @@ static int php_iptc_next_marker(FILE *fp, int spool, unsigned char **spoolbuf)
 
 static char psheader[] = "\xFF\xED\0\0Photoshop 3.0\08BIM\x04\x04\0\0\0\0";
 
-/* {{{ proto array iptcembed(string iptcdata, string jpeg_file_name [, int spool])
+/* {{{ proto string|false iptcembed(string iptcdata, string jpeg_file_name [, int spool])
    Embed binary IPTC data into a JPEG image. */
 PHP_FUNCTION(iptcembed)
 {
@@ -311,7 +311,7 @@ PHP_FUNCTION(iptcembed)
 }
 /* }}} */
 
-/* {{{ proto array iptcparse(string iptcdata)
+/* {{{ proto array|false iptcparse(string iptcdata)
    Parse binary IPTC-data into associative array */
 PHP_FUNCTION(iptcparse)
 {

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 9c5b8c02ff0c3fa34999ae64d46b2ffbdaead248..757dcec8004f8beeba6bdaf69e0d3ccb04ddd7ce 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -328,7 +328,7 @@ static void php_spn_common_handler(INTERNAL_FUNCTION_PARAMETERS, int behavior) /
 }
 /* }}} */
 
-/* {{{ proto int strspn(string str, string mask [, int start [, int len]])
+/* {{{ proto int|false strspn(string str, string mask [, int start [, int len]])
    Finds length of initial segment consisting entirely of characters found in mask. If start or/and length is provided works like strspn(substr($s,$start,$len),$good_chars) */
 PHP_FUNCTION(strspn)
 {
@@ -336,7 +336,7 @@ PHP_FUNCTION(strspn)
 }
 /* }}} */
 
-/* {{{ proto int strcspn(string str, string mask [, int start [, int len]])
+/* {{{ proto int|false strcspn(string str, string mask [, int start [, int len]])
    Finds length of initial segment consisting entirely of characters not found in mask. If start or/and length is provide works like strcspn(substr($s,$start,$len),$bad_chars) */
 PHP_FUNCTION(strcspn)
 {
@@ -514,7 +514,7 @@ PHP_MINIT_FUNCTION(nl_langinfo)
 }
 /* }}} */
 
-/* {{{ proto string nl_langinfo(int item)
+/* {{{ proto string|false nl_langinfo(int item)
    Query language and locale information */
 PHP_FUNCTION(nl_langinfo)
 {
@@ -1135,7 +1135,7 @@ PHPAPI void php_explode_negative_limit(const zend_string *delim, zend_string *st
 }
 /* }}} */
 
-/* {{{ proto array explode(string separator, string str [, int limit])
+/* {{{ proto array|false explode(string separator, string str [, int limit])
    Splits a string on string separator and return array of components. If limit is positive only limit number of components is returned. If limit is negative all components except the last abs(limit) are returned. */
 PHP_FUNCTION(explode)
 {
@@ -1310,7 +1310,7 @@ PHP_FUNCTION(implode)
 
 #define STRTOK_TABLE(p) BG(strtok_table)[(unsigned char) *p]
 
-/* {{{ proto string strtok([string str,] string token)
+/* {{{ proto string|false strtok([string str,] string token)
    Tokenize a string */
 PHP_FUNCTION(strtok)
 {
@@ -1623,7 +1623,7 @@ PHPAPI size_t php_dirname(char *path, size_t len)
 }
 /* }}} */
 
-/* {{{ proto string dirname(string path[, int levels])
+/* {{{ proto string|null dirname(string path[, int levels])
    Returns the directory name component of the path */
 PHP_FUNCTION(dirname)
 {
@@ -1798,7 +1798,7 @@ PHPAPI size_t php_strcspn(char *s1, char *s2, char *s1_end, char *s2_end)
 }
 /* }}} */
 
-/* {{{ proto string stristr(string haystack, string needle[, bool part])
+/* {{{ proto string|false stristr(string haystack, string needle[, bool part])
    Finds first occurrence of a string within another, case insensitive */
 PHP_FUNCTION(stristr)
 {
@@ -1841,7 +1841,7 @@ PHP_FUNCTION(stristr)
 }
 /* }}} */
 
-/* {{{ proto string strstr(string haystack, string needle[, bool part])
+/* {{{ proto string|false strstr(string haystack, string needle[, bool part])
    Finds first occurrence of a string within another */
 PHP_FUNCTION(strstr)
 {
@@ -1880,7 +1880,7 @@ PHP_FUNCTION(strstr)
    An alias for strstr */
 /* }}} */
 
-/* {{{ proto int strpos(string haystack, string needle [, int offset])
+/* {{{ proto int|false strpos(string haystack, string needle [, int offset])
    Finds position of first occurrence of a string within another */
 PHP_FUNCTION(strpos)
 {
@@ -1920,7 +1920,7 @@ PHP_FUNCTION(strpos)
 }
 /* }}} */
 
-/* {{{ proto int stripos(string haystack, string needle [, int offset])
+/* {{{ proto int|false stripos(string haystack, string needle [, int offset])
    Finds position of first occurrence of a string within another, case insensitive */
 PHP_FUNCTION(stripos)
 {
@@ -1970,7 +1970,7 @@ PHP_FUNCTION(stripos)
 }
 /* }}} */
 
-/* {{{ proto int strrpos(string haystack, string needle [, int offset])
+/* {{{ proto int|false strrpos(string haystack, string needle [, int offset])
    Finds position of last occurrence of a string within another string */
 PHP_FUNCTION(strrpos)
 {
@@ -2019,7 +2019,7 @@ PHP_FUNCTION(strrpos)
 }
 /* }}} */
 
-/* {{{ proto int strripos(string haystack, string needle [, int offset])
+/* {{{ proto int|false strripos(string haystack, string needle [, int offset])
    Finds position of last occurrence of a string within another string */
 PHP_FUNCTION(strripos)
 {
@@ -2106,7 +2106,7 @@ PHP_FUNCTION(strripos)
 }
 /* }}} */
 
-/* {{{ proto string strrchr(string haystack, string needle)
+/* {{{ proto string|false strrchr(string haystack, string needle)
    Finds the last occurrence of a character in a string within another */
 PHP_FUNCTION(strrchr)
 {
@@ -2180,7 +2180,7 @@ static zend_string *php_chunk_split(const char *src, size_t srclen, const char *
 }
 /* }}} */
 
-/* {{{ proto string chunk_split(string str [, int chunklen [, string ending]])
+/* {{{ proto string|false chunk_split(string str [, int chunklen [, string ending]])
    Returns split line */
 PHP_FUNCTION(chunk_split)
 {
@@ -2225,7 +2225,7 @@ PHP_FUNCTION(chunk_split)
 }
 /* }}} */
 
-/* {{{ proto string substr(string str, int start [, int length])
+/* {{{ proto string|false substr(string str, int start [, int length])
    Returns part of a string */
 PHP_FUNCTION(substr)
 {
@@ -2301,7 +2301,7 @@ truncate_len:
 }
 /* }}} */
 
-/* {{{ proto mixed substr_replace(mixed str, mixed repl, mixed start [, mixed length])
+/* {{{ proto string|array|false substr_replace(mixed str, mixed repl, mixed start [, mixed length])
    Replaces part of a string with another string */
 PHP_FUNCTION(substr_replace)
 {
@@ -2634,7 +2634,7 @@ PHP_FUNCTION(chr)
 
        ZEND_PARSE_PARAMETERS_START(1, 1)
                Z_PARAM_LONG(c)
-       ZEND_PARSE_PARAMETERS_END_EX(c = 0);
+       ZEND_PARSE_PARAMETERS_END();
 
        c &= 0xff;
        ZVAL_INTERNED_STR(return_value, ZSTR_CHAR(c));
@@ -3292,7 +3292,7 @@ PHPAPI zend_string *php_str_to_str(const char *haystack, size_t length, const ch
 }
 /* }}} */
 
-/* {{{ proto string strtr(string str, string from[, string to])
+/* {{{ proto string|false strtr(string str, string from[, string to])
    Translates characters in str using given translation tables */
 PHP_FUNCTION(strtr)
 {
@@ -4645,7 +4645,7 @@ PHP_FUNCTION(strip_tags)
 }
 /* }}} */
 
-/* {{{ proto string setlocale(mixed category, string locale [, string ...])
+/* {{{ proto string|false setlocale(mixed category, string locale [, string ...])
    Set locale information */
 PHP_FUNCTION(setlocale)
 {
@@ -5270,7 +5270,7 @@ PHP_FUNCTION(str_repeat)
 }
 /* }}} */
 
-/* {{{ proto mixed count_chars(string input [, int mode])
+/* {{{ proto array|string|false count_chars(string input [, int mode])
    Returns info about what characters are used in input */
 PHP_FUNCTION(count_chars)
 {
@@ -5768,7 +5768,7 @@ static void php_string_shuffle(char *str, zend_long len) /* {{{ */
 }
 /* }}} */
 
-/* {{{ proto void str_shuffle(string str)
+/* {{{ proto string str_shuffle(string str)
    Shuffles string. One permutation of all possible is created */
 PHP_FUNCTION(str_shuffle)
 {
@@ -5876,7 +5876,7 @@ PHP_FUNCTION(str_word_count)
 /* }}} */
 
 #if HAVE_STRFMON
-/* {{{ proto string money_format(string format , float value)
+/* {{{ proto string|false money_format(string format , float value)
    Convert monetary value(s) to string */
 PHP_FUNCTION(money_format)
 {
@@ -5927,7 +5927,7 @@ PHP_FUNCTION(money_format)
 /* }}} */
 #endif
 
-/* {{{ proto array str_split(string str [, int split_length])
+/* {{{ proto array|false str_split(string str [, int split_length])
    Convert a string to an array. If split_length is specified, break the string down into chunks each split_length characters long. */
 PHP_FUNCTION(str_split)
 {
@@ -5970,7 +5970,7 @@ PHP_FUNCTION(str_split)
 }
 /* }}} */
 
-/* {{{ proto array strpbrk(string haystack, string char_list)
+/* {{{ proto string|false strpbrk(string haystack, string char_list)
    Search a string for any of a set of characters */
 PHP_FUNCTION(strpbrk)
 {
@@ -5999,7 +5999,7 @@ PHP_FUNCTION(strpbrk)
 }
 /* }}} */
 
-/* {{{ proto int substr_compare(string main_str, string str, int offset [, int length [, bool case_sensitivity]])
+/* {{{ proto int|false substr_compare(string main_str, string str, int offset [, int length [, bool case_sensitivity]])
    Binary safe optionally case insensitive comparison of 2 strings from an offset, up to length characters */
 PHP_FUNCTION(substr_compare)
 {