Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix proto documents for new global functions

diff --cc ext/mbstring/mbstring.c
index 12cdac9cda4bae57f18e92bb9cc6924742977c18,f963ba6d97497318dda4623c96b64520bd68f130..fbd7c9e664e28274c3d6136d858e26a1239dce89
--- 1/ext/mbstring/mbstring.c
--- 2/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@@ -5005,14 -5268,13 +5005,14 @@@ static inline char* php_mb_scrub(const 
  }
  
  
- /* {{{ proto bool mb_scrub([string str[, string encoding]]) */
+ /* {{{ proto string|false mb_scrub([string str[, string encoding]]) */
  PHP_FUNCTION(mb_scrub)
  {
 +      const mbfl_encoding *enc;
        char* str;
        size_t str_len;
 -      char *enc = NULL;
 -      size_t enc_len;
 +      char *enc_name = NULL;
 +      size_t enc_name_len;
        char *ret;
  
        ZEND_PARSE_PARAMETERS_START(1, 2)

diff --cc ext/standard/streamsfuncs.c
Simple merge