Merge branch 'PHP-7.3'

diff --cc ext/mbstring/mbstring.c
index 264c6020cab41275447125a8d8b4ab06eba05f27,0e255e98d2718fad5d2d0c74c34729d8ef6c1cc3..17df6036dc285bcdde920af6e361984a44fca8a5
--- 1/ext/mbstring/mbstring.c
--- 2/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@@ -4967,8 -5022,10 +4965,9 @@@ PHP_FUNCTION(mb_scrub
        const mbfl_encoding *enc;
        char* str;
        size_t str_len;
 -      char *enc_name = NULL;
 -      size_t enc_name_len;
 +      zend_string *enc_name = NULL;
        char *ret;
+       size_t ret_len;
  
        ZEND_PARSE_PARAMETERS_START(1, 2)
                Z_PARAM_STRING(str, str_len)